From a1f2c2565ffd2cc48e119bcc1742632372ae4d1e Mon Sep 17 00:00:00 2001
From: MistPhizzle <mistphizzle@gmail.com>
Date: Sat, 26 Jul 2014 21:06:47 -0400
Subject: [PATCH] FastSwim can be used with EarthArmor

---
 .../ProjectKorra/Ability/AbilityModuleManager.java             | 1 -
 .../projectkorra/ProjectKorra/waterbending/WaterPassive.java   | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java b/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
index b337f847..2b58a320 100644
--- a/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
+++ b/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java
@@ -103,7 +103,6 @@ public class AbilityModuleManager {
 					if (a == StockAbilities.EarthBlast) shiftabilities.add(a.name());
 					if (a == StockAbilities.Shockwave) shiftabilities.add(a.name());
 					if (a == StockAbilities.EarthTunnel) shiftabilities.add(a.name());
-					if (a == StockAbilities.EarthArmor) shiftabilities.add(a.name());
 					if (a == StockAbilities.EarthGrab) shiftabilities.add(a.name());
 					if (a == StockAbilities.Extraction) metalbendingabilities.add(a.name());
 				}
diff --git a/src/com/projectkorra/ProjectKorra/waterbending/WaterPassive.java b/src/com/projectkorra/ProjectKorra/waterbending/WaterPassive.java
index 7ee90853..e43c1954 100644
--- a/src/com/projectkorra/ProjectKorra/waterbending/WaterPassive.java
+++ b/src/com/projectkorra/ProjectKorra/waterbending/WaterPassive.java
@@ -10,6 +10,7 @@ import com.projectkorra.ProjectKorra.Element;
 import com.projectkorra.ProjectKorra.Methods;
 import com.projectkorra.ProjectKorra.ProjectKorra;
 import com.projectkorra.ProjectKorra.Ability.AbilityModuleManager;
+import com.projectkorra.ProjectKorra.earthbending.EarthArmor;
 
 public class WaterPassive {
 
@@ -28,7 +29,7 @@ public class WaterPassive {
 		for (Player player: Bukkit.getServer().getOnlinePlayers()) {
 			String ability = Methods.getBoundAbility(player);
 			if (Methods.canBendPassive(player.getName(), Element.Water)) {
-				if (WaterSpout.instances.containsKey(player)) {
+				if (WaterSpout.instances.containsKey(player) || EarthArmor.instances.containsKey(player)) {
 					continue;
 				} else if (ability == null || !AbilityModuleManager.shiftabilities.contains(ability)) {
 					if (player.isSneaking() && Methods.isWater(player.getLocation().getBlock())) {