mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 11:06:29 +01:00
be13705177
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 6b8cd9a7 SPIGOT-6207: forcibly drop the items of a converted zombie villager
19 lines
1.0 KiB
Diff
19 lines
1.0 KiB
Diff
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/JsonList.java b/src/main/java/net/minecraft/server/players/JsonList.java
|
|
index cd35b833d3047a38be980ee550641e87bd3b9b01..c960852dc60d0598012c5eef0d139fe38bde63fb 100644
|
|
--- a/src/main/java/net/minecraft/server/players/JsonList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/JsonList.java
|
|
@@ -189,6 +189,7 @@ public abstract class JsonList<K, V extends JsonListEntry<K>> {
|
|
|
|
try {
|
|
JsonArray jsonarray = (JsonArray) JsonList.b.fromJson(bufferedreader, JsonArray.class);
|
|
+ com.google.common.base.Preconditions.checkState(jsonarray != null, "The file \"" + this.c.getName() + "\" is either empty or corrupt"); // Paper
|
|
|
|
this.d.clear();
|
|
Iterator iterator = jsonarray.iterator();
|