From 963a5e5a7321ba246ad40c360d3d1da851409f64 Mon Sep 17 00:00:00 2001
From: Matthew Messinger <mattmess1221@gmail.com>
Date: Tue, 11 Aug 2015 14:31:03 -0400
Subject: [PATCH] Fix flight and skins' bimap crash

---
 src/main/java/com/minelittlepony/minelp/Pony.java |  2 ++
 .../minelp/model/pony/pm_Human.java               |  1 -
 .../com/voxelmodpack/hdskins/HDSkinManager.java   | 15 +++++++--------
 src/main/resources/litemod.json                   |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/minelittlepony/minelp/Pony.java b/src/main/java/com/minelittlepony/minelp/Pony.java
index ba0cac35..8e9e4197 100644
--- a/src/main/java/com/minelittlepony/minelp/Pony.java
+++ b/src/main/java/com/minelittlepony/minelp/Pony.java
@@ -348,6 +348,8 @@ public class Pony {
             return pegasusFlying = false;
         } else if (isJumping) {
             return true;
+        } else if (onGround) {
+            return false;
         } else {
             boolean falling = fallDistance > 0;
             boolean levitating = fallDistance == this.previousFallDistance;
diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/pm_Human.java b/src/main/java/com/minelittlepony/minelp/model/pony/pm_Human.java
index d0a38700..5e40bdd0 100644
--- a/src/main/java/com/minelittlepony/minelp/model/pony/pm_Human.java
+++ b/src/main/java/com/minelittlepony/minelp/model/pony/pm_Human.java
@@ -64,7 +64,6 @@ public class pm_Human extends ModelPony {
         return true;
     }
 
-
     @Override
     public void renderDrop(RenderManager rendermanager, ItemRenderer itemrenderer, EntityLivingBase entity) {
         this.renderDrop(itemrenderer, entity, this.bipedRightArm, 1.0F, -0.0625F, 0.4375F, 0.0625F);
diff --git a/src/main/java/com/voxelmodpack/hdskins/HDSkinManager.java b/src/main/java/com/voxelmodpack/hdskins/HDSkinManager.java
index 3b7fec6a..0d12965e 100644
--- a/src/main/java/com/voxelmodpack/hdskins/HDSkinManager.java
+++ b/src/main/java/com/voxelmodpack/hdskins/HDSkinManager.java
@@ -3,7 +3,6 @@ package com.voxelmodpack.hdskins;
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -13,8 +12,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 
 import com.google.common.cache.Cache;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
+import com.google.common.collect.Maps;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.minecraft.InsecureTextureException;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture;
@@ -39,8 +37,8 @@ public final class HDSkinManager {
     private static String gatewayUrl = "skinmanager.voxelmodpack.com";
     private static String skinUrl = "skins.voxelmodpack.com";
     private static Cache<GameProfile, Map<Type, MinecraftProfileTexture>> skinsCache;
-    private static final BiMap<String, String> playerHashes = HashBiMap.create();
-    private static final Map<String, Map<Type, MinecraftProfileTexture>> cachedTextures = new HashMap<String, Map<Type, MinecraftProfileTexture>>();
+    private static final Map<String, String> playerHashes = Maps.newHashMap();
+    private static final Map<String, Map<Type, MinecraftProfileTexture>> cachedTextures = Maps.newHashMap();
 
     public static void onDownloadSkin(EventInfo<ThreadDownloadImageData> e) {
         ThreadDownloadImageData imageDownload = e.getSource();
@@ -116,14 +114,15 @@ public final class HDSkinManager {
     }
 
     private static String findUUID(GameProfile profile, Map<?, MinecraftProfileTexture> textures, String hash) {
+        String uuid = playerHashes.get(hash);
         for (MinecraftProfileTexture texture : textures.values()) {
             if (hash.equals(texture.getHash())) {
-                String uuid = trimUUID(profile.getId());
+                uuid = trimUUID(profile.getId());
                 playerHashes.put(hash, uuid);
-                return uuid;
+                break;
             }
         }
-        return null;
+        return uuid;
     }
 
     private static void storeTexturesForProfile(GameProfile profile, Map<Type, MinecraftProfileTexture> textures) {
diff --git a/src/main/resources/litemod.json b/src/main/resources/litemod.json
index 416dc835..b3ea8448 100644
--- a/src/main/resources/litemod.json
+++ b/src/main/resources/litemod.json
@@ -2,7 +2,7 @@
     "name": "minelp",
     "mcversion": "1.8",
     "version": "1.8-UNOFFICIAL",
-    "revision": "185.16",
+    "revision": "185.18",
     "author": "Verdana, Rene_Z, Mumfrey, JoyJoy",
 	"voxelCommonJarName": "voxelcommon-2.4.0.jar",
     "classTransformerClasses": "com.minelittlepony.minelp.transformers.RenderPlayerTransformer",