From 3d778242868585255ead23d7fd0d7d7f13298337 Mon Sep 17 00:00:00 2001 From: Archie Date: Thu, 21 Jul 2016 21:08:51 +0100 Subject: [PATCH] Fixed WaterManipulation & IceBlast not changing plants to air once used as a source (#518) --- .../projectkorra/projectkorra/waterbending/IceSpikeBlast.java | 4 ++-- .../projectkorra/waterbending/WaterManipulation.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/projectkorra/projectkorra/waterbending/IceSpikeBlast.java b/src/com/projectkorra/projectkorra/waterbending/IceSpikeBlast.java index d5192e3c..ef2967f7 100644 --- a/src/com/projectkorra/projectkorra/waterbending/IceSpikeBlast.java +++ b/src/com/projectkorra/projectkorra/waterbending/IceSpikeBlast.java @@ -260,12 +260,12 @@ public class IceSpikeBlast extends IceAbility { settingUp = true; prepared = false; - /*if (isPlant(sourceBlock)) { + if (isPlant(sourceBlock)) { new PlantRegrowth(player, sourceBlock); sourceBlock.setType(Material.AIR); } - originalSource = new TempBlock(sourceBlock, Material.AIR, data);*/ + } public static void activate(Player player) { diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java b/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java index e57f82ee..450f5254 100644 --- a/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java +++ b/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java @@ -153,6 +153,7 @@ public class WaterManipulation extends WaterAbility { if (isPlant(sourceBlock)) { new PlantRegrowth(player, sourceBlock); + sourceBlock.setType(Material.AIR); } else if (!isIce(sourceBlock)) { addWater(sourceBlock); }