Fix reloading paper.yml

This commit is contained in:
William Blake Galbreath
2020-06-19 21:37:08 -05:00
parent 8d2860c58f
commit f4816e7ec6
12 changed files with 44 additions and 11 deletions

View File

@@ -0,0 +1,33 @@
From e62d1aa78282e48f84dc56943d8043eb971134a7 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 ecacb72b92..284ea05dcd 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

View File

@@ -1,4 +1,4 @@
From d67ebb4e8b56acc0ff314c9e5ddbe5ec41b72366 Mon Sep 17 00:00:00 2001
From fe4fdafed3d5e87ffb5121f5ed2206fd391a5af8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 21 Feb 2020 17:04:51 -0600
Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter

View File

@@ -1,4 +1,4 @@
From 752dbcf296d4f49192a151ce2386aed4185579fb Mon Sep 17 00:00:00 2001
From 345bbd9cea2ce752e89e3054384dfe46ebbb1e91 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500
Subject: [PATCH] MC-168772 Fix - Add turtle egg block options

View File

@@ -1,4 +1,4 @@
From 8440f2450c9ac45469e5f9c131a2d24251f1fcff Mon Sep 17 00:00:00 2001
From fa77519922db3d82bc59bb03d3b97986e0a24956 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 6 Jul 2019 21:12:58 -0500
Subject: [PATCH] MC-4 Fix - Item position desync

View File

@@ -1,4 +1,4 @@
From f3fe7a102583cf90921272adaddfef9ed6ff0ca2 Mon Sep 17 00:00:00 2001
From be9a57f00945bb3951e3b52b1eb25f6c3f681770 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 9 Jul 2019 20:56:47 -0500
Subject: [PATCH] MC-56653 Fix - pig zombies aggro

View File

@@ -1,4 +1,4 @@
From 79b80ce6003c5c65222feec9fb2bf32e0c04a013 Mon Sep 17 00:00:00 2001
From 37bad92fb78ed0f5066c218d4fd9d43938461a70 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 20 Jul 2013 22:40:56 -0400
Subject: [PATCH] EMC - MonsterEggSpawn Event

View File

@@ -1,4 +1,4 @@
From 0f904c482a4ce6055680cf30d762e9a25634278f Mon Sep 17 00:00:00 2001
From 461d0b000bd167abcb877ab6833e3369533f9344 Mon Sep 17 00:00:00 2001
From: Eearslya Sleiarion <eearslya@gmail.com>
Date: Mon, 24 Jun 2019 21:27:32 -0700
Subject: [PATCH] PaperPR - Add BellRingEvent

View File

@@ -1,4 +1,4 @@
From ae65a590a8dc41acff3b4536109159d4ee79115a Mon Sep 17 00:00:00 2001
From c0dbd3292f24de8b8a271447b6a42dcf24b1113c Mon Sep 17 00:00:00 2001
From: chase <chasewhip20@gmail.com>
Date: Sun, 15 Mar 2020 18:32:22 -0600
Subject: [PATCH] PaperPR - Per World Spawn limits

View File

@@ -1,4 +1,4 @@
From bae1d2006d60c97a686f816d18d6fa54bf76d926 Mon Sep 17 00:00:00 2001
From 9ea86cbc0573b76be31b9f6b1f30659a1677fca2 Mon Sep 17 00:00:00 2001
From: KennyTV <kennytv@t-online.de>
Date: Mon, 20 Apr 2020 13:57:06 +0200
Subject: [PATCH] PaperPR - PlayerItemCooldownEvent

View File

@@ -1,4 +1,4 @@
From c17ddd1bb257b49ab887fd8371c3ff0588cb7270 Mon Sep 17 00:00:00 2001
From a4944dd2a6754377e5c2c3677efd11cb4edd9bc1 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Thu, 11 Jun 2020 17:29:42 -0700
Subject: [PATCH] PaperPR - 3550 - Fix more exploits

View File

@@ -1,4 +1,4 @@
From f3054cc2a7f88ef976d520a933e31ae19f7266b6 Mon Sep 17 00:00:00 2001
From b4df7532bf3cdbe0444213e3980f577205134984 Mon Sep 17 00:00:00 2001
From: Spottedleaf <spottedleaf@spottedleaf.dev>
Date: Fri, 3 Apr 2020 02:21:13 -0700
Subject: [PATCH] Tuinity - Always able to execute tasks on the main server

View File

@@ -1,4 +1,4 @@
From afb1d97066c5a40f9613a6cf66e85d4e67e948c2 Mon Sep 17 00:00:00 2001
From bb731e0fa81a7c7a97fb002407b4915d927ae94e Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Thu, 5 Mar 2020 23:08:01 +0100
Subject: [PATCH] YAPFA - Disable mojang profiler