Fix /purpur reload not reloading world options

This commit is contained in:
William Blake Galbreath
2020-01-14 20:58:59 -06:00
parent e4b55a3da2
commit 535006bd94
34 changed files with 142 additions and 153 deletions

View File

@@ -1,4 +1,4 @@
From 1e761b4f982976c32121123d6d7256dcae9a2914 Mon Sep 17 00:00:00 2001
From 04c9f3e094bdb7afd444279a484a89df8c11fb04 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 23 May 2019 16:20:21 -0500
Subject: [PATCH] Campfires should fall with gravity
@@ -10,7 +10,7 @@ Subject: [PATCH] Campfires should fall with gravity
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index 4d29faccaa..bad1098406 100644
index 0afcbef2f3..2c464299a1 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -387,6 +387,7 @@ public class Block implements IMaterial {
@@ -68,11 +68,11 @@ index 6303be944c..5d1312d2f1 100644
if (flag) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 314fd584b8..871c0e2349 100644
index f4811a1d7b..33840d0036 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -61,6 +61,11 @@ public class PurpurWorldConfig {
return config.getString("world-settings." + worldName + "." + path, config.getString("world-settings.default." + path));
@@ -58,6 +58,11 @@ public class PurpurWorldConfig {
return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path));
}
+ public boolean campfireObeysGravity = true;
@@ -84,5 +84,5 @@ index 314fd584b8..871c0e2349 100644
public int campfireRegenDuration = 80;
public int campfireRegenRange = 5;
--
2.24.0.rc1
2.24.0