Fix json cache crash, handle the file much more cleanly. Probably an …

…MC JIRA since it's a vanilla bug. Closes #619
MinecraftForge · Apr 2, 2015 · 94c45b4 · 94c45b4
1 parent c73861e
commit 94c45b4
Showing 1 changed file with 50 additions and 0 deletions.
diff --git a/patches/minecraft/net/minecraft/server/management/PlayerProfileCache.java.patch b/patches/minecraft/net/minecraft/server/management/PlayerProfileCache.java.patch
@@ -0,0 +1,50 @@
+--- ../src-base/minecraft/net/minecraft/server/management/PlayerProfileCache.java
++++ ../src-work/minecraft/net/minecraft/server/management/PlayerProfileCache.java
+@@ -224,26 +224,12 @@
+     {
+         List list = null;
+         BufferedReader bufferedreader = null;
+-        label81:
+         {
+             try
+             {
+                 bufferedreader = Files.newReader(this.field_152665_g, Charsets.UTF_8);
+                 list = (List)this.field_152660_b.fromJson(bufferedreader, field_152666_h);
+-                break label81;
+-            }
+-            catch (FileNotFoundException filenotfoundexception)
+-            {
+-                ;
+-            }
+-            finally
+-            {
+-                IOUtils.closeQuietly(bufferedreader);
+-            }
+
+-            return;
+-        }
+-
+         if (list != null)
+         {
+             this.field_152661_c.clear();
+@@ -268,6 +254,20 @@
+                 }
+             }
+         }
++            }
++            catch (FileNotFoundException filenotfoundexception)
++            {
++                ;
++            }
++            catch (com.google.gson.JsonParseException parsefail)
++            {
++                // No op - the cache can quietly rebuild if it's junk
++            }
++            finally
++            {
++                IOUtils.closeQuietly(bufferedreader);
++            }
++        }
+     }
+
+     public void func_152658_c()