TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix acrobat/warrior stance disabling and switching (#635)

Browse source 
* 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
This commit is contained in:
Josh 2016-10-23 14:59:12 -04:00 committed by Christopher Martin
parent d34c1ffc20
commit ca40454356
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java
View file

@ -31,9 +31,12 @@ public class AcrobatStance extends ChiAbility {
ChiAbility stance = bPlayer.getStance(); ChiAbility stance = bPlayer.getStance();
if (stance != null) { if (stance != null) {
if (stance instanceof AcrobatStance) { if (stance instanceof AcrobatStance) {
remove(); stance.remove();
return; return;
} }
if (stance instanceof WarriorStance) {
stance.remove();
}
} }
start(); start();
bPlayer.setStance(this); bPlayer.setStance(this);
@ -123,4 +126,4 @@ public class AcrobatStance extends ChiAbility {
this.paralyzeDodgeBoost = paralyzeDodgeBoost; this.paralyzeDodgeBoost = paralyzeDodgeBoost;
} }
} }

7
src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java
View file

@ -26,9 +26,12 @@ public class WarriorStance extends ChiAbility {
ChiAbility stance = bPlayer.getStance(); ChiAbility stance = bPlayer.getStance();
if (stance != null) { if (stance != null) {
if (stance instanceof WarriorStance) { if (stance instanceof WarriorStance) {
remove(); stance.remove();
return; return;
} }
if (stance instanceof AcrobatStance) {
stance.remove();
}
} }
start(); start();
bPlayer.setStance(this); bPlayer.setStance(this);
@ -102,4 +105,4 @@ public class WarriorStance extends ChiAbility {
this.resistance = resistance; this.resistance = resistance;
} }
} }