mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-09-18 21:33:01 +00:00
ed9ba9a42d
Ideally all misleading documentation has been removed in the last ~10 years and users should no longer be adding unknown startup flags.
44 lines
2.3 KiB
Diff
44 lines
2.3 KiB
Diff
From 81437983bb489583d86e97961d43fb5cecda9e93 Mon Sep 17 00:00:00 2001
|
|
From: Suddenly <suddenly@suddenly.coffee>
|
|
Date: Tue, 8 Jul 2014 09:44:18 +1000
|
|
Subject: [PATCH] Safer JSON Loading
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/JsonList.java b/src/main/java/net/minecraft/server/players/JsonList.java
|
|
index 04a730277e..2b254136ff 100644
|
|
--- a/src/main/java/net/minecraft/server/players/JsonList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/JsonList.java
|
|
@@ -175,6 +175,14 @@ public abstract class JsonList<K, V extends JsonListEntry<K>> {
|
|
this.map.put(this.getKeyForUser(jsonlistentry.getUser()), (V) jsonlistentry); // CraftBukkit - decompile error
|
|
}
|
|
}
|
|
+ // Spigot Start
|
|
+ } catch ( com.google.gson.JsonParseException | NullPointerException ex )
|
|
+ {
|
|
+ org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.WARNING, "Unable to read file " + this.file + ", backing it up to {0}.backup and creating new copy.", ex );
|
|
+ File backup = new File( this.file + ".backup" );
|
|
+ this.file.renameTo( backup );
|
|
+ this.file.delete();
|
|
+ // Spigot End
|
|
} catch (Throwable throwable) {
|
|
if (bufferedreader != null) {
|
|
try {
|
|
diff --git a/src/main/java/net/minecraft/server/players/UserCache.java b/src/main/java/net/minecraft/server/players/UserCache.java
|
|
index e3286ffbf9..7738780050 100644
|
|
--- a/src/main/java/net/minecraft/server/players/UserCache.java
|
|
+++ b/src/main/java/net/minecraft/server/players/UserCache.java
|
|
@@ -251,6 +251,11 @@ public class UserCache {
|
|
}
|
|
} catch (FileNotFoundException filenotfoundexception) {
|
|
;
|
|
+ // Spigot Start
|
|
+ } catch (com.google.gson.JsonSyntaxException | NullPointerException ex) {
|
|
+ UserCache.LOGGER.warn( "Usercache.json is corrupted or has bad formatting. Deleting it to prevent further issues." );
|
|
+ this.file.delete();
|
|
+ // Spigot End
|
|
} catch (JsonParseException | IOException ioexception) {
|
|
UserCache.LOGGER.warn("Failed to load profile cache {}", this.file, ioexception);
|
|
}
|
|
--
|
|
2.43.0
|
|
|