mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

and some more

Browse source
This commit is contained in:
Jake Potrebic 2023-09-21 22:41:27 -07:00
parent a62835bbb1
commit 2cee84193c
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
93 changed files with 449 additions and 458 deletions
Download patch file Download diff file Expand all files Collapse all files

18
patches/removed/1.20.1/0559-Throw-proper-exception-on-empty-JsonList-file.patch Normal file
View file

@ -0,0 +1,18 @@
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
index 08173a6e0b7e46c041a81d6b51d77a0aea182525..9e8112fbc40a1d89c0f73ea4452e0fa1bb459bf4 100644
--- a/src/main/java/net/minecraft/server/players/StoredUserList.java
+++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
@@ -182,6 +182,7 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
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();