mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 00:47:42 +01:00
714f0a04d0
Upstream has released updates that appears to apply and compile correctly Paper Changes: 60135676 [Auto] Updated Upstream (CraftBukkit) fa90052a Fix MC-125757 (#3859) 071c08d7 Only convert lore lines that actually look legacy 8c4787e3 Misc Improvements to Async Teleporting and Light patch 6133c83b [Auto] Updated Upstream (Bukkit/CraftBukkit)
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
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);
|
|
}
|