Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
70df8f27 Add PrepareGrindstoneEvent
24b2f54b Fix Player skulls for offline mode servers
ce270e14 Updated Upstream (Bukkit/CraftBukkit/Spigot)
c4ada0e1 Fix many chunk loading issues
37b244b5 Fix not running level updates for light if no pre/post task
e6142995 Add and implement PlayerRecipeBookClickEvent (#3351)
9bb4e930 Fix piston dupe patch creating ghost blocks (#3603)
This commit is contained in:
William Blake Galbreath
2020-06-23 14:20:44 -05:00
parent 07c44e35f2
commit 05a85435d2
27 changed files with 115 additions and 193 deletions

View File

@@ -0,0 +1,33 @@
From dcebd276461c63a590cd35b73ece127106eb7d6a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 19 Jun 2020 21:36:16 -0500
Subject: [PATCH] Fix reloading paper.yml
---
src/main/java/com/destroystokyo/paper/PaperWorldConfig.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index ecacb72b9..284ea05dc 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -20,7 +20,7 @@ public class PaperWorldConfig {
private final String worldName;
private final SpigotWorldConfig spigotConfig;
- private final YamlConfiguration config;
+ private YamlConfiguration config; // Purpur
private boolean verbose;
public PaperWorldConfig(String worldName, SpigotWorldConfig spigotConfig) {
@@ -31,6 +31,7 @@ public class PaperWorldConfig {
}
public void init() {
+ this.config = PaperConfig.config; // Purpur
log("-------- World Settings For [" + worldName + "] --------");
PaperConfig.readConfig(PaperWorldConfig.class, this);
}
--
2.26.2