Update to 1.16.2

This commit is contained in:
William Blake Galbreath
2020-08-12 17:32:14 -05:00
parent 162651ff31
commit 6fecfcfebc
146 changed files with 4496 additions and 3624 deletions

View File

@@ -1,27 +0,0 @@
From 0000000000000000000000000000000000000000 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
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index e471e7649..09fda504d 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);
}