From 38cdbc16e25c7208d60f7647b30c42cce89a7c14 Mon Sep 17 00:00:00 2001 From: cpw Date: Thu, 2 Apr 2015 13:07:40 -0400 Subject: [PATCH] Fix json cache crash, handle the file much more cleanly. Probably an MC JIRA since it's a vanilla bug. Closes #619 --- .../management/PlayerProfileCache.java.patch | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 fml/patches/minecraft/net/minecraft/server/management/PlayerProfileCache.java.patch diff --git a/fml/patches/minecraft/net/minecraft/server/management/PlayerProfileCache.java.patch b/fml/patches/minecraft/net/minecraft/server/management/PlayerProfileCache.java.patch new file mode 100644 index 0000000000..c94a084283 --- /dev/null +++ b/fml/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()