From db6d7a9e8b6b9b362ebabe42e730811285f6a5c0 Mon Sep 17 00:00:00 2001
From: jedk1 <jedkristian@live.com>
Date: Tue, 9 Feb 2016 14:23:04 +0000
Subject: [PATCH] Fix Water Bugs

---
 src/com/projectkorra/projectkorra/waterbending/SurgeWall.java | 2 +-
 .../projectkorra/waterbending/WaterArmsSpear.java             | 3 +--
 .../projectkorra/projectkorra/waterbending/WaterArmsWhip.java | 3 +--
 .../projectkorra/projectkorra/waterbending/WaterReturn.java   | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java b/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
index 016a2065..a0937564 100644
--- a/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
+++ b/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
@@ -66,7 +66,7 @@ public class SurgeWall extends WaterAbility {
 		SurgeWall wall = getAbility(player, SurgeWall.class);
 		if (wall != null) {
 			if (wall.progressing) {
-				freezeThaw();
+				wall.freezeThaw();
 			} else if (prepare()) {
 				wall.remove();
 				start();
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterArmsSpear.java b/src/com/projectkorra/projectkorra/waterbending/WaterArmsSpear.java
index 6288991e..dbdd1b50 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterArmsSpear.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterArmsSpear.java
@@ -1,6 +1,5 @@
 package com.projectkorra.projectkorra.waterbending;
 
-import com.projectkorra.projectkorra.BendingManager;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.util.TempBlock;
@@ -77,7 +76,7 @@ public class WaterArmsSpear extends WaterAbility {
 					spearRange = spearRangeFullMoon;
 					spearSphere = spearSphereFullMoon;
 					spearDuration = spearDurationFullMoon;
-				} else if (BendingManager.events.get(world).equalsIgnoreCase("FullMoon")) {
+				} else if (isFullMoon(world)) {
 					spearRange = spearRangeFullMoon;
 					spearSphere = spearSphereFullMoon;
 					spearDuration = spearDurationFullMoon;
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterArmsWhip.java b/src/com/projectkorra/projectkorra/waterbending/WaterArmsWhip.java
index d09d70fe..01a7952b 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterArmsWhip.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterArmsWhip.java
@@ -1,6 +1,5 @@
 package com.projectkorra.projectkorra.waterbending;
 
-import com.projectkorra.projectkorra.BendingManager;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
@@ -116,7 +115,7 @@ public class WaterArmsWhip extends WaterAbility {
 					} else {
 						whipLength = whipLengthFullMoon;
 					}
-				} else if (BendingManager.events.get(world).equalsIgnoreCase("FullMoon")) {
+				} else if (isFullMoon(world)) {
 					if (ability.equals(Whip.PUNCH)) {
 						whipLength = punchLengthFullMoon;
 					} else {
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterReturn.java b/src/com/projectkorra/projectkorra/waterbending/WaterReturn.java
index da160225..d0c27900 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterReturn.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterReturn.java
@@ -34,8 +34,8 @@ public class WaterReturn extends WaterAbility {
 		
 		this.range = getNightFactor(range);
 		
-		if (bPlayer.canBend(this)) {
-			if (isTransparent(player, block) && !block.isLiquid() && hasEmptyWaterBottle()) {
+		if (bPlayer.canBendIgnoreBindsCooldowns(this)) {
+			if (isTransparent(player, block) && ((TempBlock.isTempBlock(block) && block.isLiquid()) || !block.isLiquid()) && hasEmptyWaterBottle()) {
 				this.block = new TempBlock(block, Material.WATER, (byte) 0);
 			}
 		}