Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-23 01:17:44 +01:00
Code Issues Projects Releases Wiki Activity

Avoid NPE in AdvancementDataWorld thanks to Spigot being dumb

Browse Source
This commit is contained in:
kashike 2017-09-21 07:01:40 -07:00
parent 88ba5fcaac
commit 5a42891c48
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0046-Configurable-Chunk-IO-Thread-Base-Count.patch
View File

@ -1,11 +1,11 @@
From e576a2e6f75c9065ff77b0d808d9deb8828c2a2a Mon Sep 17 00:00:00 2001
From ba2c8def84e686a6ee2afa8a33a624ba1914800c Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Wed, 2 Mar 2016 23:46:57 -0600
Subject: [PATCH] Configurable Chunk IO Thread Base Count
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 007589314..9a6f87e59 100644
index b5795b6d3..36689db74 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -199,4 +199,9 @@ public class PaperConfig {
@ -39,5 +39,5 @@ index e4fd9bc60..7b7a3d01b 100644
private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
--
2.12.2
2.14.1

6
Spigot-Server-Patches/0047-Add-PlayerInitialSpawnEvent.patch
View File

@ -1,4 +1,4 @@
From aa6a5903956d14c43ff5c5871306a1cfb3b089a6 Mon Sep 17 00:00:00 2001
From c676f4ee1c9ca2e5f669de47d11e58e926229404 Mon Sep 17 00:00:00 2001
From: Steve Anton <anxuiz.nx@gmail.com>
Date: Thu, 3 Mar 2016 00:09:38 -0600
Subject: [PATCH] Add PlayerInitialSpawnEvent
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
For modifying a player's initial spawn location as they join the server
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index b9920a5fc..b90407d18 100644
index b3356b40f..128f55287 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -110,6 +110,21 @@ public abstract class PlayerList {
@ -32,5 +32,5 @@ index b9920a5fc..b90407d18 100644
entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
String s1 = "local";
--
2.13.0
2.14.1

22
Spigot-Server-Patches/0237-Avoid-NPE-in-AdvancementDataWorld-thanks-to-Spigot-b.patch Normal file
View File

@ -0,0 +1,22 @@
From 0dc45e0c967f8c83f88fee01e0175a4319b6c985 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 21 Sep 2017 07:00:43 -0700
Subject: [PATCH] Avoid NPE in AdvancementDataWorld thanks to Spigot being dumb
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 9ce3e1365..712fc1f9b 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -396,7 +396,7 @@ public class SpigotConfig
}
public static boolean disableAdvancementSaving;
- public static List<String> disabledAdvancements;
+ public static List<String> disabledAdvancements = java.util.Collections.emptyList(); // Paper - avoid NPE in AdvancementDataWorld
private static void disabledAdvancements() {
disableAdvancementSaving = getBoolean("advancements.disable-saving", false);
disabledAdvancements = getList("advancements.disabled", Arrays.asList(new String[]{"minecraft:story/disabled"}));
--
2.14.1