From e07036a7a112fecad2ef9c5541e70c7e140eaf7c Mon Sep 17 00:00:00 2001 From: Alexander Behrhof Date: Fri, 8 Aug 2014 04:09:44 -0400 Subject: [PATCH] Redoing the setting morphed, Still works. --- src/main/java/tconstruct/armor/ArmorAbilities.java | 6 +++--- src/main/java/tconstruct/armor/ArmorAbilitiesClient.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/tconstruct/armor/ArmorAbilities.java b/src/main/java/tconstruct/armor/ArmorAbilities.java index a5846fd7e3b..caea9471abc 100644 --- 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 index 7de3cafb4dc..6f06da5adc6 100644 --- 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; }