From ca40454356e023427b4a7ee6531f1f249f4a1fe8 Mon Sep 17 00:00:00 2001
From: Josh <javw.phanatic@gmail.com>
Date: Sun, 23 Oct 2016 14:59:12 -0400
Subject: [PATCH] Fix acrobat/warrior stance disabling and switching (#635)

* Fix acrobat stance removal

We should remove existing stance, not this activation

Also remove the Warrior Stance since Acrobat Stance is being activated

* Fix Warrior Stance removal

We should remove existing stance, not this activation

Also remove the Acrobat Stance since Warrior Stance is being activated
---
 .../projectkorra/chiblocking/AcrobatStance.java            | 7 +++++--
 .../projectkorra/chiblocking/WarriorStance.java            | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java b/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java
index 83ffd275..665ca71e 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java
@@ -31,9 +31,12 @@ public class AcrobatStance extends ChiAbility {
 		ChiAbility stance = bPlayer.getStance();
 		if (stance != null) {
 			if (stance instanceof AcrobatStance) {
-				remove();
+				stance.remove();
 				return;
 			}
+			if (stance instanceof WarriorStance) {
+				stance.remove();
+			}
 		}
 		start();
 		bPlayer.setStance(this);
@@ -123,4 +126,4 @@ public class AcrobatStance extends ChiAbility {
 		this.paralyzeDodgeBoost = paralyzeDodgeBoost;
 	}
 	
-}
\ No newline at end of file
+}
diff --git a/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java b/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java
index 144d7500..269cb5b6 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java
@@ -26,9 +26,12 @@ public class WarriorStance extends ChiAbility {
 		ChiAbility stance = bPlayer.getStance();
 		if (stance != null) {
 			if (stance instanceof WarriorStance) {
-				remove();
+				stance.remove();
 				return;
 			}
+			if (stance instanceof AcrobatStance) {
+				stance.remove();
+			}
 		}
 		start();
 		bPlayer.setStance(this);
@@ -102,4 +105,4 @@ public class WarriorStance extends ChiAbility {
 		this.resistance = resistance;
 	}
 	
-}
\ No newline at end of file
+}