Redoing the setting morphed, Still works.

SlimeKnights · Aug 8, 2014 · e07036a · e07036a
1 parent 45e2342
commit e07036a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/tconstruct/armor/ArmorAbilities.java b/src/main/java/tconstruct/armor/ArmorAbilities.java
@@ -87,7 +87,7 @@ else if (stepBoosted && (feet == null || !(feet.getItem() instanceof TravelGear)
 
         if (morphLoaded)
         {
-            if (morph.api.Api.getMorphEntity(player.getDisplayName(), true) != null)
+            if (morph.api.Api.hasMorph(player.getCommandSenderName(), event.side.isClient()))
             {
                 morphed = true;
             }
@@ -98,7 +98,7 @@ else if (stepBoosted && (feet == null || !(feet.getItem() instanceof TravelGear)
             ItemStack chest = player.getCurrentArmor(2);
             if (chest == null || !(chest.getItem() instanceof IModifyable))
             {
-                if (!morphLoaded && !morphed)
+                if (!(morphLoaded && morphed))
                     PlayerAbilityHelper.setEntitySize(player, 0.6F, 1.8F);
             }
             else
@@ -107,7 +107,7 @@ else if (stepBoosted && (feet == null || !(feet.getItem() instanceof TravelGear)
                 int dodge = tag.getInteger("Perfect Dodge");
                 if (dodge > 0)
                 {
-                    if (!morphLoaded && !morphed)
+                    if (!(morphLoaded && morphed))
                         PlayerAbilityHelper.setEntitySize(player, Math.max(0.15F, 0.6F - (dodge * 0.09f)), 1.8F - (dodge * 0.04f));
                 }
             }

diff --git a/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java b/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java
@@ -102,7 +102,7 @@ else if (sprint)
 
         if (morphLoaded)
         {
-            if (morph.api.Api.getMorphEntity(player.getDisplayName(), true) != null)
+            if (morph.api.Api.hasMorph(player.getCommandSenderName(), event.side.isClient()))
             {
                 morphed = true;
             }