From 8950aca2b35836328fbb8c0f430996d386fc7126 Mon Sep 17 00:00:00 2001 From: StrangeOne101 Date: Fri, 1 Apr 2016 17:40:09 +1300 Subject: [PATCH] Fix Heatcontrol not working in water MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Fixes heatcontrol now thawing ice in liquids as well as other opaque blocks --- .../projectkorra/firebending/HeatControlExtinguish.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/projectkorra/projectkorra/firebending/HeatControlExtinguish.java b/src/com/projectkorra/projectkorra/firebending/HeatControlExtinguish.java index ad0db7e3..53420d70 100644 --- a/src/com/projectkorra/projectkorra/firebending/HeatControlExtinguish.java +++ b/src/com/projectkorra/projectkorra/firebending/HeatControlExtinguish.java @@ -12,6 +12,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Player; import java.util.HashSet; +import java.util.Set; public class HeatControlExtinguish extends FireAbility { @@ -20,6 +21,7 @@ public class HeatControlExtinguish extends FireAbility { private long cooldown; private Location location; + @SuppressWarnings("deprecation") public HeatControlExtinguish(Player player) { super(player); @@ -33,7 +35,11 @@ public class HeatControlExtinguish extends FireAbility { this.range = getDayFactor(this.range); this.radius = getDayFactor(this.radius); - if (isMeltable(player.getTargetBlock((HashSet) null, (int) range))) { + Set blocks = new HashSet(); + for (Integer mat : GeneralMethods.NON_OPAQUE) { + blocks.add(Material.getMaterial(mat)); + } + if (isMeltable(player.getTargetBlock(blocks, (int) range))) { new HeatControlMelt(player); return; }