Disable hitbox changes of Perfect Dodge if Smart Moving is present. Y…

…es, this makes the modifier useless with smart moving.
SlimeKnights · Sep 9, 2014 · d9c3f26 · d9c3f26
1 parent 5bfa35c
commit d9c3f26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/tconstruct/armor/ArmorAbilities.java b/src/main/java/tconstruct/armor/ArmorAbilities.java
@@ -16,6 +16,7 @@ public class ArmorAbilities
     //Abilities
     boolean morphed;
     boolean morphLoaded = Loader.isModLoaded("Morph");
+    boolean smartmoveLoaded = Loader.isModLoaded("SmartMoving");
 
     public static List<String> stepBoostedPlayers = new ArrayList();
     //ItemStack prevFeet;
@@ -91,7 +92,7 @@ else if (stepBoosted && (feet == null || !(feet.getItem() instanceof TravelGear)
             }
         }
 
-        if (!player.isPlayerSleeping())
+        if (!player.isPlayerSleeping() && !smartmoveLoaded)
         {
             ItemStack chest = player.getCurrentArmor(2);
             if (chest == null || !(chest.getItem() instanceof IModifyable))

diff --git a/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java b/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java
@@ -21,6 +21,7 @@ public class ArmorAbilitiesClient
 
     boolean morphed;
     boolean morphLoaded = Loader.isModLoaded("Morph");
+    boolean smartmoveLoaded = Loader.isModLoaded("SmartMoving");
 
     float prevMouseSensitivity;
     boolean sprint;
@@ -108,7 +109,7 @@ else if (sprint)
             }
         }
 
-        if (!player.isPlayerSleeping() && !morphed)
+        if (!player.isPlayerSleeping() && !morphed && !smartmoveLoaded)
         {
             ItemStack chest = player.getCurrentArmor(2);
             if (chest == null || !(chest.getItem() instanceof IModifyable))