From 9a9766e9175d888ee4dc6221d7e9f03271464b11 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 20 Feb 2020 20:23:57 -0600 Subject: [PATCH] Fix up some configuration shit --- patches/server/0002-Purpur-config-files.patch | 51 +++++++++++-------- .../server/0003-Host-our-own-timings.patch | 6 +-- patches/server/0004-Ridables.patch | 6 +-- ...-settings-suppressing-pointless-logs.patch | 6 +-- ...9-Giants-naturally-spawn-and-have-AI.patch | 6 +-- .../0010-Illusioners-naturally-spawn.patch | 6 +-- .../0011-Zombie-horse-naturally-spawn.patch | 6 +-- ...0012-Charged-creeper-naturally-spawn.patch | 6 +-- ...bit-naturally-spawn-toast-and-killer.patch | 6 +-- .../server/0014-Cat-spawning-options.patch | 6 +-- patches/server/0016-Cows-eat-mushrooms.patch | 6 +-- .../server/0018-Pigs-give-saddle-back.patch | 6 +-- ...oms-do-not-spawn-on-creative-players.patch | 6 +-- ...0020-Phantoms-only-attack-insomniacs.patch | 6 +-- ...ed-to-crystals-and-crystals-shoot-ph.patch | 8 +-- ...22-Snowman-drop-and-put-back-pumpkin.patch | 6 +-- .../0023-Ender-dragon-always-drop-egg.patch | 6 +-- ...24-Ender-dragon-always-drop-full-exp.patch | 6 +-- .../0025-Signs-editable-on-right-click.patch | 6 +-- ...le-egg-block-options-fixes-MC-168772.patch | 6 +-- .../server/0028-Make-Iron-Golems-Swim.patch | 6 +-- ...moisten-from-water-directly-under-it.patch | 6 +-- .../server/0030-Controllable-Minecarts.patch | 26 +++------- .../server/0031-Signs-allow-color-codes.patch | 6 +-- .../0032-Campfires-have-regen-effect.patch | 6 +-- ...able-loot-drops-on-death-by-cramming.patch | 8 +-- .../0034-Campfires-burn-out-in-rain.patch | 8 +-- ...5-Campfires-should-fall-with-gravity.patch | 8 +-- ...036-Dont-send-useless-entity-packets.patch | 6 +-- .../0037-Fix-item-position-desync-MC-4.patch | 6 +-- ...-limit-incoming-packets-from-players.patch | 6 +-- .../0039-Fix-pig-zombies-MC-56653.patch | 6 +-- patches/server/0040-Implement-AFK-API.patch | 6 +-- ...ption-to-toggle-milk-curing-bad-omen.patch | 8 +-- ...g-mends-most-damages-equipment-first.patch | 8 +-- .../server/0043-Tulips-change-fox-type.patch | 6 +-- ...rd-limit-for-pillager-outpost-spawns.patch | 6 +-- .../0048-Implement-elytra-settings.patch | 6 +-- ...-Add-blacklist-option-for-grindstone.patch | 6 +-- .../0051-Implement-lagging-threshold.patch | 8 +-- ...nt-configurable-villager-brain-ticks.patch | 6 +-- ...n-for-zombies-targetting-turtle-eggs.patch | 6 +-- ...054-Implement-bamboo-growth-settings.patch | 6 +-- ...-should-not-bypass-cramming-gamerule.patch | 8 +-- .../0056-Option-for-slimes-not-pushable.patch | 6 +-- ...ispenser-curse-of-binding-protection.patch | 6 +-- ...n-for-boats-to-eject-players-on-land.patch | 8 +-- ...option-to-set-armorstand-step-height.patch | 8 +-- .../0064-Alternative-Keepalive-Handling.patch | 6 +-- patches/server/0069-Barrels-have-6-rows.patch | 8 +-- .../0070-Ender-chests-have-6-rows.patch | 8 +-- ...to-allow-iron-golems-to-spawn-in-air.patch | 6 +-- ...e-permissions-for-players-on-world-c.patch | 6 +-- .../server/0079-Implement-infinite-lava.patch | 6 +-- .../0081-Despawn-egg-hatches-chicken.patch | 6 +-- patches/server/0083-Add-sleep-options.patch | 8 +-- ...084-Option-for-hay-block-fall-damage.patch | 6 +-- ...0087-Villagers-follow-emerald-blocks.patch | 6 +-- ...Add-player-death-exp-control-options.patch | 8 +-- .../0090-Allow-leashing-villagers.patch | 8 +-- ...urable-search-radius-for-villagers-t.patch | 8 +-- ...ombie-villager-transformation-chance.patch | 6 +-- ...93-Make-lava-flow-speed-configurable.patch | 6 +-- ...-skeleton-takes-wither-damage-option.patch | 6 +-- .../0095-UPnP-Port-Forwarding-Service.patch | 8 +-- ...o-disable-saving-projectiles-to-disk.patch | 30 ++++++++--- 66 files changed, 265 insertions(+), 254 deletions(-) diff --git a/patches/server/0002-Purpur-config-files.patch b/patches/server/0002-Purpur-config-files.patch index 0a4179db0..2ff55fbdd 100644 --- a/patches/server/0002-Purpur-config-files.patch +++ b/patches/server/0002-Purpur-config-files.patch @@ -1,4 +1,4 @@ -From 62e0511e12ddc2b636f8fc8934a1d16673c9dd49 Mon Sep 17 00:00:00 2001 +From e99b757757c6fa75be9da4b9cf7c66deeaf13b7a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 18:09:43 -0500 Subject: [PATCH] Purpur config files @@ -9,11 +9,11 @@ Subject: [PATCH] Purpur config files src/main/java/net/minecraft/server/World.java | 3 + src/main/java/net/pl3x/purpur/Metrics.java | 598 ++++++++++++++++++ .../java/net/pl3x/purpur/PurpurCommand.java | 66 ++ - .../java/net/pl3x/purpur/PurpurConfig.java | 133 ++++ - .../net/pl3x/purpur/PurpurWorldConfig.java | 60 ++ + .../java/net/pl3x/purpur/PurpurConfig.java | 135 ++++ + .../net/pl3x/purpur/PurpurWorldConfig.java | 67 ++ .../org/bukkit/craftbukkit/CraftServer.java | 11 + .../java/org/bukkit/craftbukkit/Main.java | 8 + - 9 files changed, 890 insertions(+) + 9 files changed, 899 insertions(+) create mode 100644 src/main/java/net/pl3x/purpur/Metrics.java create mode 100644 src/main/java/net/pl3x/purpur/PurpurCommand.java create mode 100644 src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -57,7 +57,7 @@ index 349a0ea213..d70c8cab2b 100644 // Paper end diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 3c966b4ab6..4e8a53d104 100644 +index baad985178..89090b12d2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -80,6 +80,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -755,10 +755,10 @@ index 0000000000..f8cf4ad234 +} diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java new file mode 100644 -index 0000000000..8600a868fb +index 0000000000..706d787579 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -0,0 +1,133 @@ +@@ -0,0 +1,135 @@ +package net.pl3x.purpur; + +import com.google.common.base.Throwables; @@ -779,7 +779,6 @@ index 0000000000..8600a868fb +import java.util.logging.Level; + +public class PurpurConfig { -+ private static final int CONFIG_VERSION = 3; + private static final String HEADER = "This is the main configuration file for Purpur.\n" + + "As you can see, there's tons to configure. Some options may impact gameplay, so use\n" + + "with caution, and make sure you know what each option does before configuring.\n" @@ -791,11 +790,13 @@ index 0000000000..8600a868fb + + "Docs: https://purpur.readthedocs.org/ \n"; + private static File CONFIG_FILE; + public static YamlConfiguration config; -+ static Map commands; -+ private static int version; -+ private static boolean verbose; ++ ++ private static Map commands; + private static boolean metricsStarted; + ++ static int version; ++ static boolean verbose; ++ + public static void init(File configFile) { + CONFIG_FILE = configFile; + config = new YamlConfiguration(); @@ -813,20 +814,20 @@ index 0000000000..8600a868fb + commands = new HashMap<>(); + commands.put("purpur", new PurpurCommand("purpur")); + -+ version = getInt("config-version", CONFIG_VERSION); -+ set("config-version", version); ++ version = getInt("config-version", 4); ++ set("config-version", 4); + + readConfig(PurpurConfig.class, null); + } + + protected static void log(String s) { -+ log(Level.INFO, s); ++ if (verbose) { ++ log(Level.INFO, s); ++ } + } + + protected static void log(Level level, String s) { -+ if (verbose) { -+ Bukkit.getLogger().log(level, s); -+ } ++ Bukkit.getLogger().log(level, s); + } + + public static void registerCommands() { @@ -864,6 +865,7 @@ index 0000000000..8600a868fb + } + + private static void set(String path, Object val) { ++ config.addDefault(path, val); + config.set(path, val); + } + @@ -894,13 +896,14 @@ index 0000000000..8600a868fb +} diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java new file mode 100644 -index 0000000000..4985f21733 +index 0000000000..eda37fa43f --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -0,0 +1,60 @@ +@@ -0,0 +1,67 @@ +package net.pl3x.purpur; + +import com.destroystokyo.paper.PaperWorldConfig; ++import org.bukkit.configuration.ConfigurationSection; +import org.spigotmc.SpigotWorldConfig; + +import java.util.List; @@ -912,7 +915,6 @@ index 0000000000..4985f21733 + private final String worldName; + private final PaperWorldConfig paperConfig; + private final SpigotWorldConfig spigotConfig; -+ private boolean verbose; + + public PurpurWorldConfig(String worldName, PaperWorldConfig paperConfig, SpigotWorldConfig spigotConfig) { + this.worldName = worldName; @@ -927,12 +929,19 @@ index 0000000000..4985f21733 + } + + private void set(String path, Object val) { ++ PurpurConfig.config.addDefault("world-settings.default." + path, val); + PurpurConfig.config.set("world-settings.default." + path, val); + if (PurpurConfig.config.get("world-settings." + worldName + "." + path) != null) { ++ PurpurConfig.config.addDefault("world-settings." + worldName + "." + path, val); + PurpurConfig.config.set("world-settings." + worldName + "." + path, val); + } + } + ++ private ConfigurationSection getConfigurationSection(String path) { ++ ConfigurationSection section = PurpurConfig.config.getConfigurationSection("world-settings." + worldName + "." + path); ++ return section != null ? section : PurpurConfig.config.getConfigurationSection("world-settings.default." + path); ++ } ++ + private boolean getBoolean(String path, boolean def) { + PurpurConfig.config.addDefault("world-settings.default." + path, def); + return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path)); @@ -1002,7 +1011,7 @@ index fc074a66c9..df4fb5947a 100644 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index af05f3c1e0..533cfe7386 100644 +index 374e0450a2..b5bc4e2097 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -138,6 +138,14 @@ public class Main { diff --git a/patches/server/0003-Host-our-own-timings.patch b/patches/server/0003-Host-our-own-timings.patch index 01b88fc79..6e43e6a35 100644 --- a/patches/server/0003-Host-our-own-timings.patch +++ b/patches/server/0003-Host-our-own-timings.patch @@ -1,4 +1,4 @@ -From 7f8ed502a3352684c662c451d68301399c569e6e Mon Sep 17 00:00:00 2001 +From b9aca72a928b3b47b485b2f72ca05f67139d9f51 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 18 Feb 2020 20:38:34 -0600 Subject: [PATCH] Host our own timings @@ -8,10 +8,10 @@ Subject: [PATCH] Host our own timings 1 file changed, 4 insertions(+) diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 8600a868fb..4affd40fc9 100644 +index 706d787579..f234832e6f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -130,4 +130,8 @@ public class PurpurConfig { +@@ -132,4 +132,8 @@ public class PurpurConfig { config.addDefault(path, def); return config.getString(path, config.getString(path)); } diff --git a/patches/server/0004-Ridables.patch b/patches/server/0004-Ridables.patch index fa4cfc6be..593e7731d 100644 --- a/patches/server/0004-Ridables.patch +++ b/patches/server/0004-Ridables.patch @@ -1,4 +1,4 @@ -From 08ce7fec031b626b24d380cac2563cf331672249 Mon Sep 17 00:00:00 2001 +From c455f67309bc18d64dc759e33a47058c42c99c73 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Feb 2020 19:53:59 -0600 Subject: [PATCH] Ridables @@ -4595,10 +4595,10 @@ index 89090b12d2..7db28d954f 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4985f21733..a61999063f 100644 +index eda37fa43f..ad96353afd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -57,4 +57,589 @@ public class PurpurWorldConfig { +@@ -64,4 +64,589 @@ public class PurpurWorldConfig { PurpurConfig.config.addDefault("world-settings.default." + path, def); return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path)); } diff --git a/patches/server/0005-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0005-Logger-settings-suppressing-pointless-logs.patch index 79bdf94f0..d986d3738 100644 --- a/patches/server/0005-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0005-Logger-settings-suppressing-pointless-logs.patch @@ -1,4 +1,4 @@ -From a8830883f3e74561f45f6c44b4bb054643609b12 Mon Sep 17 00:00:00 2001 +From c16b4b8a5b5c63759a8072f0d90e78d889a60680 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:52:12 -0500 Subject: [PATCH] Logger settings (suppressing pointless logs) @@ -44,10 +44,10 @@ index de8f1874af..1c2320cc54 100644 return new WorldGenFeatureConfigured<>(WorldGenerator.NO_OP, WorldGenFeatureEmptyConfiguration.e); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 4affd40fc9..854b06cb6d 100644 +index f234832e6f..345404c3a1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -131,6 +131,15 @@ public class PurpurConfig { +@@ -133,6 +133,15 @@ public class PurpurConfig { return config.getString(path, config.getString(path)); } diff --git a/patches/server/0009-Giants-naturally-spawn-and-have-AI.patch b/patches/server/0009-Giants-naturally-spawn-and-have-AI.patch index 649fee31a..7065a0753 100644 --- a/patches/server/0009-Giants-naturally-spawn-and-have-AI.patch +++ b/patches/server/0009-Giants-naturally-spawn-and-have-AI.patch @@ -1,4 +1,4 @@ -From 9512ff9689daf392b15bdf934d7fd1afe70369a2 Mon Sep 17 00:00:00 2001 +From baa5038436e12073e9807f59587068410bfbc2b4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 May 2019 00:43:12 -0500 Subject: [PATCH] Giants naturally spawn and have AI @@ -168,10 +168,10 @@ index 58bbf2f9d2..71920d7f84 100644 EntityPositionTypes.Surface entitypositiontypes_surface = EntityPositionTypes.a(entitytypes); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a61999063f..8cdcca3bd1 100644 +index ad96353afd..a98c346441 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -242,12 +242,24 @@ public class PurpurWorldConfig { +@@ -249,12 +249,24 @@ public class PurpurWorldConfig { public boolean giantRequireShiftToMount = true; public float giantStepHeight = 2.0F; public float giantJumpHeight = 1.0F; diff --git a/patches/server/0010-Illusioners-naturally-spawn.patch b/patches/server/0010-Illusioners-naturally-spawn.patch index de5edca4c..07ae92066 100644 --- a/patches/server/0010-Illusioners-naturally-spawn.patch +++ b/patches/server/0010-Illusioners-naturally-spawn.patch @@ -1,4 +1,4 @@ -From 96702af3d2456edd1696941f8b133b2e8b60aba6 Mon Sep 17 00:00:00 2001 +From ba3e5917f7041f1013db246637da709dced90b2b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jul 2019 11:09:25 -0500 Subject: [PATCH] Illusioners naturally spawn @@ -68,10 +68,10 @@ index 71920d7f84..2e868f5d53 100644 // Purpur end diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8cdcca3bd1..8d6d252729 100644 +index a98c346441..c222e5fd37 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -288,10 +288,18 @@ public class PurpurWorldConfig { +@@ -295,10 +295,18 @@ public class PurpurWorldConfig { public boolean illusionerRidable = false; public boolean illusionerRidableInWater = false; public boolean illusionerRequireShiftToMount = true; diff --git a/patches/server/0011-Zombie-horse-naturally-spawn.patch b/patches/server/0011-Zombie-horse-naturally-spawn.patch index d53edcbb7..01578a59c 100644 --- a/patches/server/0011-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0011-Zombie-horse-naturally-spawn.patch @@ -1,4 +1,4 @@ -From 1f759f441b690b38c55bce7451b6a7ab2431338c Mon Sep 17 00:00:00 2001 +From 1ff1a1fc9bd2f8bd1c3d35f2a3bb561edf828e6c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 7 Jul 2019 19:52:16 -0500 Subject: [PATCH] Zombie horse naturally spawn @@ -38,10 +38,10 @@ index c74b85917a..874b8c1292 100644 this.strikeLightning(new EntityLightning(this, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, flag1), org.bukkit.event.weather.LightningStrikeEvent.Cause.WEATHER); // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8d6d252729..723776f957 100644 +index c222e5fd37..bf43a2d0dd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -640,9 +640,11 @@ public class PurpurWorldConfig { +@@ -647,9 +647,11 @@ public class PurpurWorldConfig { public boolean zombieHorseCanSwim = false; public boolean zombieHorseRidableInWater = false; diff --git a/patches/server/0012-Charged-creeper-naturally-spawn.patch b/patches/server/0012-Charged-creeper-naturally-spawn.patch index efec2142e..43c595ec6 100644 --- a/patches/server/0012-Charged-creeper-naturally-spawn.patch +++ b/patches/server/0012-Charged-creeper-naturally-spawn.patch @@ -1,4 +1,4 @@ -From fcdade43084137d1715a2ad229ef8780e0ff16e7 Mon Sep 17 00:00:00 2001 +From bef8a65647783e8ad68ec023cb7f081a45aa41cb Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 22:37:44 -0600 Subject: [PATCH] Charged creeper naturally spawn @@ -31,10 +31,10 @@ index 48fd8e716b..ce366f401f 100644 public void b(NBTTagCompound nbttagcompound) { super.b(nbttagcompound); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 723776f957..c6dce70d0c 100644 +index bf43a2d0dd..30b36d06b4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -141,10 +141,12 @@ public class PurpurWorldConfig { +@@ -148,10 +148,12 @@ public class PurpurWorldConfig { public boolean creeperRidable = false; public boolean creeperRidableInWater = false; public boolean creeperRequireShiftToMount = true; diff --git a/patches/server/0013-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0013-Rabbit-naturally-spawn-toast-and-killer.patch index 47dc34533..c543d9c01 100644 --- a/patches/server/0013-Rabbit-naturally-spawn-toast-and-killer.patch +++ b/patches/server/0013-Rabbit-naturally-spawn-toast-and-killer.patch @@ -1,4 +1,4 @@ -From f38e07e09babd28a2dfa54486f7f38de13c4c62a Mon Sep 17 00:00:00 2001 +From 888d45187cf28f0f1d6d7d568987c802d4e3f6aa Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 31 Aug 2019 17:47:11 -0500 Subject: [PATCH] Rabbit naturally spawn toast and killer @@ -41,10 +41,10 @@ index 9040ab1c54..0232226f06 100644 int i = this.random.nextInt(100); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c6dce70d0c..c51023d0c3 100644 +index 30b36d06b4..9d7b25dd95 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -423,10 +423,14 @@ public class PurpurWorldConfig { +@@ -430,10 +430,14 @@ public class PurpurWorldConfig { public boolean rabbitRidable = false; public boolean rabbitRidableInWater = false; public boolean rabbitRequireShiftToMount = true; diff --git a/patches/server/0014-Cat-spawning-options.patch b/patches/server/0014-Cat-spawning-options.patch index 3a9878980..e0a2e5d6a 100644 --- a/patches/server/0014-Cat-spawning-options.patch +++ b/patches/server/0014-Cat-spawning-options.patch @@ -1,4 +1,4 @@ -From a2f48b3990cb8db39a374ffa3cdbc50de3d41c61 Mon Sep 17 00:00:00 2001 +From abe11171c4fe52245570a570273171f0d245f4bf Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Dec 2019 18:52:55 -0600 Subject: [PATCH] Cat spawning options @@ -57,10 +57,10 @@ index 6024478dc0..4b55c07d41 100644 return list.size() < 1 ? this.a(blockposition, world) : 0; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c51023d0c3..e5cd92e2de 100644 +index 9d7b25dd95..a1f0e659c2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -94,10 +94,16 @@ public class PurpurWorldConfig { +@@ -101,10 +101,16 @@ public class PurpurWorldConfig { public boolean catRidable = false; public boolean catRidableInWater = false; public boolean catRequireShiftToMount = true; diff --git a/patches/server/0016-Cows-eat-mushrooms.patch b/patches/server/0016-Cows-eat-mushrooms.patch index be4064a5f..ed3eb9d7f 100644 --- a/patches/server/0016-Cows-eat-mushrooms.patch +++ b/patches/server/0016-Cows-eat-mushrooms.patch @@ -1,4 +1,4 @@ -From 502dc73f1b8d231037097df49d29893d323e8e62 Mon Sep 17 00:00:00 2001 +From 4911ba74585eb8bca5bb424f9ac530c7f4781587 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:10:30 -0500 Subject: [PATCH] Cows eat mushrooms @@ -140,10 +140,10 @@ index 17ff8a9fc3..6ca11091c9 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e5cd92e2de..88aa21fe42 100644 +index a1f0e659c2..c5c59a8c81 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -138,10 +138,12 @@ public class PurpurWorldConfig { +@@ -145,10 +145,12 @@ public class PurpurWorldConfig { public boolean cowRidable = false; public boolean cowRidableInWater = false; public boolean cowRequireShiftToMount = true; diff --git a/patches/server/0018-Pigs-give-saddle-back.patch b/patches/server/0018-Pigs-give-saddle-back.patch index ce854aba2..e677915ab 100644 --- a/patches/server/0018-Pigs-give-saddle-back.patch +++ b/patches/server/0018-Pigs-give-saddle-back.patch @@ -1,4 +1,4 @@ -From 1e9b7cb68157afe5b22c2db935ad6427c79260e0 Mon Sep 17 00:00:00 2001 +From c4f4097b323c86357987ad1446e23b08117dbae2 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 May 2019 01:14:46 -0500 Subject: [PATCH] Pigs give saddle back @@ -32,10 +32,10 @@ index e6a7f8ef37..d78666dbb2 100644 return true; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 88aa21fe42..cd3b29ef1f 100644 +index c5c59a8c81..992c879dc7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -396,9 +396,11 @@ public class PurpurWorldConfig { +@@ -403,9 +403,11 @@ public class PurpurWorldConfig { public boolean pigRidable = false; public boolean pigRidableInWater = false; diff --git a/patches/server/0019-Phantoms-do-not-spawn-on-creative-players.patch b/patches/server/0019-Phantoms-do-not-spawn-on-creative-players.patch index f5285363a..3726db2a1 100644 --- a/patches/server/0019-Phantoms-do-not-spawn-on-creative-players.patch +++ b/patches/server/0019-Phantoms-do-not-spawn-on-creative-players.patch @@ -1,4 +1,4 @@ -From 5ab14f4769b3fd58bdf09848449e8c5e91f22dc3 Mon Sep 17 00:00:00 2001 +From 494d08d3e3441e1aa3c4a3f6f6873aea4caf7faa Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 18 May 2019 16:59:52 -0500 Subject: [PATCH] Phantoms do not spawn on creative players @@ -22,10 +22,10 @@ index f488c22ed6..748983da29 100644 if (!worldserver.worldProvider.f() || blockposition.getY() >= worldserver.getSeaLevel() && worldserver.f(blockposition)) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index cd3b29ef1f..9e89eafb8f 100644 +index 992c879dc7..f965c36aa3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -387,11 +387,13 @@ public class PurpurWorldConfig { +@@ -394,11 +394,13 @@ public class PurpurWorldConfig { public boolean phantomRidableInWater = false; public boolean phantomRequireShiftToMount = true; public double phantomMaxY = 256D; diff --git a/patches/server/0020-Phantoms-only-attack-insomniacs.patch b/patches/server/0020-Phantoms-only-attack-insomniacs.patch index 76d5cf387..b283a12d0 100644 --- a/patches/server/0020-Phantoms-only-attack-insomniacs.patch +++ b/patches/server/0020-Phantoms-only-attack-insomniacs.patch @@ -1,4 +1,4 @@ -From 71fcbab5c7496fbaaddf8d398ae6d7dd26590a9f Mon Sep 17 00:00:00 2001 +From 3feda3d35f691a0119de09afb548f63d3af59550 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 20:33:41 -0600 Subject: [PATCH] Phantoms only attack insomniacs @@ -34,10 +34,10 @@ index a2d1ef3602..e1fdee2794 100644 public static Predicate a(double d0, double d1, double d2, double d3) { double d4 = d3 * d3; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9e89eafb8f..90aa470c2a 100644 +index f965c36aa3..03b9874f76 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -388,12 +388,14 @@ public class PurpurWorldConfig { +@@ -395,12 +395,14 @@ public class PurpurWorldConfig { public boolean phantomRequireShiftToMount = true; public double phantomMaxY = 256D; public boolean phantomIgnoreCreative = false; diff --git a/patches/server/0021-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0021-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 5e4ffc100..0baa38a54 100644 --- a/patches/server/0021-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0021-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -1,4 +1,4 @@ -From 0cb18f1bf59e372cf29c3487eb1d375574ad8df9 Mon Sep 17 00:00:00 2001 +From 94704c548769a187716a810628b62f0e693125ea Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 May 2019 18:26:06 -0500 Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms @@ -364,10 +364,10 @@ index 4157e50e4d..774ec96f0a 100644 return this.a(oclass, axisalignedbb, IEntitySelector.f); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 90aa470c2a..8fdc6feb67 100644 +index 03b9874f76..1525a6c77d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -389,6 +389,9 @@ public class PurpurWorldConfig { +@@ -396,6 +396,9 @@ public class PurpurWorldConfig { public double phantomMaxY = 256D; public boolean phantomIgnoreCreative = false; public boolean phantomOnlyAttackInsomniacs = false; @@ -377,7 +377,7 @@ index 90aa470c2a..8fdc6feb67 100644 private void phantomSettings() { phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable); phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater); -@@ -396,6 +399,9 @@ public class PurpurWorldConfig { +@@ -403,6 +406,9 @@ public class PurpurWorldConfig { phantomMaxY = getDouble("mobs.phantom.ridable-max-y", phantomMaxY); phantomIgnoreCreative = getBoolean("mobs.phantom.do-not-spawn-on-creative-players", phantomIgnoreCreative); phantomOnlyAttackInsomniacs = getBoolean("mobs.phantom.only-attack-insomniacs", phantomOnlyAttackInsomniacs); diff --git a/patches/server/0022-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0022-Snowman-drop-and-put-back-pumpkin.patch index f01c6be6f..9e6cca1d2 100644 --- a/patches/server/0022-Snowman-drop-and-put-back-pumpkin.patch +++ b/patches/server/0022-Snowman-drop-and-put-back-pumpkin.patch @@ -1,4 +1,4 @@ -From 8a268e2eb5a8f669a5c2d570217db5cd450e1b6c Mon Sep 17 00:00:00 2001 +From 1fc4ffd1aba3766424dae52d6c661b33a7bcc761 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 3 May 2019 23:58:44 -0500 Subject: [PATCH] Snowman drop and put back pumpkin @@ -47,10 +47,10 @@ index 941873513f..efc2205f7c 100644 return tryRide(entityhuman, enumhand); // Purpur } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8fdc6feb67..501544b67a 100644 +index 1525a6c77d..f0d14d34ed 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -527,11 +527,15 @@ public class PurpurWorldConfig { +@@ -534,11 +534,15 @@ public class PurpurWorldConfig { public boolean snowGolemRidableInWater = false; public boolean snowGolemRequireShiftToMount = true; public boolean snowGolemLeaveTrailWhenRidden = false; diff --git a/patches/server/0023-Ender-dragon-always-drop-egg.patch b/patches/server/0023-Ender-dragon-always-drop-egg.patch index c53d45e25..543934982 100644 --- a/patches/server/0023-Ender-dragon-always-drop-egg.patch +++ b/patches/server/0023-Ender-dragon-always-drop-egg.patch @@ -1,4 +1,4 @@ -From c107f6c9b946607bfa26f0f30fdc67ebf803f15b Mon Sep 17 00:00:00 2001 +From 7b703f67f24245761a6724ea33af57b446b2698c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 7 Feb 2020 04:42:57 -0600 Subject: [PATCH] Ender dragon always drop egg @@ -39,10 +39,10 @@ index 218c04245b..48398aa9f0 100644 return this.l; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 501544b67a..b763c11448 100644 +index f0d14d34ed..d69baa858c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -193,11 +193,13 @@ public class PurpurWorldConfig { +@@ -200,11 +200,13 @@ public class PurpurWorldConfig { public boolean enderDragonRidableInWater = false; public boolean enderDragonRequireShiftToMount = true; public double enderDragonMaxY = 256D; diff --git a/patches/server/0024-Ender-dragon-always-drop-full-exp.patch b/patches/server/0024-Ender-dragon-always-drop-full-exp.patch index ba14ba4c9..cb55d1861 100644 --- a/patches/server/0024-Ender-dragon-always-drop-full-exp.patch +++ b/patches/server/0024-Ender-dragon-always-drop-full-exp.patch @@ -1,4 +1,4 @@ -From 849b32b8c9a99e445787fc187f747341267ec513 Mon Sep 17 00:00:00 2001 +From d9ce7139f4c2eb9a3e6455f0c70f1d204c2a373d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 24 Aug 2019 14:42:54 -0500 Subject: [PATCH] Ender dragon always drop full exp @@ -22,10 +22,10 @@ index 9cba1b6c84..5aea402797 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b763c11448..c8ab99876d 100644 +index d69baa858c..5ed5276348 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -194,12 +194,14 @@ public class PurpurWorldConfig { +@@ -201,12 +201,14 @@ public class PurpurWorldConfig { public boolean enderDragonRequireShiftToMount = true; public double enderDragonMaxY = 256D; public boolean enderDragonAlwaysDropsEggBlock = false; diff --git a/patches/server/0025-Signs-editable-on-right-click.patch b/patches/server/0025-Signs-editable-on-right-click.patch index f026e8a4a..6a0711577 100644 --- a/patches/server/0025-Signs-editable-on-right-click.patch +++ b/patches/server/0025-Signs-editable-on-right-click.patch @@ -1,4 +1,4 @@ -From 4e5a5546dff01379560da8176820e9f87048629d Mon Sep 17 00:00:00 2001 +From bc34b76f3808feb8a093b0d3592ba06dfcc7ad14 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 24 May 2019 02:39:25 -0500 Subject: [PATCH] Signs editable on right click @@ -44,10 +44,10 @@ index 0e9a90b70f..099d98e04c 100644 // Paper start //this.c = entityhuman; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c8ab99876d..ad689ce640 100644 +index 5ed5276348..79398d8326 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -58,6 +58,11 @@ public class PurpurWorldConfig { +@@ -65,6 +65,11 @@ public class PurpurWorldConfig { return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path)); } diff --git a/patches/server/0027-Add-turtle-egg-block-options-fixes-MC-168772.patch b/patches/server/0027-Add-turtle-egg-block-options-fixes-MC-168772.patch index 7c0b32290..5ef99c89d 100644 --- a/patches/server/0027-Add-turtle-egg-block-options-fixes-MC-168772.patch +++ b/patches/server/0027-Add-turtle-egg-block-options-fixes-MC-168772.patch @@ -1,4 +1,4 @@ -From b9343fffdace00607d3427c67f747fd37c02dc6f Mon Sep 17 00:00:00 2001 +From bb0177e4a5ceb6c12a23c9854bfd6131ad39f3e9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 22:15:46 -0500 Subject: [PATCH] Add turtle egg block options - fixes MC-168772 @@ -38,10 +38,10 @@ index cb36334e41..aa83ef1699 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ad689ce640..737eecb342 100644 +index 79398d8326..ef94b84233 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -63,6 +63,15 @@ public class PurpurWorldConfig { +@@ -70,6 +70,15 @@ public class PurpurWorldConfig { signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit); } diff --git a/patches/server/0028-Make-Iron-Golems-Swim.patch b/patches/server/0028-Make-Iron-Golems-Swim.patch index 9e5af64a7..d6db11d71 100644 --- a/patches/server/0028-Make-Iron-Golems-Swim.patch +++ b/patches/server/0028-Make-Iron-Golems-Swim.patch @@ -1,4 +1,4 @@ -From efd8418aba30c7d067c8dfcc771961c07f0ed08d Mon Sep 17 00:00:00 2001 +From f43f1dfdff454bdbeda035515a71eafbf7453fdf Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 15 Jun 2019 03:12:15 -0500 Subject: [PATCH] Make Iron Golems Swim @@ -21,10 +21,10 @@ index 46e4574e55..5414d6975f 100644 this.goalSelector.a(1, new PathfinderGoalMeleeAttack(this, 1.0D, true)); this.goalSelector.a(2, new PathfinderGoalMoveTowardsTarget(this, 0.9D, 32.0F)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 737eecb342..2d51bbab2d 100644 +index ef94b84233..0191015b99 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -333,10 +333,12 @@ public class PurpurWorldConfig { +@@ -340,10 +340,12 @@ public class PurpurWorldConfig { public boolean ironGolemRidable = false; public boolean ironGolemRidableInWater = false; public boolean ironGolemRequireShiftToMount = true; diff --git a/patches/server/0029-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0029-Allow-soil-to-moisten-from-water-directly-under-it.patch index 4da97f411..bad136b8c 100644 --- a/patches/server/0029-Allow-soil-to-moisten-from-water-directly-under-it.patch +++ b/patches/server/0029-Allow-soil-to-moisten-from-water-directly-under-it.patch @@ -1,4 +1,4 @@ -From f86c6a0823aaf59920c8d99e37469b3f46af87ac Mon Sep 17 00:00:00 2001 +From 505bd6ed2c33f6b92dc225e1623ccea9ad9238a3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 21 Jun 2019 14:37:10 -0500 Subject: [PATCH] Allow soil to moisten from water directly under it @@ -47,10 +47,10 @@ index b6561f2c79..f2ab3ee011 100644 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2d51bbab2d..07c3952df1 100644 +index 0191015b99..346ab82e62 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -58,6 +58,11 @@ public class PurpurWorldConfig { +@@ -65,6 +65,11 @@ public class PurpurWorldConfig { return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path)); } diff --git a/patches/server/0030-Controllable-Minecarts.patch b/patches/server/0030-Controllable-Minecarts.patch index 201c23bdb..5b9c39806 100644 --- a/patches/server/0030-Controllable-Minecarts.patch +++ b/patches/server/0030-Controllable-Minecarts.patch @@ -1,4 +1,4 @@ -From 30ad015f93cd66d81bcb5bfce4c05851a0db3fb1 Mon Sep 17 00:00:00 2001 +From 4f7e9fe896649cbd6b8825bbf68e03e692a347f6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 29 Jun 2019 02:32:40 -0500 Subject: [PATCH] Controllable Minecarts @@ -7,8 +7,8 @@ Subject: [PATCH] Controllable Minecarts .../java/net/minecraft/server/Entity.java | 1 + .../server/EntityMinecartAbstract.java | 38 +++++++++++++++++++ .../net/minecraft/server/ItemMinecart.java | 8 ++-- - .../net/pl3x/purpur/PurpurWorldConfig.java | 38 +++++++++++++++++++ - 4 files changed, 82 insertions(+), 3 deletions(-) + .../net/pl3x/purpur/PurpurWorldConfig.java | 32 ++++++++++++++++ + 4 files changed, 76 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 1d967ad6a1..2bbdb994a5 100644 @@ -103,10 +103,10 @@ index b73e317fbb..e1337a9c04 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 07c3952df1..7add972253 100644 +index 346ab82e62..63afc5d98e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1,9 +1,16 @@ +@@ -1,10 +1,16 @@ package net.pl3x.purpur; import com.destroystokyo.paper.PaperWorldConfig; @@ -114,7 +114,7 @@ index 07c3952df1..7add972253 100644 +import net.minecraft.server.Blocks; +import net.minecraft.server.IRegistry; +import net.minecraft.server.MinecraftKey; -+import org.bukkit.configuration.ConfigurationSection; + import org.bukkit.configuration.ConfigurationSection; import org.spigotmc.SpigotWorldConfig; +import java.util.HashMap; @@ -123,19 +123,7 @@ index 07c3952df1..7add972253 100644 import static net.pl3x.purpur.PurpurConfig.log; -@@ -33,6 +40,11 @@ public class PurpurWorldConfig { - } - } - -+ private ConfigurationSection getConfigurationSection(String path) { -+ ConfigurationSection section = PurpurConfig.config.getConfigurationSection("world-settings." + worldName + "." + path); -+ return section != null ? section : PurpurConfig.config.getConfigurationSection("world-settings.default." + path); -+ } -+ - private boolean getBoolean(String path, boolean def) { - PurpurConfig.config.addDefault("world-settings.default." + path, def); - return PurpurConfig.config.getBoolean("world-settings." + worldName + "." + path, PurpurConfig.config.getBoolean("world-settings.default." + path)); -@@ -77,6 +89,32 @@ public class PurpurWorldConfig { +@@ -84,6 +90,32 @@ public class PurpurWorldConfig { turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts); } diff --git a/patches/server/0031-Signs-allow-color-codes.patch b/patches/server/0031-Signs-allow-color-codes.patch index 3334fa1e9..aa1124764 100644 --- a/patches/server/0031-Signs-allow-color-codes.patch +++ b/patches/server/0031-Signs-allow-color-codes.patch @@ -1,4 +1,4 @@ -From 203f02b4dd7038d996983bcde526029df3e1036b Mon Sep 17 00:00:00 2001 +From 1dc4b6dd5cf26283660677bf4e1e65b3c7066d2e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 17:40:30 -0500 Subject: [PATCH] Signs allow color codes @@ -67,10 +67,10 @@ index 099d98e04c..19d76c8cce 100644 @Override public PacketPlayOutTileEntityData getUpdatePacket() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7add972253..5faeb7757c 100644 +index 63afc5d98e..7891812a87 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -75,8 +75,10 @@ public class PurpurWorldConfig { +@@ -76,8 +76,10 @@ public class PurpurWorldConfig { farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow); } diff --git a/patches/server/0032-Campfires-have-regen-effect.patch b/patches/server/0032-Campfires-have-regen-effect.patch index 33e978acb..be8ea1288 100644 --- a/patches/server/0032-Campfires-have-regen-effect.patch +++ b/patches/server/0032-Campfires-have-regen-effect.patch @@ -1,4 +1,4 @@ -From a7edbb799ea3a8fd38526358d8b92f20537b629c Mon Sep 17 00:00:00 2001 +From 49fb3d8fe87ff9eda150d5b5491f9eaa8171af2a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 19 May 2019 18:11:53 -0500 Subject: [PATCH] Campfires have regen effect @@ -165,10 +165,10 @@ index a1580b8c6d..618ca2d763 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5faeb7757c..05c615bc7d 100644 +index 7891812a87..6797fb54c6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -70,6 +70,29 @@ public class PurpurWorldConfig { +@@ -71,6 +71,29 @@ public class PurpurWorldConfig { return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path)); } diff --git a/patches/server/0033-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0033-Disable-loot-drops-on-death-by-cramming.patch index ca5c693e6..14a31b738 100644 --- a/patches/server/0033-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0033-Disable-loot-drops-on-death-by-cramming.patch @@ -1,4 +1,4 @@ -From 12d28024ebce9ac861c04b078102b7ee39803151 Mon Sep 17 00:00:00 2001 +From a375a1b587854f80a70ff53cad0400a5ea6afe1c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 3 Jul 2019 23:58:31 -0500 Subject: [PATCH] Disable loot drops on death by cramming @@ -24,10 +24,10 @@ index 2128e968ae..76a925f7aa 100644 deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 05c615bc7d..1941339d96 100644 +index 6797fb54c6..25c9706d1a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -120,6 +120,7 @@ public class PurpurWorldConfig { +@@ -121,6 +121,7 @@ public class PurpurWorldConfig { public double controllableMinecartsHopBoost = 0.5D; public double controllableMinecartsBaseSpeed = 0.1D; public Map controllableMinecartsBlockSpeeds = new HashMap<>(); @@ -35,7 +35,7 @@ index 05c615bc7d..1941339d96 100644 private void gameplayMechanicsSettings() { controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts); controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere); -@@ -138,6 +139,7 @@ public class PurpurWorldConfig { +@@ -139,6 +140,7 @@ public class PurpurWorldConfig { set("gameplay-mechanics.controllable-minecarts.block-speed.grass-block", 0.3D); set("gameplay-mechanics.controllable-minecarts.block-speed.stone", 0.5D); } diff --git a/patches/server/0034-Campfires-burn-out-in-rain.patch b/patches/server/0034-Campfires-burn-out-in-rain.patch index 813cd0b74..876825730 100644 --- a/patches/server/0034-Campfires-burn-out-in-rain.patch +++ b/patches/server/0034-Campfires-burn-out-in-rain.patch @@ -1,4 +1,4 @@ -From 096a06061c782505267144af06f880322fecf5ca Mon Sep 17 00:00:00 2001 +From 9c8327ea69c81a443e6fb537052131f2610c24c4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 21:30:49 -0500 Subject: [PATCH] Campfires burn out in rain @@ -58,10 +58,10 @@ index 65f8d803b8..3b95dfaaae 100644 public IBlockData updateState(IBlockData iblockdata, EnumDirection enumdirection, IBlockData iblockdata1, GeneratorAccess generatoraccess, BlockPosition blockposition, BlockPosition blockposition1) { if ((Boolean) iblockdata.get(BlockCampfire.d)) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1941339d96..9472d66ae3 100644 +index 25c9706d1a..470f398478 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -80,6 +80,7 @@ public class PurpurWorldConfig { +@@ -81,6 +81,7 @@ public class PurpurWorldConfig { public int campfireRegenBoostAmp = 1; public boolean campfireRegenBoostRequireLineOfSight = false; public boolean campfireRequireRegenPotion = true; @@ -69,7 +69,7 @@ index 1941339d96..9472d66ae3 100644 private void campfireSettings() { campfireRegenInterval = getInt("blocks.campfire.regen.interval", campfireRegenInterval); campfireRegenDuration = getInt("blocks.campfire.regen.duration", campfireRegenDuration); -@@ -91,6 +92,7 @@ public class PurpurWorldConfig { +@@ -92,6 +93,7 @@ public class PurpurWorldConfig { campfireRegenBoostAmp = getInt("blocks.campfire.regen.boost-amplifier", campfireRegenBoostAmp); campfireRegenBoostRequireLineOfSight = getBoolean("blocks.campfire.regen.boost-require-line-of-sight", campfireRegenBoostRequireLineOfSight); campfireRequireRegenPotion = getBoolean("blocks.campfire.regen.requires-potion-to-activate", campfireRequireRegenPotion); diff --git a/patches/server/0035-Campfires-should-fall-with-gravity.patch b/patches/server/0035-Campfires-should-fall-with-gravity.patch index 04bc95e7e..9b7976fc3 100644 --- a/patches/server/0035-Campfires-should-fall-with-gravity.patch +++ b/patches/server/0035-Campfires-should-fall-with-gravity.patch @@ -1,4 +1,4 @@ -From 51aa95970dc28ba0964dfb74bf88f14a273222bf Mon Sep 17 00:00:00 2001 +From 5fb4bb992229945bf15ed4e5807ba6b45fc07af3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 23 May 2019 16:20:21 -0500 Subject: [PATCH] Campfires should fall with gravity @@ -59,10 +59,10 @@ index 3b95dfaaae..418fa6d1fe 100644 if (flag) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9472d66ae3..be2f6bac11 100644 +index 470f398478..dbc73dd078 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -81,6 +81,7 @@ public class PurpurWorldConfig { +@@ -82,6 +82,7 @@ public class PurpurWorldConfig { public boolean campfireRegenBoostRequireLineOfSight = false; public boolean campfireRequireRegenPotion = true; public boolean campfireBurnOutInRain = false; @@ -70,7 +70,7 @@ index 9472d66ae3..be2f6bac11 100644 private void campfireSettings() { campfireRegenInterval = getInt("blocks.campfire.regen.interval", campfireRegenInterval); campfireRegenDuration = getInt("blocks.campfire.regen.duration", campfireRegenDuration); -@@ -93,6 +94,7 @@ public class PurpurWorldConfig { +@@ -94,6 +95,7 @@ public class PurpurWorldConfig { campfireRegenBoostRequireLineOfSight = getBoolean("blocks.campfire.regen.boost-require-line-of-sight", campfireRegenBoostRequireLineOfSight); campfireRequireRegenPotion = getBoolean("blocks.campfire.regen.requires-potion-to-activate", campfireRequireRegenPotion); campfireBurnOutInRain = getBoolean("blocks.campfire.burn-out-in-rain", campfireBurnOutInRain); diff --git a/patches/server/0036-Dont-send-useless-entity-packets.patch b/patches/server/0036-Dont-send-useless-entity-packets.patch index 9f80d8fbe..1c4fcc503 100644 --- a/patches/server/0036-Dont-send-useless-entity-packets.patch +++ b/patches/server/0036-Dont-send-useless-entity-packets.patch @@ -1,4 +1,4 @@ -From ad48384de1798c9af610dc41382cc515a5c6881b Mon Sep 17 00:00:00 2001 +From c3bdc395d0ac15e9041a62df97a778a88093d03a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 6 Jul 2019 17:00:04 -0500 Subject: [PATCH] Dont send useless entity packets @@ -66,10 +66,10 @@ index e5da2b19c1..5b1d959354 100644 protected boolean h; protected boolean i; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 854b06cb6d..f15dfad3d5 100644 +index 345404c3a1..e219312168 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -140,6 +140,11 @@ public class PurpurConfig { +@@ -142,6 +142,11 @@ public class PurpurConfig { loggerSuppressWorldGenFeatureDeserializationError = getBoolean("settings.logger.suppress-world-gen-feature-deserialization-errors", loggerSuppressWorldGenFeatureDeserializationError); } diff --git a/patches/server/0037-Fix-item-position-desync-MC-4.patch b/patches/server/0037-Fix-item-position-desync-MC-4.patch index 45482ab10..2ec847523 100644 --- a/patches/server/0037-Fix-item-position-desync-MC-4.patch +++ b/patches/server/0037-Fix-item-position-desync-MC-4.patch @@ -1,4 +1,4 @@ -From fa16cd1eda9ba4c73f649e4a9266ffa851b24431 Mon Sep 17 00:00:00 2001 +From 3a718b9327fd2969e3d91b7f8c9b7031c6b7cf5f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 6 Jul 2019 21:12:58 -0500 Subject: [PATCH] Fix item position desync (MC-4) @@ -44,10 +44,10 @@ index 5b1d959354..0010448e3a 100644 return (new Vec3D((double) i, (double) j, (double) k)).a(2.44140625E-4D); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index f15dfad3d5..294fc29cab 100644 +index e219312168..3670b4d48d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -141,8 +141,10 @@ public class PurpurConfig { +@@ -143,8 +143,10 @@ public class PurpurConfig { } public static boolean dontSendUselessEntityPackets = false; diff --git a/patches/server/0038-Rate-limit-incoming-packets-from-players.patch b/patches/server/0038-Rate-limit-incoming-packets-from-players.patch index 231829c1e..3b289f320 100644 --- a/patches/server/0038-Rate-limit-incoming-packets-from-players.patch +++ b/patches/server/0038-Rate-limit-incoming-packets-from-players.patch @@ -1,4 +1,4 @@ -From 0e9e3e75596824c30f8c5de2849f622d1d5ff7d5 Mon Sep 17 00:00:00 2001 +From 05fd0f4d1c80378cab200cce8ab5a2869b36fa7e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 7 Feb 2020 09:45:09 -0600 Subject: [PATCH] Rate limit incoming packets from players @@ -97,10 +97,10 @@ index fee512a479..e8851ffde6 100644 public void tick() { this.syncPosition(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 294fc29cab..5422a82705 100644 +index 3670b4d48d..e1a1ef860a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -140,6 +140,18 @@ public class PurpurConfig { +@@ -142,6 +142,18 @@ public class PurpurConfig { loggerSuppressWorldGenFeatureDeserializationError = getBoolean("settings.logger.suppress-world-gen-feature-deserialization-errors", loggerSuppressWorldGenFeatureDeserializationError); } diff --git a/patches/server/0039-Fix-pig-zombies-MC-56653.patch b/patches/server/0039-Fix-pig-zombies-MC-56653.patch index 901bed00f..113e87a54 100644 --- a/patches/server/0039-Fix-pig-zombies-MC-56653.patch +++ b/patches/server/0039-Fix-pig-zombies-MC-56653.patch @@ -1,4 +1,4 @@ -From 62314f9abc856b6f28e5eb77d643147bd71ae3ff Mon Sep 17 00:00:00 2001 +From 5776089edcb2f96c39c5ce6a6dd7df0f7d5c095f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 9 Jul 2019 20:56:47 -0500 Subject: [PATCH] Fix pig zombies (MC-56653) @@ -43,10 +43,10 @@ index fb9ef88ea3..227fff3f1d 100644 public PathfinderGoalAnger(EntityPigZombie entitypigzombie) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index be2f6bac11..e660121dfa 100644 +index dbc73dd078..c76363c529 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -774,10 +774,12 @@ public class PurpurWorldConfig { +@@ -775,10 +775,12 @@ public class PurpurWorldConfig { public boolean zombiePigmanRidable = false; public boolean zombiePigmanRidableInWater = false; public boolean zombiePigmanRequireShiftToMount = true; diff --git a/patches/server/0040-Implement-AFK-API.patch b/patches/server/0040-Implement-AFK-API.patch index b0934bf91..9bb3dfba6 100644 --- a/patches/server/0040-Implement-AFK-API.patch +++ b/patches/server/0040-Implement-AFK-API.patch @@ -1,4 +1,4 @@ -From 1b75efa6e54f40a7ae14ed77785c60e3fbacde7c Mon Sep 17 00:00:00 2001 +From 09c4fa30b4b8742d5c5c5d38f009725cf6fed262 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 8 Aug 2019 15:29:15 -0500 Subject: [PATCH] Implement AFK API @@ -227,10 +227,10 @@ index 874b8c1292..567b297e05 100644 } else if (entityplayer.isSleeping()) { ++j; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e660121dfa..6fb0d94a8b 100644 +index c76363c529..c53b07adf6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -146,6 +146,21 @@ public class PurpurWorldConfig { +@@ -147,6 +147,21 @@ public class PurpurWorldConfig { disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath); } diff --git a/patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch index 5a12fd3e8..6e6166db5 100644 --- a/patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch +++ b/patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch @@ -1,4 +1,4 @@ -From 1c740ee66f5a9fe3c113ea3779a9ed3d1c0bf437 Mon Sep 17 00:00:00 2001 +From 4b8226537e5aa88ca07986f9b92ddad27bf24158 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 10 Jul 2019 20:43:05 -0500 Subject: [PATCH] Option to toggle milk curing bad omen @@ -24,10 +24,10 @@ index 6b255e09ac..e1d3894ab7 100644 return itemstack.isEmpty() ? new ItemStack(Items.BUCKET) : itemstack; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6fb0d94a8b..fabe7d8e00 100644 +index c53b07adf6..a723f12a5e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -125,6 +125,7 @@ public class PurpurWorldConfig { +@@ -126,6 +126,7 @@ public class PurpurWorldConfig { public double controllableMinecartsBaseSpeed = 0.1D; public Map controllableMinecartsBlockSpeeds = new HashMap<>(); public boolean disableDropsOnCrammingDeath = false; @@ -35,7 +35,7 @@ index 6fb0d94a8b..fabe7d8e00 100644 private void gameplayMechanicsSettings() { controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts); controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere); -@@ -144,6 +145,7 @@ public class PurpurWorldConfig { +@@ -145,6 +146,7 @@ public class PurpurWorldConfig { set("gameplay-mechanics.controllable-minecarts.block-speed.stone", 0.5D); } disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath); diff --git a/patches/server/0042-Mending-mends-most-damages-equipment-first.patch b/patches/server/0042-Mending-mends-most-damages-equipment-first.patch index 84711d338..f5a35b83e 100644 --- a/patches/server/0042-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0042-Mending-mends-most-damages-equipment-first.patch @@ -1,4 +1,4 @@ -From 00b5b4af23c3e426c6046d44c44d83dea156b0c8 Mon Sep 17 00:00:00 2001 +From e4f019f1388c8fc8f08044fc99a3d6dd7306507f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 14 Jul 2019 19:52:47 -0500 Subject: [PATCH] Mending mends most damages equipment first @@ -86,10 +86,10 @@ index 4730c2beb7..4fe5038083 100644 return this.tag == null ? 0 : this.tag.getInt("Damage"); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index fabe7d8e00..61a04c4f86 100644 +index a723f12a5e..128eaa4acf 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -126,6 +126,7 @@ public class PurpurWorldConfig { +@@ -127,6 +127,7 @@ public class PurpurWorldConfig { public Map controllableMinecartsBlockSpeeds = new HashMap<>(); public boolean disableDropsOnCrammingDeath = false; public boolean milkCuresBadOmen = true; @@ -97,7 +97,7 @@ index fabe7d8e00..61a04c4f86 100644 private void gameplayMechanicsSettings() { controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts); controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere); -@@ -146,6 +147,7 @@ public class PurpurWorldConfig { +@@ -147,6 +148,7 @@ public class PurpurWorldConfig { } disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath); milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen); diff --git a/patches/server/0043-Tulips-change-fox-type.patch b/patches/server/0043-Tulips-change-fox-type.patch index db88e3894..4aa45aa6a 100644 --- a/patches/server/0043-Tulips-change-fox-type.patch +++ b/patches/server/0043-Tulips-change-fox-type.patch @@ -1,4 +1,4 @@ -From b4892598e259289da0e3474bb1c8954070cce800 Mon Sep 17 00:00:00 2001 +From 42c668202fe3bda7d2dff74cc799c8e4ff257edb Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 13 Jul 2019 15:56:22 -0500 Subject: [PATCH] Tulips change fox type @@ -90,10 +90,10 @@ index 54670f64cf..9c9b93f280 100644 public static final Item bd = a(Blocks.OXEYE_DAISY, CreativeModeTab.c); public static final Item be = a(Blocks.CORNFLOWER, CreativeModeTab.c); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 61a04c4f86..eac751fcb4 100644 +index 128eaa4acf..4685b6a2a3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -341,10 +341,12 @@ public class PurpurWorldConfig { +@@ -342,10 +342,12 @@ public class PurpurWorldConfig { public boolean foxRidable = false; public boolean foxRidableInWater = false; public boolean foxRequireShiftToMount = true; diff --git a/patches/server/0044-Implement-a-hard-limit-for-pillager-outpost-spawns.patch b/patches/server/0044-Implement-a-hard-limit-for-pillager-outpost-spawns.patch index 1faebd4f8..95659090d 100644 --- a/patches/server/0044-Implement-a-hard-limit-for-pillager-outpost-spawns.patch +++ b/patches/server/0044-Implement-a-hard-limit-for-pillager-outpost-spawns.patch @@ -1,4 +1,4 @@ -From 2c2ffecf7dab222250144001d5815e236ac0274c Mon Sep 17 00:00:00 2001 +From 9922e496f88231d1dfe3232b34cffa71a5e4fc71 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 22 Jul 2019 14:24:26 -0500 Subject: [PATCH] Implement a hard limit for pillager outpost spawns @@ -21,10 +21,10 @@ index 70f43c5159..baca8f7054 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index eac751fcb4..246bb51288 100644 +index 4685b6a2a3..c957c1cca9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -531,10 +531,12 @@ public class PurpurWorldConfig { +@@ -532,10 +532,12 @@ public class PurpurWorldConfig { public boolean pillagerRidable = false; public boolean pillagerRidableInWater = false; public boolean pillagerRequireShiftToMount = true; diff --git a/patches/server/0048-Implement-elytra-settings.patch b/patches/server/0048-Implement-elytra-settings.patch index f992f6770..4875866e5 100644 --- a/patches/server/0048-Implement-elytra-settings.patch +++ b/patches/server/0048-Implement-elytra-settings.patch @@ -1,4 +1,4 @@ -From 8626272614ace430ecbdc093715619e2fcb31e59 Mon Sep 17 00:00:00 2001 +From 9f02a9b45a5cb2e0ae48a04b3a5742a412aee737 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 25 Jul 2019 18:07:37 -0500 Subject: [PATCH] Implement elytra settings @@ -115,10 +115,10 @@ index 212af252be..fbc30e6ece 100644 return this.x * this.x + this.y * this.y + this.z * this.z; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 246bb51288..272a5ae41f 100644 +index c957c1cca9..ee60773313 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -150,6 +150,19 @@ public class PurpurWorldConfig { +@@ -151,6 +151,19 @@ public class PurpurWorldConfig { useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending); } diff --git a/patches/server/0050-Add-blacklist-option-for-grindstone.patch b/patches/server/0050-Add-blacklist-option-for-grindstone.patch index 25119736b..4f310f07f 100644 --- a/patches/server/0050-Add-blacklist-option-for-grindstone.patch +++ b/patches/server/0050-Add-blacklist-option-for-grindstone.patch @@ -1,4 +1,4 @@ -From 9509c999390d8e3ccca08dc95ede33b1dc413c55 Mon Sep 17 00:00:00 2001 +From d5893b1990ca121bd9c81081c01aa199a700f1bc Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 1 Aug 2019 19:15:12 -0500 Subject: [PATCH] Add blacklist option for grindstone @@ -68,7 +68,7 @@ index 7b7a0a7cb1..6b45bc17cf 100644 return this.getItem().f(this); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 272a5ae41f..cd3606a658 100644 +index ee60773313..424e48110c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -8,6 +8,7 @@ import net.minecraft.server.MinecraftKey; @@ -79,7 +79,7 @@ index 272a5ae41f..cd3606a658 100644 import java.util.HashMap; import java.util.List; import java.util.Map; -@@ -102,6 +103,17 @@ public class PurpurWorldConfig { +@@ -103,6 +104,17 @@ public class PurpurWorldConfig { farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow); } diff --git a/patches/server/0051-Implement-lagging-threshold.patch b/patches/server/0051-Implement-lagging-threshold.patch index f82983f89..7c6ca11a9 100644 --- a/patches/server/0051-Implement-lagging-threshold.patch +++ b/patches/server/0051-Implement-lagging-threshold.patch @@ -1,4 +1,4 @@ -From 5fb085830483b41c694e996e4b374cde23d75962 Mon Sep 17 00:00:00 2001 +From f8794b993218edc73a1a723611c399239dab310b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 23 Jul 2019 10:07:16 -0500 Subject: [PATCH] Implement lagging threshold @@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold 3 files changed, 12 insertions(+) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7a0deeba70..68ba58ef2e 100644 +index f939f56d96..c16e1ae9d8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -178,6 +178,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 23 Jul 2019 08:28:21 -0500 Subject: [PATCH] Implement configurable villager brain ticks @@ -40,10 +40,10 @@ index 3eaac031fb..65cd5f53c1 100644 this.world.getMethodProfiler().exit(); if (!this.et() && this.bB > 0) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index cd3606a658..39c56149a3 100644 +index 424e48110c..373544eb9b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -739,10 +739,14 @@ public class PurpurWorldConfig { +@@ -740,10 +740,14 @@ public class PurpurWorldConfig { public boolean villagerRidable = false; public boolean villagerRidableInWater = false; public boolean villagerRequireShiftToMount = true; diff --git a/patches/server/0053-Add-option-for-zombies-targetting-turtle-eggs.patch b/patches/server/0053-Add-option-for-zombies-targetting-turtle-eggs.patch index e2961ddac..594e3e00e 100644 --- a/patches/server/0053-Add-option-for-zombies-targetting-turtle-eggs.patch +++ b/patches/server/0053-Add-option-for-zombies-targetting-turtle-eggs.patch @@ -1,4 +1,4 @@ -From 0f28bec3edde7f46fe0ee1ed99b124837dd92031 Mon Sep 17 00:00:00 2001 +From 80dfeffd0f0a75b0dce88f9c8bb906e687e3aa8d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 17 Aug 2019 15:27:09 -0500 Subject: [PATCH] Add option for zombies targetting turtle eggs @@ -22,10 +22,10 @@ index e9e2be88e3..1e60cc399b 100644 this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this)); this.targetSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 39c56149a3..1ab98d49e8 100644 +index 373544eb9b..21f5ecd31c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -808,10 +808,12 @@ public class PurpurWorldConfig { +@@ -809,10 +809,12 @@ public class PurpurWorldConfig { public boolean zombieRidable = false; public boolean zombieRidableInWater = false; public boolean zombieRequireShiftToMount = true; diff --git a/patches/server/0054-Implement-bamboo-growth-settings.patch b/patches/server/0054-Implement-bamboo-growth-settings.patch index 30945a46b..5543a06e4 100644 --- a/patches/server/0054-Implement-bamboo-growth-settings.patch +++ b/patches/server/0054-Implement-bamboo-growth-settings.patch @@ -1,4 +1,4 @@ -From 612e57232c326f3a5aaf45310ff9328f6fcb26b7 Mon Sep 17 00:00:00 2001 +From d1e4e2ffb36781ec55af4ab55f7358bafd67025a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 23 Aug 2019 20:57:29 -0500 Subject: [PATCH] Implement bamboo growth settings @@ -76,10 +76,10 @@ index 02c548dd9c..016ceebb9d 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1ab98d49e8..0f2d5a0435 100644 +index 21f5ecd31c..d39fc8d5d6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -71,6 +71,13 @@ public class PurpurWorldConfig { +@@ -72,6 +72,13 @@ public class PurpurWorldConfig { return PurpurConfig.config.getString("world-settings." + worldName + "." + path, PurpurConfig.config.getString("world-settings.default." + path)); } diff --git a/patches/server/0055-Ladders-should-not-bypass-cramming-gamerule.patch b/patches/server/0055-Ladders-should-not-bypass-cramming-gamerule.patch index c5afbc03d..2628990f2 100644 --- a/patches/server/0055-Ladders-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0055-Ladders-should-not-bypass-cramming-gamerule.patch @@ -1,4 +1,4 @@ -From e291c31c0154e2408c20cc5c6e76a9119fcd6f93 Mon Sep 17 00:00:00 2001 +From 7a07a5944cc64e0da2375e81265974bb692f3a0e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 21 Jul 2019 18:06:20 -0500 Subject: [PATCH] Ladders should not bypass cramming gamerule @@ -155,10 +155,10 @@ index 4665671ef6..037f14e010 100644 ScoreboardTeamBase.EnumTeamPush scoreboardteambase_enumteampush = scoreboardteambase == null ? ScoreboardTeamBase.EnumTeamPush.ALWAYS : scoreboardteambase.getCollisionRule(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0f2d5a0435..5bfa0de241 100644 +index d39fc8d5d6..cfe3db96c1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -144,6 +144,7 @@ public class PurpurWorldConfig { +@@ -145,6 +145,7 @@ public class PurpurWorldConfig { public double controllableMinecartsBaseSpeed = 0.1D; public Map controllableMinecartsBlockSpeeds = new HashMap<>(); public boolean disableDropsOnCrammingDeath = false; @@ -166,7 +166,7 @@ index 0f2d5a0435..5bfa0de241 100644 public boolean milkCuresBadOmen = true; public boolean useBetterMending = false; private void gameplayMechanicsSettings() { -@@ -165,6 +166,7 @@ public class PurpurWorldConfig { +@@ -166,6 +167,7 @@ public class PurpurWorldConfig { set("gameplay-mechanics.controllable-minecarts.block-speed.stone", 0.5D); } disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath); diff --git a/patches/server/0056-Option-for-slimes-not-pushable.patch b/patches/server/0056-Option-for-slimes-not-pushable.patch index b161df4c2..9bf4dc591 100644 --- a/patches/server/0056-Option-for-slimes-not-pushable.patch +++ b/patches/server/0056-Option-for-slimes-not-pushable.patch @@ -1,4 +1,4 @@ -From 7ff7fd81bec8f89fc9abe570dfdeb08d45f9de34 Mon Sep 17 00:00:00 2001 +From 3a3def2082c6c4c2128f4162e2ac7e74fb88232a 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 @@ -47,10 +47,10 @@ index 01f32659d9..52ab86f0b1 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 12c81b0ae6..a1a540e5ff 100644 +index 2537a5add3..7be2e01814 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -164,6 +164,11 @@ public class PurpurConfig { +@@ -166,6 +166,11 @@ public class PurpurConfig { fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); } diff --git a/patches/server/0058-Dispenser-curse-of-binding-protection.patch b/patches/server/0058-Dispenser-curse-of-binding-protection.patch index cfcf97b59..670ce9266 100644 --- a/patches/server/0058-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0058-Dispenser-curse-of-binding-protection.patch @@ -1,4 +1,4 @@ -From 80078485f398ccd6f3274ba594b38625a9f78d74 Mon Sep 17 00:00:00 2001 +From a6b9b76f07adb9762f47a391ff0ac5980b56ddb6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 25 Aug 2019 00:09:52 -0500 Subject: [PATCH] Dispenser curse of binding protection @@ -49,10 +49,10 @@ index df8c42bfbd..a4b3d0c298 100644 return this.b; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5bfa0de241..7a9b0ea7c5 100644 +index cfe3db96c1..4c74b6c3fd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -105,6 +105,11 @@ public class PurpurWorldConfig { +@@ -106,6 +106,11 @@ public class PurpurWorldConfig { campfireFallWithGravity = getBoolean("blocks.campfire.fall-with-gravity", campfireFallWithGravity); } diff --git a/patches/server/0060-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0060-Add-option-for-boats-to-eject-players-on-land.patch index 5d595cc2e..76a1e29ee 100644 --- a/patches/server/0060-Add-option-for-boats-to-eject-players-on-land.patch +++ b/patches/server/0060-Add-option-for-boats-to-eject-players-on-land.patch @@ -1,4 +1,4 @@ -From ee1e50577f462c02a3d7972d77d811c846379842 Mon Sep 17 00:00:00 2001 +From 819974faedaa8f3aa450ed30782078c251d7db89 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 7 Sep 2019 22:47:59 -0500 Subject: [PATCH] Add option for boats to eject players on land @@ -21,10 +21,10 @@ index 563fc8ced0..479ed7c7bc 100644 } else { return EntityBoat.EnumStatus.IN_AIR; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7a9b0ea7c5..d94f9eac8e 100644 +index 4c74b6c3fd..43591dfe34 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -142,6 +142,7 @@ public class PurpurWorldConfig { +@@ -143,6 +143,7 @@ public class PurpurWorldConfig { turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts); } @@ -32,7 +32,7 @@ index 7a9b0ea7c5..d94f9eac8e 100644 public boolean controllableMinecarts = false; public boolean controllableMinecartsPlaceAnywhere = false; public float controllableMinecartsStepHeight = 1.0F; -@@ -153,6 +154,7 @@ public class PurpurWorldConfig { +@@ -154,6 +155,7 @@ public class PurpurWorldConfig { public boolean milkCuresBadOmen = true; public boolean useBetterMending = false; private void gameplayMechanicsSettings() { diff --git a/patches/server/0062-Add-option-to-set-armorstand-step-height.patch b/patches/server/0062-Add-option-to-set-armorstand-step-height.patch index e35a8b0fd..17fe7ab53 100644 --- a/patches/server/0062-Add-option-to-set-armorstand-step-height.patch +++ b/patches/server/0062-Add-option-to-set-armorstand-step-height.patch @@ -1,4 +1,4 @@ -From a4c5f18c8e6380e4632be1bbff6388abcec7d3f3 Mon Sep 17 00:00:00 2001 +From 472deeda23410578f254912c6062e5669689cbae Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 6 Oct 2019 12:46:35 -0500 Subject: [PATCH] Add option to set armorstand step height @@ -29,10 +29,10 @@ index dfe8c57cef..0f6870a45c 100644 if (!this.canTick) { if (this.noTickPoseDirty) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d94f9eac8e..e71f40a536 100644 +index 43591dfe34..a8e59d3372 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -142,6 +142,7 @@ public class PurpurWorldConfig { +@@ -143,6 +143,7 @@ public class PurpurWorldConfig { turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts); } @@ -40,7 +40,7 @@ index d94f9eac8e..e71f40a536 100644 public boolean boatEjectPlayersOnLand = false; public boolean controllableMinecarts = false; public boolean controllableMinecartsPlaceAnywhere = false; -@@ -154,6 +155,7 @@ public class PurpurWorldConfig { +@@ -155,6 +156,7 @@ public class PurpurWorldConfig { public boolean milkCuresBadOmen = true; public boolean useBetterMending = false; private void gameplayMechanicsSettings() { diff --git a/patches/server/0064-Alternative-Keepalive-Handling.patch b/patches/server/0064-Alternative-Keepalive-Handling.patch index 5b55fc716..2f548a635 100644 --- a/patches/server/0064-Alternative-Keepalive-Handling.patch +++ b/patches/server/0064-Alternative-Keepalive-Handling.patch @@ -1,4 +1,4 @@ -From ea237e1a45fc4600581094d305a1f16d1225dec4 Mon Sep 17 00:00:00 2001 +From f50800441f64ae7490c65e66f3ae7ac1e86e32eb Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 11 Oct 2019 00:17:39 -0500 Subject: [PATCH] Alternative Keepalive Handling @@ -74,10 +74,10 @@ index d897c7fd41..1f88262065 100644 if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) { int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index a1a540e5ff..03185a7480 100644 +index 7be2e01814..3cd53cc3aa 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -157,6 +157,11 @@ public class PurpurConfig { +@@ -159,6 +159,11 @@ public class PurpurConfig { packetRateLimitKickMessage = getString("settings.packet-limiter.kick-message", packetRateLimitKickMessage); } diff --git a/patches/server/0069-Barrels-have-6-rows.patch b/patches/server/0069-Barrels-have-6-rows.patch index bc88fd180..f410c712a 100644 --- a/patches/server/0069-Barrels-have-6-rows.patch +++ b/patches/server/0069-Barrels-have-6-rows.patch @@ -1,4 +1,4 @@ -From bbee5192bcc8ff81430f9ec8c9b24d4933b60a1b Mon Sep 17 00:00:00 2001 +From bc374fae9fa70efd6fe9d18e8b5cc9474b13656d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 23 May 2019 21:50:37 -0500 Subject: [PATCH] Barrels have 6 rows @@ -53,7 +53,7 @@ index 1e27abbea0..d1a3aae91f 100644 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 03185a7480..a8aede672f 100644 +index 3cd53cc3aa..f9e989d7c6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -6,6 +6,7 @@ import org.bukkit.Bukkit; @@ -64,14 +64,14 @@ index 03185a7480..a8aede672f 100644 import java.io.File; import java.io.IOException; -@@ -169,8 +170,16 @@ public class PurpurConfig { +@@ -171,8 +172,16 @@ public class PurpurConfig { fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); } + public static boolean barrelSixRows = false; public static boolean slimeBlocksNotPushable = false; private static void blockSettings() { -+ if (CONFIG_VERSION < 3) { ++ if (version < 3) { + boolean oldValue = getBoolean("settings.barrel.packed-barrels", true); + set("settings.blocks.barrel.six-rows", oldValue); + set("settings.packed-barrels", null); diff --git a/patches/server/0070-Ender-chests-have-6-rows.patch b/patches/server/0070-Ender-chests-have-6-rows.patch index cb14d5e5d..1be8d5e5e 100644 --- a/patches/server/0070-Ender-chests-have-6-rows.patch +++ b/patches/server/0070-Ender-chests-have-6-rows.patch @@ -1,4 +1,4 @@ -From f35109b036ffcf36e16fe7462a057980196d1381 Mon Sep 17 00:00:00 2001 +From 0c99add8a3a0fa66c2b5ac50c6b169b83fd48dac Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 23 Jun 2019 17:01:26 -0500 Subject: [PATCH] Ender chests have 6 rows @@ -37,16 +37,16 @@ index fd31b9a6dc..903c02e9ef 100644 // CraftBukkit end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index a8aede672f..d641f76d0c 100644 +index f9e989d7c6..b40dcbe94f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -172,14 +172,20 @@ public class PurpurConfig { +@@ -174,14 +174,20 @@ public class PurpurConfig { public static boolean barrelSixRows = false; public static boolean slimeBlocksNotPushable = false; + public static boolean enderChestSixRows = false; private static void blockSettings() { - if (CONFIG_VERSION < 3) { + if (version < 3) { boolean oldValue = getBoolean("settings.barrel.packed-barrels", true); set("settings.blocks.barrel.six-rows", oldValue); set("settings.packed-barrels", null); diff --git a/patches/server/0072-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0072-Add-option-to-allow-iron-golems-to-spawn-in-air.patch index dc512bf2b..f4eb52068 100644 --- a/patches/server/0072-Add-option-to-allow-iron-golems-to-spawn-in-air.patch +++ b/patches/server/0072-Add-option-to-allow-iron-golems-to-spawn-in-air.patch @@ -1,4 +1,4 @@ -From f173a4dc47e4329a749e0def847ed0a6fc5e815c Mon Sep 17 00:00:00 2001 +From f0945bbb3cf177d701b1e25542fab02d4c516d23 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:20:45 -0500 Subject: [PATCH] Add option to allow iron golems to spawn in air @@ -22,10 +22,10 @@ index 5414d6975f..91011dd0aa 100644 } else { for (int i = 1; i < 3; ++i) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e71f40a536..d015041271 100644 +index a8e59d3372..1a43f84bfa 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -471,11 +471,13 @@ public class PurpurWorldConfig { +@@ -472,11 +472,13 @@ public class PurpurWorldConfig { public boolean ironGolemRidable = false; public boolean ironGolemRidableInWater = false; public boolean ironGolemRequireShiftToMount = true; diff --git a/patches/server/0073-Don-t-recalculate-permissions-for-players-on-world-c.patch b/patches/server/0073-Don-t-recalculate-permissions-for-players-on-world-c.patch index 62afc0f82..477e02fe9 100644 --- a/patches/server/0073-Don-t-recalculate-permissions-for-players-on-world-c.patch +++ b/patches/server/0073-Don-t-recalculate-permissions-for-players-on-world-c.patch @@ -1,4 +1,4 @@ -From a463f0b316dd2ef1e65817b1a476788a1008f9a5 Mon Sep 17 00:00:00 2001 +From fc6c86b7fd093e2fd67b10b8b40e913f61c5163a Mon Sep 17 00:00:00 2001 From: Tom Date: Fri, 12 Jul 2019 07:59:35 -0500 Subject: [PATCH] Don't recalculate permissions for players on world change @@ -51,10 +51,10 @@ index 7b79ee4fe5..3975312394 100644 public boolean isWhitelisted(GameProfile gameprofile) { return isWhitelisted(gameprofile, null); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d641f76d0c..a18635f942 100644 +index b40dcbe94f..17694bb5fd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -189,6 +189,11 @@ public class PurpurConfig { +@@ -191,6 +191,11 @@ public class PurpurConfig { slimeBlocksNotPushable = getBoolean("settings.blocks.slime.not-movable-by-piston", slimeBlocksNotPushable); } diff --git a/patches/server/0079-Implement-infinite-lava.patch b/patches/server/0079-Implement-infinite-lava.patch index 258130993..40df2f201 100644 --- a/patches/server/0079-Implement-infinite-lava.patch +++ b/patches/server/0079-Implement-infinite-lava.patch @@ -1,4 +1,4 @@ -From eed666b129e5edeca3c55a3a40853c2121f8552b Mon Sep 17 00:00:00 2001 +From 0f6059b03c52773e28fc6551c9890df49bf5b015 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 23 Nov 2019 17:55:42 -0600 Subject: [PATCH] Implement infinite lava @@ -70,10 +70,10 @@ index 9eba9a12c0..39252e6873 100644 protected boolean c; protected boolean d; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d015041271..361d3ba21d 100644 +index 1a43f84bfa..f1a6524aa1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -126,6 +126,11 @@ public class PurpurWorldConfig { +@@ -127,6 +127,11 @@ public class PurpurWorldConfig { grindstoneBlacklist.addAll(blacklist); } diff --git a/patches/server/0081-Despawn-egg-hatches-chicken.patch b/patches/server/0081-Despawn-egg-hatches-chicken.patch index bf52e16fb..18109a479 100644 --- a/patches/server/0081-Despawn-egg-hatches-chicken.patch +++ b/patches/server/0081-Despawn-egg-hatches-chicken.patch @@ -1,4 +1,4 @@ -From a58850bd807315bc8739bf8368ed229d64943968 Mon Sep 17 00:00:00 2001 +From d02bfe12f49755d8b1e9b1eda5b6830f2ede2ef1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 23:47:42 -0600 Subject: [PATCH] Despawn egg hatches chicken @@ -41,10 +41,10 @@ index 2926fbb957..bbb9ca1efc 100644 Vec3D vec3d = this.getMot(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 361d3ba21d..3acc88b4d3 100644 +index f1a6524aa1..ded5e9fbb6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -274,11 +274,15 @@ public class PurpurWorldConfig { +@@ -275,11 +275,15 @@ public class PurpurWorldConfig { public boolean chickenRidableInWater = false; public boolean chickenRequireShiftToMount = true; public boolean chickenDontLayEggsWhenRidden = false; diff --git a/patches/server/0083-Add-sleep-options.patch b/patches/server/0083-Add-sleep-options.patch index 1189e56e1..c72cb6649 100644 --- a/patches/server/0083-Add-sleep-options.patch +++ b/patches/server/0083-Add-sleep-options.patch @@ -1,4 +1,4 @@ -From f53f1ee8830041d7bf31912e5498bd7b87969795 Mon Sep 17 00:00:00 2001 +From 36589593a6ae2b75e7a175cefcc5e0ff3be9c07b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 30 Nov 2019 03:30:17 -0600 Subject: [PATCH] Add sleep options @@ -53,10 +53,10 @@ index 9d26bd1e4c..12e5ff43f9 100644 return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_NOW); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3acc88b4d3..76b9900272 100644 +index ded5e9fbb6..0ca7b9a1fb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -158,6 +158,8 @@ public class PurpurWorldConfig { +@@ -159,6 +159,8 @@ public class PurpurWorldConfig { public boolean disableDropsOnCrammingDeath = false; public boolean fixClimbingBypassingCrammingRule = false; public boolean milkCuresBadOmen = true; @@ -65,7 +65,7 @@ index 3acc88b4d3..76b9900272 100644 public boolean useBetterMending = false; private void gameplayMechanicsSettings() { armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight); -@@ -182,6 +184,8 @@ public class PurpurWorldConfig { +@@ -183,6 +185,8 @@ public class PurpurWorldConfig { disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath); fixClimbingBypassingCrammingRule = getBoolean("gameplay-mechanics.fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule); milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen); diff --git a/patches/server/0084-Option-for-hay-block-fall-damage.patch b/patches/server/0084-Option-for-hay-block-fall-damage.patch index 13c8ab45c..9a1e8bd02 100644 --- a/patches/server/0084-Option-for-hay-block-fall-damage.patch +++ b/patches/server/0084-Option-for-hay-block-fall-damage.patch @@ -1,4 +1,4 @@ -From a4c22bdbcea2d30ca61e7757375040d60ec50a15 Mon Sep 17 00:00:00 2001 +From 5ffc0bd0f79ce35e665e2d7f6dfe5341c4bb0ca2 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 30 Nov 2019 01:31:09 -0600 Subject: [PATCH] Option for hay block fall damage @@ -21,10 +21,10 @@ index ca81c49f0a..1f8f60542f 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 76b9900272..4a9ace8a46 100644 +index 0ca7b9a1fb..5a15980009 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -126,6 +126,11 @@ public class PurpurWorldConfig { +@@ -127,6 +127,11 @@ public class PurpurWorldConfig { grindstoneBlacklist.addAll(blacklist); } diff --git a/patches/server/0087-Villagers-follow-emerald-blocks.patch b/patches/server/0087-Villagers-follow-emerald-blocks.patch index 3d1aa0459..52fabe048 100644 --- a/patches/server/0087-Villagers-follow-emerald-blocks.patch +++ b/patches/server/0087-Villagers-follow-emerald-blocks.patch @@ -1,4 +1,4 @@ -From 669ed774b1846fa1ef3b7d35b1efe5bcc43d629c Mon Sep 17 00:00:00 2001 +From fff78d2f05531befe2031cdd58876a41a0e71d60 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 22:10:12 -0600 Subject: [PATCH] Villagers follow emerald blocks @@ -48,10 +48,10 @@ index 4e9c5e84a9..14ca5fc367 100644 this.goalSelector.a(8, new PathfinderGoalRandomStrollLand(this, 0.35D)); this.goalSelector.a(9, new PathfinderGoalInteract(this, EntityHuman.class, 3.0F, 1.0F)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4a9ace8a46..4f85b4ea87 100644 +index 5a15980009..23bf936e99 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -779,21 +779,25 @@ public class PurpurWorldConfig { +@@ -780,21 +780,25 @@ public class PurpurWorldConfig { public boolean villagerRequireShiftToMount = true; public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; diff --git a/patches/server/0088-Add-player-death-exp-control-options.patch b/patches/server/0088-Add-player-death-exp-control-options.patch index dc42e67a8..a24eff877 100644 --- a/patches/server/0088-Add-player-death-exp-control-options.patch +++ b/patches/server/0088-Add-player-death-exp-control-options.patch @@ -1,4 +1,4 @@ -From 1fd49a97b12304827656ea9922bcaf80ba226d7b Mon Sep 17 00:00:00 2001 +From 28e2152ff57c891c2736b59121f6ba15471a4b5a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Dec 2019 22:08:37 -0600 Subject: [PATCH] Add player death exp control options @@ -35,10 +35,10 @@ index 12e5ff43f9..427a32cdd7 100644 return 0; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4f85b4ea87..5c12f199fd 100644 +index 23bf936e99..f1c094327d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -163,6 +163,8 @@ public class PurpurWorldConfig { +@@ -164,6 +164,8 @@ public class PurpurWorldConfig { public boolean disableDropsOnCrammingDeath = false; public boolean fixClimbingBypassingCrammingRule = false; public boolean milkCuresBadOmen = true; @@ -47,7 +47,7 @@ index 4f85b4ea87..5c12f199fd 100644 public boolean playerSleepOnlyWithCondition = false; public String playerSleepCondition = "time >= 12541 && time <= 23458"; public boolean useBetterMending = false; -@@ -189,6 +191,8 @@ public class PurpurWorldConfig { +@@ -190,6 +192,8 @@ public class PurpurWorldConfig { disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath); fixClimbingBypassingCrammingRule = getBoolean("gameplay-mechanics.fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule); milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen); diff --git a/patches/server/0090-Allow-leashing-villagers.patch b/patches/server/0090-Allow-leashing-villagers.patch index 91bf7198d..e0a27cb3a 100644 --- a/patches/server/0090-Allow-leashing-villagers.patch +++ b/patches/server/0090-Allow-leashing-villagers.patch @@ -1,4 +1,4 @@ -From 022a3bf7f2ebcfce80073955ff77dfb8c6e050b2 Mon Sep 17 00:00:00 2001 +From a97f9ffa6e1d0135339df3b5270bbbe342076373 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 3 Oct 2019 18:08:03 -0500 Subject: [PATCH] Allow leashing villagers @@ -55,10 +55,10 @@ index 14ca5fc367..427c589075 100644 + // Purpur - end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5c12f199fd..0b43fdb9d8 100644 +index f1c094327d..bc58dcacfb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -784,6 +784,7 @@ public class PurpurWorldConfig { +@@ -785,6 +785,7 @@ public class PurpurWorldConfig { public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; public boolean villagerFollowEmeraldBlock = false; @@ -66,7 +66,7 @@ index 5c12f199fd..0b43fdb9d8 100644 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -791,17 +792,20 @@ public class PurpurWorldConfig { +@@ -792,17 +793,20 @@ public class PurpurWorldConfig { villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks); villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging); villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock); diff --git a/patches/server/0091-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0091-Implement-configurable-search-radius-for-villagers-t.patch index e1b07b8e8..d595f7671 100644 --- a/patches/server/0091-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0091-Implement-configurable-search-radius-for-villagers-t.patch @@ -1,4 +1,4 @@ -From 19c5e5eaba3b335a2a1ac71df9b7a4fafdd28f73 Mon Sep 17 00:00:00 2001 +From b390061960cf43d08c1c913f2ea04fa3e12b5e76 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 22 Jul 2019 17:32:17 -0500 Subject: [PATCH] Implement configurable search radius for villagers to spawn @@ -22,10 +22,10 @@ index 315440b3fb..fe0e646ea6 100644 int i = 0; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0b43fdb9d8..6b422f8d83 100644 +index bc58dcacfb..4c4f404a30 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -785,6 +785,8 @@ public class PurpurWorldConfig { +@@ -786,6 +786,8 @@ public class PurpurWorldConfig { public boolean villagerUseBrainTicksOnlyWhenLagging = true; public boolean villagerFollowEmeraldBlock = false; public boolean villagerCanBeLeashed = false; @@ -34,7 +34,7 @@ index 0b43fdb9d8..6b422f8d83 100644 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -793,6 +795,8 @@ public class PurpurWorldConfig { +@@ -794,6 +796,8 @@ public class PurpurWorldConfig { villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging); villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock); villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed); diff --git a/patches/server/0092-Add-option-for-zombie-villager-transformation-chance.patch b/patches/server/0092-Add-option-for-zombie-villager-transformation-chance.patch index 5f6759d5e..388bdd40e 100644 --- a/patches/server/0092-Add-option-for-zombie-villager-transformation-chance.patch +++ b/patches/server/0092-Add-option-for-zombie-villager-transformation-chance.patch @@ -1,4 +1,4 @@ -From 17746af5bf8d5f2a073760f7627c2e5169747e81 Mon Sep 17 00:00:00 2001 +From 7317f20bd412f8e45c0d9f35fcba233256eb9f0f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 19 Dec 2019 16:59:46 -0600 Subject: [PATCH] Add option for zombie villager transformation chance @@ -26,10 +26,10 @@ index 1e60cc399b..fc4e51ef45 100644 EntityZombieVillager entityzombievillager = (EntityZombieVillager) EntityTypes.ZOMBIE_VILLAGER.a(this.world); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6b422f8d83..db9b8fb056 100644 +index 4c4f404a30..e79b4df1a7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -863,11 +863,13 @@ public class PurpurWorldConfig { +@@ -864,11 +864,13 @@ public class PurpurWorldConfig { public boolean zombieRidableInWater = false; public boolean zombieRequireShiftToMount = true; public boolean zombieTargetTurtleEggs = true; diff --git a/patches/server/0093-Make-lava-flow-speed-configurable.patch b/patches/server/0093-Make-lava-flow-speed-configurable.patch index 6ea32a69d..cc5cf60b8 100644 --- a/patches/server/0093-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0093-Make-lava-flow-speed-configurable.patch @@ -1,4 +1,4 @@ -From 94163b407d3fe93171873e6988a2ebae6bc2a4a9 Mon Sep 17 00:00:00 2001 +From 0ce0edb30e245544804ae9f86bf102434cc1ff12 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 11:31:36 -0600 Subject: [PATCH] Make lava flow speed configurable @@ -35,10 +35,10 @@ index 39252e6873..75f8441ab6 100644 return this.d; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3caef698ce..0fb8c73845 100644 +index e79b4df1a7..ff3424efdc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -132,8 +132,12 @@ public class PurpurWorldConfig { +@@ -133,8 +133,12 @@ public class PurpurWorldConfig { } public boolean lavaInfinite = false; diff --git a/patches/server/0094-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0094-Add-wither-skeleton-takes-wither-damage-option.patch index 104e46315..1934d3f4d 100644 --- a/patches/server/0094-Add-wither-skeleton-takes-wither-damage-option.patch +++ b/patches/server/0094-Add-wither-skeleton-takes-wither-damage-option.patch @@ -1,4 +1,4 @@ -From 9f4f5765ff06c9b339626d9ef2f51dc3735fb6fa Mon Sep 17 00:00:00 2001 +From cad24970ea305e47f8c8e32f0cc168f2433b7ba1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 14 Jan 2020 19:43:40 -0600 Subject: [PATCH] Add wither skeleton takes wither damage option @@ -21,10 +21,10 @@ index 8aa0a6699f..0fd740e717 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0fb8c73845..f5feb73cdf 100644 +index ff3424efdc..60407b2a02 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -848,10 +848,12 @@ public class PurpurWorldConfig { +@@ -849,10 +849,12 @@ public class PurpurWorldConfig { public boolean witherSkeletonRidable = false; public boolean witherSkeletonRidableInWater = false; public boolean witherSkeletonRequireShiftToMount = true; diff --git a/patches/server/0095-UPnP-Port-Forwarding-Service.patch b/patches/server/0095-UPnP-Port-Forwarding-Service.patch index 0ff026d35..637c7af94 100644 --- a/patches/server/0095-UPnP-Port-Forwarding-Service.patch +++ b/patches/server/0095-UPnP-Port-Forwarding-Service.patch @@ -1,4 +1,4 @@ -From 3f2ec70951e96350c1146aa2006bd9692f2ebd8c Mon Sep 17 00:00:00 2001 +From e6b2b953c8c870c72e8deb438dadc7ff72425ffa Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 22 Jan 2020 20:13:40 -0600 Subject: [PATCH] UPnP Port Forwarding Service @@ -78,7 +78,7 @@ index 61ccb6079e..a85df1ff49 100644 // this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up server.loadPlugins(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8bb26f7bf3..1a65b93193 100644 +index e11b94e154..3cd0c48e81 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -181,6 +181,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 18 Feb 2020 20:07:08 -0600 Subject: [PATCH] Add option to disable saving projectiles to disk --- - src/main/java/net/minecraft/server/ChunkRegionLoader.java | 1 + - src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ - 2 files changed, 3 insertions(+) + .../net/minecraft/server/ChunkRegionLoader.java | 1 + + .../java/net/pl3x/purpur/PurpurWorldConfig.java | 16 ++++++++++++++++ + 2 files changed, 17 insertions(+) diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java index 4349d22cc8..a7fe7722af 100644 @@ -21,10 +21,10 @@ index 4349d22cc8..a7fe7722af 100644 // Paper start if ((int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f5feb73cdf..02741e56f8 100644 +index 60407b2a02..be85d454b2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -172,6 +172,7 @@ public class PurpurWorldConfig { +@@ -173,6 +173,7 @@ public class PurpurWorldConfig { public boolean playerSleepOnlyWithCondition = false; public String playerSleepCondition = "time >= 12541 && time <= 23458"; public boolean useBetterMending = false; @@ -32,11 +32,25 @@ index f5feb73cdf..02741e56f8 100644 private void gameplayMechanicsSettings() { armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight); boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand); -@@ -200,6 +201,7 @@ public class PurpurWorldConfig { +@@ -201,6 +202,21 @@ public class PurpurWorldConfig { playerSleepOnlyWithCondition = getBoolean("gameplay-mechanics.player.sleep.only-with-condition", playerSleepOnlyWithCondition); playerSleepCondition = getString("gameplay-mechanics.player.sleep.condition", playerSleepCondition); useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending); -+ saveProjectilesToDisk = getBoolean("gameplay-mechanics.saveProjectilesToDisk", saveProjectilesToDisk); ++ if (PurpurConfig.version < 4) { ++ Object oldVal = PurpurConfig.config.get("world-settings.default.gameplay-mechanics.saveProjectilesToDisk"); ++ if (oldVal instanceof Boolean) { ++ PurpurConfig.config.addDefault("world-settings.default.gameplay-mechanics.save-projectiles-to-disk", oldVal); ++ PurpurConfig.config.set("world-settings.default.gameplay-mechanics.save-projectiles-to-disk", oldVal); ++ saveProjectilesToDisk = (boolean) oldVal; ++ } ++ oldVal = PurpurConfig.config.get("world-settings." + worldName + ".gameplay-mechanics.saveProjectilesToDisk"); ++ if (oldVal instanceof Boolean) { ++ PurpurConfig.config.set("world-settings." + worldName + ".gameplay-mechanics.save-projectiles-to-disk", oldVal); ++ saveProjectilesToDisk = (boolean) oldVal; ++ } ++ set("gameplay-mechanics.saveProjectilesToDisk", null); ++ } ++ saveProjectilesToDisk = getBoolean("gameplay-mechanics.save-projectiles-to-disk", saveProjectilesToDisk); } public int elytraDamagePerSecond = 1;