From 3150b34487515292e7ab6e4e0e815d2464736ce3 Mon Sep 17 00:00:00 2001 From: Loony Date: Wed, 27 Jul 2016 07:07:57 +0100 Subject: [PATCH] FireBlast & Water's SelectRange fixes (#521) * Fixed FireBlast's damage not respecting the config during the day * Fixes leaves not using the correct select range --- src/com/projectkorra/projectkorra/ability/WaterAbility.java | 2 +- .../projectkorra/projectkorra/firebending/FireBlastCharged.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/projectkorra/projectkorra/ability/WaterAbility.java b/src/com/projectkorra/projectkorra/ability/WaterAbility.java index d57bb57e..0da987a8 100644 --- a/src/com/projectkorra/projectkorra/ability/WaterAbility.java +++ b/src/com/projectkorra/projectkorra/ability/WaterAbility.java @@ -189,7 +189,7 @@ public abstract class WaterAbility extends ElementalAbility { Vector vector = location.getDirection().clone().normalize(); BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(player); - Block testBlock = player.getTargetBlock(getTransparentMaterialSet(), range > 3 ? 3 : (int) range); + Block testBlock = player.getTargetBlock(getTransparentMaterialSet(), (int) range); if (bPlayer == null) { return null; } else if (isWaterbendable(testBlock.getType())) { diff --git a/src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java b/src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java index 08f6bf60..9702f17c 100644 --- a/src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java +++ b/src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java @@ -79,6 +79,8 @@ public class FireBlastCharged extends FireAbility { this.range = getDayFactor(range); if (!player.getEyeLocation().getBlock().isLiquid()) { start(); + } if (isDay(player.getWorld())) { + this.maxDamage = getDayFactor(maxDamage); } }