Merge pull request #829 from tgarr0/master

Traveler's Boots Fix (for #802)
SlimeKnights · Aug 7, 2014 · 401cf79 · 401cf79
2 parents e379d8f + bd4025d
commit 401cf79
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/src/main/java/tconstruct/armor/ArmorAbilities.java b/src/main/java/tconstruct/armor/ArmorAbilities.java
@@ -1,5 +1,8 @@
 package tconstruct.armor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -16,7 +19,8 @@ public class ArmorAbilities
     boolean morphed;
     boolean morphLoaded = Loader.isModLoaded("Morph");
 
-    ItemStack prevFeet;
+    public static List<String> stepBoostedPlayers = new ArrayList();
+    //ItemStack prevFeet;
     double prevMotionY;
 
     @SubscribeEvent
@@ -53,13 +57,26 @@ public void playerTick (TickEvent.PlayerTickEvent event)
             }
             prevMotionY = player.motionY;
         }
+        /* Former step height boost handling 
         if (feet != prevFeet)
         {
             if (prevFeet != null && prevFeet.getItem() instanceof TravelGear)
                 player.stepHeight -= 0.6f;
             if (feet != null && feet.getItem() instanceof TravelGear)
                 player.stepHeight += 0.6f;
             prevFeet = feet;
+        }*/
+        boolean stepBoosted = stepBoostedPlayers.contains(player.getGameProfile().getName());
+        if(stepBoosted)
+        	player.stepHeight = 1.1f;
+        if(!stepBoosted && feet!=null && feet.getItem() instanceof TravelGear)
+        {
+        	stepBoostedPlayers.add(player.getGameProfile().getName());
+        }
+        else if(stepBoosted && (feet==null || !(feet.getItem() instanceof TravelGear)))
+        {
+        	stepBoostedPlayers.remove(player.getGameProfile().getName());
+        	player.stepHeight -= 0.6f;
         }
         //TODO: Proper minimap support
         /*ItemStack stack = player.inventory.getStackInSlot(8);