From 90bc8df7a196be94613a8959f3704f143e1e70c7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 23 Aug 2019 22:09:36 -0500 Subject: [PATCH] Fix a couple purpur config options --- ...23-Always-place-dragon-egg-when-dragon-is-killed.patch | 8 ++++---- patches/server/0058-Option-for-slimes-not-pushable.patch | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/server/0023-Always-place-dragon-egg-when-dragon-is-killed.patch b/patches/server/0023-Always-place-dragon-egg-when-dragon-is-killed.patch index b621123d8..5513d7d23 100644 --- a/patches/server/0023-Always-place-dragon-egg-when-dragon-is-killed.patch +++ b/patches/server/0023-Always-place-dragon-egg-when-dragon-is-killed.patch @@ -1,4 +1,4 @@ -From 92877e47c0a96f2b20142e737bb5b3550cc64e40 Mon Sep 17 00:00:00 2001 +From 6cb81e2b5db9fdc1f29f2a71d4ad27ed2b268657 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 1 Jun 2019 01:16:35 -0500 Subject: [PATCH] Always place dragon egg when dragon is killed @@ -31,7 +31,7 @@ index 6700c8c65..f0c77eb6c 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index abc43c4e3..346646594 100644 +index abc43c4e3..4fbf12b9f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -177,6 +177,11 @@ public class PurpurConfig { @@ -40,12 +40,12 @@ index abc43c4e3..346646594 100644 + public static boolean enderDragonDeathAlwaysPlacesEggBlock = true; + private static void enderDragonDeathAlwaysPlacesEggBlock() { -+ enderDragonDeathAlwaysPlacesEggBlock = getBoolean("ender-dragon-death-always-places-egg-block", enderDragonDeathAlwaysPlacesEggBlock); ++ enderDragonDeathAlwaysPlacesEggBlock = getBoolean("settings.ender-dragon-death-always-places-egg-block", enderDragonDeathAlwaysPlacesEggBlock); + } + public static boolean ridableBat = true; public static boolean ridableBlaze = true; public static boolean ridableCat = true; -- -2.20.1 +2.23.0.rc1 diff --git a/patches/server/0058-Option-for-slimes-not-pushable.patch b/patches/server/0058-Option-for-slimes-not-pushable.patch index f7b1cce9f..f1a9604c7 100644 --- a/patches/server/0058-Option-for-slimes-not-pushable.patch +++ b/patches/server/0058-Option-for-slimes-not-pushable.patch @@ -1,4 +1,4 @@ -From d25594a77210498e5ed54e81dba90809df4d3f5a Mon Sep 17 00:00:00 2001 +From 8ea6f7d2290cdb598399443c849f39385c601a07 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 23 Aug 2019 21:56:31 -0500 Subject: [PATCH] Option for slimes not pushable @@ -23,16 +23,16 @@ index fd54958f6..1d3ab9703 100644 + } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 0022211be..6827da6a6 100644 +index e8aba4ec9..d96adabe2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -275,6 +275,11 @@ public class PurpurConfig { - enderDragonDeathAlwaysPlacesEggBlock = getBoolean("ender-dragon-death-always-places-egg-block", enderDragonDeathAlwaysPlacesEggBlock); + enderDragonDeathAlwaysPlacesEggBlock = getBoolean("settings.ender-dragon-death-always-places-egg-block", enderDragonDeathAlwaysPlacesEggBlock); } + public static boolean slimesNotPushable = false; + private static void slimesNotPushable() { -+ slimesNotPushable = getBoolean("slimes-not-pushable", slimesNotPushable); ++ slimesNotPushable = getBoolean("settings.slimes-not-pushable", slimesNotPushable); + } + public static boolean ridableBat = true;