2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
|
|
|
|
Date: Sun, 1 Nov 2020 16:43:11 +0100
|
|
|
|
|
Subject: [PATCH] Throw proper exception on empty JsonList file
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
|
2021-06-17 19:12:40 +00:00
|
|
|
index 2567e51f7de898ea0a2411a176af70bdc4551260..9152c6c9e7e5c8fdb9183c2b4f088a810621b333 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/StoredUserList.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
|
2021-06-16 17:48:25 +00:00
|
|
|
@@ -187,6 +187,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
JsonArray jsonarray = (JsonArray) StoredUserList.GSON.fromJson(bufferedreader, JsonArray.class);
|
|
|
|
|
+ com.google.common.base.Preconditions.checkState(jsonarray != null, "The file \"" + this.file.getName() + "\" is either empty or corrupt"); // Paper
|
|
|
|
|
|
|
|
|
|
this.map.clear();
|
|
|
|
|
Iterator iterator = jsonarray.iterator();
|
