From af24a227a3f6ea3721c83e1100434eeabd60be63 Mon Sep 17 00:00:00 2001
From: Benford <simplicitee123@gmail.com>
Date: Mon, 28 Mar 2016 22:52:03 -0400
Subject: [PATCH 1/3] Fix armor issues

- Also added return statement in shockwave
---
 .../projectkorra/earthbending/EarthArmor.java            | 7 +++++++
 .../projectkorra/waterbending/PlantArmor.java            | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java b/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
index abcb8818..8da07af3 100644
--- a/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
+++ b/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
@@ -4,6 +4,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.util.TempPotionEffect;
+import com.projectkorra.projectkorra.waterbending.PlantArmor;
 
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -42,6 +43,12 @@ public class EarthArmor extends EarthAbility {
 			return;
 		}
 		
+		if (hasAbility(player, PlantArmor.class)) {
+			PlantArmor abil = getAbility(player, PlantArmor.class);
+			abil.remove();
+			player.sendMessage("Previous ability reverted");
+		}
+		
 		this.formed = false;
 		this.complete = false;
 		this.interval = 2000;
diff --git a/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java b/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java
index 93fcf585..b0886b4e 100644
--- a/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java
+++ b/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java
@@ -2,6 +2,7 @@ package com.projectkorra.projectkorra.waterbending;
 
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.PlantAbility;
+import com.projectkorra.projectkorra.earthbending.EarthArmor;
 
 import org.bukkit.Color;
 import org.bukkit.Location;
@@ -43,10 +44,16 @@ public class PlantArmor extends PlantAbility {
 		
 		if (hasAbility(player, PlantArmor.class)) {
 			return;
-		} else if (bPlayer.isOnCooldown(this)) {
+		} else if (!bPlayer.canBend(this)) {
 			return;
 		}
 		
+		if (hasAbility(player, EarthArmor.class)) {
+			EarthArmor abil = getAbility(player, EarthArmor.class);
+			abil.remove();
+			player.sendMessage("Previous armor reverted");
+		}
+		
 		block = getPlantSourceBlock(player, range, true);
 		if (block == null) {
 			return;

From 7510445733f67401a9cd587af68359aa566ef109 Mon Sep 17 00:00:00 2001
From: Benford <simplicitee123@gmail.com>
Date: Mon, 28 Mar 2016 22:53:02 -0400
Subject: [PATCH 2/3] Commit shockwave addition

---
 src/com/projectkorra/projectkorra/earthbending/Shockwave.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/projectkorra/projectkorra/earthbending/Shockwave.java b/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
index 414b703c..a4053149 100644
--- a/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
+++ b/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
@@ -37,6 +37,7 @@ public class Shockwave extends EarthAbility {
 		
 		if (fall) {
 			fallShockwave();
+			return;
 		}
 		
 		start();

From b251971e2f00534799b5ad73a5dd2f4f81de1a4f Mon Sep 17 00:00:00 2001
From: Benford <simplicitee123@gmail.com>
Date: Mon, 28 Mar 2016 23:06:55 -0400
Subject: [PATCH 3/3] Remove testing messages

---
 src/com/projectkorra/projectkorra/earthbending/EarthArmor.java | 1 -
 src/com/projectkorra/projectkorra/waterbending/PlantArmor.java | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java b/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
index 8da07af3..dcc1fd39 100644
--- a/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
+++ b/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
@@ -46,7 +46,6 @@ public class EarthArmor extends EarthAbility {
 		if (hasAbility(player, PlantArmor.class)) {
 			PlantArmor abil = getAbility(player, PlantArmor.class);
 			abil.remove();
-			player.sendMessage("Previous ability reverted");
 		}
 		
 		this.formed = false;
diff --git a/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java b/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java
index b0886b4e..febe4bb4 100644
--- a/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java
+++ b/src/com/projectkorra/projectkorra/waterbending/PlantArmor.java
@@ -51,7 +51,6 @@ public class PlantArmor extends PlantAbility {
 		if (hasAbility(player, EarthArmor.class)) {
 			EarthArmor abil = getAbility(player, EarthArmor.class);
 			abil.remove();
-			player.sendMessage("Previous armor reverted");
 		}
 		
 		block = getPlantSourceBlock(player, range, true);