TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-22 16:05:01 +00:00
Code Issues Projects Releases Wiki Activity

Fixed TEMP_LAVA_BLOCKS not removing key from Map (#714)

Browse source
This commit is contained in:
Sobki 2017-01-31 03:56:35 +10:00 committed by Christopher Martin
parent f10abf5020
commit 3539389e1a
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/com/projectkorra/projectkorra/earthbending/lava/LavaFlow.java
View file

@ -29,6 +29,7 @@ public class LavaFlow extends LavaAbility {
} }
private static final Map<Block, TempBlock> TEMP_LAVA_BLOCKS = new ConcurrentHashMap<>(); private static final Map<Block, TempBlock> TEMP_LAVA_BLOCKS = new ConcurrentHashMap<>();
public static final Map<TempBlock, Block> TEMP_LAVA_BLOCKS_BY_TEMPBLOCK = new ConcurrentHashMap<>();
private static final Map<Block, TempBlock> TEMP_LAND_BLOCKS = new ConcurrentHashMap<>(); private static final Map<Block, TempBlock> TEMP_LAND_BLOCKS = new ConcurrentHashMap<>();
private static final Map<Block, TempBlock> TEMP_AIR_BLOCKS = new ConcurrentHashMap<>(); private static final Map<Block, TempBlock> TEMP_AIR_BLOCKS = new ConcurrentHashMap<>();
@ -397,6 +398,7 @@ public class LavaFlow extends LavaAbility {
} }
TempBlock tblock = new TempBlock(block, Material.LAVA, (byte) 0); TempBlock tblock = new TempBlock(block, Material.LAVA, (byte) 0);
TEMP_LAVA_BLOCKS.put(block, tblock); TEMP_LAVA_BLOCKS.put(block, tblock);
TEMP_LAVA_BLOCKS_BY_TEMPBLOCK.put(tblock, block);
affectedBlocks.add(tblock); affectedBlocks.add(tblock);
if (allowNaturalFlow) { if (allowNaturalFlow) {
@ -416,6 +418,7 @@ public class LavaFlow extends LavaAbility {
TempBlock tb = TEMP_LAVA_BLOCKS.get(testBlock); TempBlock tb = TEMP_LAVA_BLOCKS.get(testBlock);
tb.revertBlock(); tb.revertBlock();
TEMP_LAVA_BLOCKS.remove(testBlock); TEMP_LAVA_BLOCKS.remove(testBlock);
TEMP_LAVA_BLOCKS_BY_TEMPBLOCK.remove(tb);
affectedBlocks.remove(tb); affectedBlocks.remove(tb);
return; return;
} }
@ -468,7 +471,8 @@ public class LavaFlow extends LavaAbility {
if (TEMP_LAVA_BLOCKS.values().contains(tblock)) { if (TEMP_LAVA_BLOCKS.values().contains(tblock)) {
affectedBlocks.remove(tblock); affectedBlocks.remove(tblock);
TEMP_LAVA_BLOCKS.remove(tblock); TEMP_LAVA_BLOCKS.remove(TEMP_LAVA_BLOCKS_BY_TEMPBLOCK.get(tblock));
TEMP_LAVA_BLOCKS_BY_TEMPBLOCK.remove(tblock);
} }
if (TEMP_LAND_BLOCKS.values().contains(tblock)) { if (TEMP_LAND_BLOCKS.values().contains(tblock)) {
affectedBlocks.remove(tblock); affectedBlocks.remove(tblock);
@ -497,7 +501,8 @@ public class LavaFlow extends LavaAbility {
tblock.revertBlock(); tblock.revertBlock();
if (TEMP_LAVA_BLOCKS.values().contains(tblock)) { if (TEMP_LAVA_BLOCKS.values().contains(tblock)) {
affectedBlocks.remove(tblock); affectedBlocks.remove(tblock);
TEMP_LAVA_BLOCKS.remove(tblock); TEMP_LAVA_BLOCKS.remove(TEMP_LAVA_BLOCKS_BY_TEMPBLOCK.get(tblock));
TEMP_LAVA_BLOCKS_BY_TEMPBLOCK.remove(tblock);
} }
if (TEMP_LAND_BLOCKS.values().contains(tblock)) { if (TEMP_LAND_BLOCKS.values().contains(tblock)) {
affectedBlocks.remove(tblock); affectedBlocks.remove(tblock);