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 memory leak with IceSpike (#713)

Browse source
This commit is contained in:
Sobki 2017-01-30 17:18:20 +10:00 committed by Christopher Martin
parent 4743fdc829
commit f10abf5020
1 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillar.java
View file

@ -1,12 +1,9 @@
package com.projectkorra.projectkorra.waterbending.ice; package com.projectkorra.projectkorra.waterbending.ice;
import com.projectkorra.projectkorra.GeneralMethods; import java.util.ArrayList;
import com.projectkorra.projectkorra.ability.AirAbility; import java.util.HashMap;
import com.projectkorra.projectkorra.ability.IceAbility; import java.util.Map;
import com.projectkorra.projectkorra.ability.WaterAbility; import java.util.Random;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.util.TempPotionEffect;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -19,16 +16,19 @@ import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import java.util.ArrayList; import com.projectkorra.projectkorra.GeneralMethods;
import java.util.HashMap; import com.projectkorra.projectkorra.ability.AirAbility;
import java.util.Map; import com.projectkorra.projectkorra.ability.IceAbility;
import java.util.Random; import com.projectkorra.projectkorra.ability.WaterAbility;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.util.TempPotionEffect;
public class IceSpikePillar extends IceAbility { public class IceSpikePillar extends IceAbility {
/**The list of blocks IceSpike uses*/ /** The list of blocks IceSpike uses */
private Map<Block, TempBlock> ice_blocks = new HashMap<Block, TempBlock>(); private Map<Block, TempBlock> ice_blocks = new HashMap<Block, TempBlock>();
private int height; private int height;
private int progress; private int progress;
private int slowPower; private int slowPower;
@ -81,7 +81,7 @@ public class IceSpikePillar extends IceAbility {
} else { } else {
this.source_block = WaterAbility.getIceSourceBlock(player, range); this.source_block = WaterAbility.getIceSourceBlock(player, range);
if (this.source_block == null) { if (this.source_block == null) {
return; return;
} }
} }
origin = source_block.getLocation(); origin = source_block.getLocation();
@ -138,6 +138,7 @@ public class IceSpikePillar extends IceAbility {
/** /**
* Reverts the block if it's part of IceSpike * Reverts the block if it's part of IceSpike
*
* @param block The Block * @param block The Block
* @return If the block was removed or not * @return If the block was removed or not
*/ */
@ -152,20 +153,22 @@ public class IceSpikePillar extends IceAbility {
return false; return false;
} }
/**Checks to see if this move can start. Checks things like if there is enough space to form, if the source isn't /**
* a TempBlock, etc.*/ * Checks to see if this move can start. Checks things like if there is
* enough space to form, if the source isn't a TempBlock, etc.
*/
private boolean canInstantiate() { private boolean canInstantiate() {
if (!isIcebendable(source_block.getType())) { if (!isIcebendable(source_block.getType())) {
return false; return false;
} }
Block b; Block b;
for (int i = 1; i <= height; i++) { for (int i = 1; i <= height; i++) {
b = source_block.getWorld().getBlockAt(location.clone().add(direction.clone().multiply(i))); b = source_block.getWorld().getBlockAt(location.clone().add(direction.clone().multiply(i)));
if (b.getType() != Material.AIR) { if (b.getType() != Material.AIR) {
return false; return false;
} }
if (b.getX() == player.getEyeLocation().getBlock().getX() && b.getZ() == player.getEyeLocation().getBlock().getZ()) { if (b.getX() == player.getEyeLocation().getBlock().getX() && b.getZ() == player.getEyeLocation().getBlock().getZ()) {
return false; return false;
} }
@ -193,9 +196,10 @@ public class IceSpikePillar extends IceAbility {
} }
/** /**
* Makes the pillar rise by 1 block. * Makes the pillar rise by 1 block.
* *
* @return If the block was placed successfully.*/ * @return If the block was placed successfully.
*/
private boolean risePillar() { private boolean risePillar() {
progress++; progress++;
Block affectedBlock = location.clone().add(direction).getBlock(); Block affectedBlock = location.clone().add(direction).getBlock();
@ -211,14 +215,14 @@ public class IceSpikePillar extends IceAbility {
affect(le); affect(le);
} }
} }
TempBlock b = new TempBlock(affectedBlock, Material.ICE, (byte)0); TempBlock b = new TempBlock(affectedBlock, Material.ICE, (byte) 0);
ice_blocks.put(affectedBlock, b); ice_blocks.put(affectedBlock, b);
if (!inField || new Random().nextInt((int) ((height + 1) * 1.5)) == 0) { if (!inField || new Random().nextInt((int) ((height + 1) * 1.5)) == 0) {
playIcebendingSound(source_block.getLocation()); playIcebendingSound(source_block.getLocation());
} }
return true; return true;
} }
@ -239,10 +243,12 @@ public class IceSpikePillar extends IceAbility {
} }
AirAbility.breakBreathbendingHold(entity); AirAbility.breakBreathbendingHold(entity);
} }
/**The reverse of risePillar(). Makes the pillar sink /**
* The reverse of risePillar(). Makes the pillar sink
* *
* @return If the move should continue progressing.*/ * @return If the move should continue progressing.
*/
public boolean sinkPillar() { public boolean sinkPillar() {
Vector direction = this.direction.clone().multiply(-1); Vector direction = this.direction.clone().multiply(-1);
if (ice_blocks.containsKey(location.getBlock())) { if (ice_blocks.containsKey(location.getBlock())) {
@ -250,7 +256,7 @@ public class IceSpikePillar extends IceAbility {
ice_blocks.remove(location.getBlock()); ice_blocks.remove(location.getBlock());
location.add(direction); location.add(direction);
if (source_block == location.getBlock()) { if (source_block.equals(location.getBlock())) {
return false; return false;
} }
} }