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

PhaseChange now melts WaterArms Spear Ice

Browse source
This commit is contained in:
StrangeOne101 2016-06-12 16:44:37 +12:00
parent 78ade27116
commit 6419ba6201
3 changed files with 39 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/com/projectkorra/projectkorra/waterbending/PhaseChangeMelt.java
View file

@ -81,6 +81,9 @@ public class PhaseChangeMelt extends IceAbility {
} else if (!Torrent.canThaw(block)) { } else if (!Torrent.canThaw(block)) {
Torrent.thaw(block); Torrent.thaw(block);
return; return;
} else if (WaterArmsSpear.canThaw(block)) {
WaterArmsSpear.thaw(block);
return;
} }
WaterSpoutWave.thaw(block); WaterSpoutWave.thaw(block);

11
src/com/projectkorra/projectkorra/waterbending/WaterArms.java
View file

@ -341,6 +341,16 @@ public class WaterArms extends WaterAbility {
BLOCK_REVERT_TIMES.remove(block); BLOCK_REVERT_TIMES.remove(block);
} }
} }
for (Block block : WaterArmsSpear.getIceBlocks().keySet()) {
long time = WaterArmsSpear.getIceBlocks().get(block);
if (System.currentTimeMillis() > time || ignoreTime) {
if (TempBlock.isTempBlock(block)) {
TempBlock.revertBlock(block, Material.AIR);
}
WaterArmsSpear.getIceBlocks().remove(block);
}
}
} }
private void checkIfZapped() { private void checkIfZapped() {
@ -407,6 +417,7 @@ public class WaterArms extends WaterAbility {
public static void removeAllCleanup() { public static void removeAllCleanup() {
progressRevert(true); progressRevert(true);
BLOCK_REVERT_TIMES.clear(); BLOCK_REVERT_TIMES.clear();
WaterArmsSpear.getIceBlocks().clear();
WaterArmsWhip.removeAllCleanup(); WaterArmsWhip.removeAllCleanup();
} }

31
src/com/projectkorra/projectkorra/waterbending/WaterArmsSpear.java
View file

@ -18,9 +18,12 @@ import org.bukkit.util.Vector;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
public class WaterArmsSpear extends WaterAbility { public class WaterArmsSpear extends WaterAbility {
private static final ConcurrentHashMap<Block, Long> ICE_BLOCKS = new ConcurrentHashMap<Block, Long>();
private boolean hitEntity; private boolean hitEntity;
private boolean canFreeze; private boolean canFreeze;
private boolean usageCooldownEnabled; private boolean usageCooldownEnabled;
@ -182,7 +185,7 @@ public class WaterArmsSpear extends WaterAbility {
} }
new TempBlock(location.getBlock(), Material.STATIONARY_WATER, (byte) 8); new TempBlock(location.getBlock(), Material.STATIONARY_WATER, (byte) 8);
WaterArms.getBlockRevertTimes().put(location.getBlock(), System.currentTimeMillis() + 600L); getIceBlocks().put(location.getBlock(), System.currentTimeMillis() + 600L);
Vector direction = GeneralMethods.getDirection(initLocation, GeneralMethods.getTargetedLocation(player, spearRange, new Integer[] { 8, 9, 79, 174 })).normalize(); Vector direction = GeneralMethods.getDirection(initLocation, GeneralMethods.getTargetedLocation(player, spearRange, new Integer[] { 8, 9, 79, 174 })).normalize();
location = location.add(direction.clone().multiply(1)); location = location.add(direction.clone().multiply(1));
@ -201,29 +204,41 @@ public class WaterArmsSpear extends WaterAbility {
Block block = spearLocations.get(i).getBlock(); Block block = spearLocations.get(i).getBlock();
if (canPlaceBlock(block)) { if (canPlaceBlock(block)) {
playIcebendingSound(block.getLocation()); playIcebendingSound(block.getLocation());
if (WaterArms.getBlockRevertTimes().containsKey(block)) { if (getIceBlocks().containsKey(block)) {
WaterArms.getBlockRevertTimes().remove(block); getIceBlocks().remove(block);
} }
new TempBlock(block, Material.ICE, (byte) 0); new TempBlock(block, Material.ICE, (byte) 0);
WaterArms.getBlockRevertTimes().put(block, System.currentTimeMillis() + spearDuration + (long) (Math.random() * 500)); getIceBlocks().put(block, System.currentTimeMillis() + spearDuration + (long) (Math.random() * 500));
} }
} }
} }
} }
public static boolean canThaw(Block block) {
return getIceBlocks().containsKey(block) && block.getType() == Material.ICE;
}
public static void thaw(Block block) {
if (canThaw(block)) {
getIceBlocks().remove(block);
block.setType(Material.AIR);
}
}
private void createIceBall() { private void createIceBall() {
for (Block block : GeneralMethods.getBlocksAroundPoint(location, spearSphere)) { for (Block block : GeneralMethods.getBlocksAroundPoint(location, spearSphere)) {
if (isTransparent(player, block) && block.getType() != Material.ICE && !WaterArms.isUnbreakable(block)) { if (isTransparent(player, block) && block.getType() != Material.ICE && !WaterArms.isUnbreakable(block)) {
playIcebendingSound(block.getLocation()); playIcebendingSound(block.getLocation());
new TempBlock(block, Material.ICE, (byte) 0); new TempBlock(block, Material.ICE, (byte) 0);
WaterArms.getBlockRevertTimes().put(block, System.currentTimeMillis() + spearDuration + (long) (Math.random() * 500)); getIceBlocks().put(block, System.currentTimeMillis() + spearDuration + (long) (Math.random() * 500));
} }
} }
} }
private boolean canPlaceBlock(Block block) { private boolean canPlaceBlock(Block block) {
if (!isTransparent(player, block) if (!isTransparent(player, block)
&& !((isWater(block) || isIcebendable(block)) && (TempBlock.isTempBlock(block) && !WaterArms.getBlockRevertTimes().containsKey(block)))) { && !((isWater(block) || isIcebendable(block)) && (TempBlock.isTempBlock(block) && !getIceBlocks().containsKey(block)))) {
return false; return false;
} else if (GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) { } else if (GeneralMethods.isRegionProtectedFromBuild(this, block.getLocation())) {
return false; return false;
@ -451,4 +466,8 @@ public class WaterArmsSpear extends WaterAbility {
this.location = location; this.location = location;
} }
public static ConcurrentHashMap<Block, Long> getIceBlocks() {
return ICE_BLOCKS;
}
} }