diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch index 62ad751e1..48aaf2790 100644 --- a/patches/server/0004-Purpur-config-files.patch +++ b/patches/server/0004-Purpur-config-files.patch @@ -86,7 +86,7 @@ index e3f1f20608cab7067674b2cdd2759a34902b6626..cef8e9b379c4205386d1001e86abc7dc this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit 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 0000000000000000000000000000000000000000..cd3272520eb78a9c663bac3bfdb2b63d611d48a1 +index 0000000000000000000000000000000000000000..19541e7071c05dce30c384093c8eae5beff3e515 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -0,0 +1,130 @@ @@ -145,8 +145,8 @@ index 0000000000000000000000000000000000000000..cd3272520eb78a9c663bac3bfdb2b63d + commands = new HashMap<>(); + commands.put("purpur", new PurpurCommand("purpur")); + -+ version = getInt("config-version", 10); -+ set("config-version", 10); ++ version = getInt("config-version", 11); ++ set("config-version", 11); + + readConfig(PurpurConfig.class, null); + } diff --git a/patches/server/0005-Timings-stuff.patch b/patches/server/0005-Timings-stuff.patch index 4d7985614..7c48e7c5c 100644 --- a/patches/server/0005-Timings-stuff.patch +++ b/patches/server/0005-Timings-stuff.patch @@ -57,7 +57,7 @@ index 35810f42d7a0cd50a4cbe90e8d698fe57914c889..5e672a0660d0aceffcdb26d185590ca1 String hostName = "BrokenHost"; try { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index cd3272520eb78a9c663bac3bfdb2b63d611d48a1..00eb196f8caa2e4f2478972c14f4596071adbd2a 100644 +index 19541e7071c05dce30c384093c8eae5beff3e515..e1a85458a22007b0ba7f297c986c4a2765177f86 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -127,4 +127,10 @@ public class PurpurConfig { diff --git a/patches/server/0006-Barrels-and-enderchests-6-rows.patch b/patches/server/0006-Barrels-and-enderchests-6-rows.patch index 646b9520d..628f22831 100644 --- a/patches/server/0006-Barrels-and-enderchests-6-rows.patch +++ b/patches/server/0006-Barrels-and-enderchests-6-rows.patch @@ -123,7 +123,7 @@ index 7a6f150490bc3ef8a5ed43c401fd70bcc67f40f0..449d2c38abdd35b782a6732006eebb38 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 00eb196f8caa2e4f2478972c14f4596071adbd2a..cb7e34924cb5dbff25d1ffe05cfe5bc22e4a90ed 100644 +index e1a85458a22007b0ba7f297c986c4a2765177f86..64682d3188c356eec62b414d50e0221fc67de895 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -7,6 +7,7 @@ import org.bukkit.Bukkit; diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0009-AFK-API.patch index 92c246f7c..7eabc21f8 100644 --- a/patches/server/0009-AFK-API.patch +++ b/patches/server/0009-AFK-API.patch @@ -215,7 +215,7 @@ index a7f2304acf8ee0a15d6eae8c42060e003be13ae7..fd56b2f15e570f266a79c25823a3b353 @Nullable diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index cb7e34924cb5dbff25d1ffe05cfe5bc22e4a90ed..ee99289165cab9f58b689a7e07aa01622e203863 100644 +index 64682d3188c356eec62b414d50e0221fc67de895..3c81d9f1171262d17407232433e3eb0383f424c0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,6 +1,7 @@ diff --git a/patches/server/0011-Configurable-server-mod-name.patch b/patches/server/0011-Configurable-server-mod-name.patch index cda8d11fc..f1e684750 100644 --- a/patches/server/0011-Configurable-server-mod-name.patch +++ b/patches/server/0011-Configurable-server-mod-name.patch @@ -18,7 +18,7 @@ index 9301d93ffb5a961cb68a5c37c30b656087c1b45c..2af7c84167f75f1d16d0fd74a4c81565 public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index ee99289165cab9f58b689a7e07aa01622e203863..5fa51d5cdd55003b94ed41294b6b3b800e79c525 100644 +index 3c81d9f1171262d17407232433e3eb0383f424c0..db62e40a5bba3bdb60f1dac6f25a48f321a5d3e1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -139,6 +139,11 @@ public class PurpurConfig { diff --git a/patches/server/0013-Lagging-threshold.patch b/patches/server/0013-Lagging-threshold.patch index 72dae110e..893092ee5 100644 --- a/patches/server/0013-Lagging-threshold.patch +++ b/patches/server/0013-Lagging-threshold.patch @@ -25,7 +25,7 @@ index 2af7c84167f75f1d16d0fd74a4c8156502325446..34793bc4bd14dc7a34f32ccfec05cf50 } // Tuinity - replace logic diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 5fa51d5cdd55003b94ed41294b6b3b800e79c525..b54ea480321a3d9153a89e842787b27875e43ef4 100644 +index db62e40a5bba3bdb60f1dac6f25a48f321a5d3e1..471b16492deab9c2466178425cdecdbc3f6c4896 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -150,6 +150,11 @@ public class PurpurConfig { diff --git a/patches/server/0020-Alternative-Keepalive-Handling.patch b/patches/server/0020-Alternative-Keepalive-Handling.patch index 6538d8c40..b790fa386 100644 --- a/patches/server/0020-Alternative-Keepalive-Handling.patch +++ b/patches/server/0020-Alternative-Keepalive-Handling.patch @@ -68,7 +68,7 @@ index a056adcae8c4c46ede25fdd33aeab616a1af3a76..68200fe85fc4e66bb58dd35df306ba37 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 b54ea480321a3d9153a89e842787b27875e43ef4..c856e5bd83f0b6582efdad036262511ff89ec49f 100644 +index 471b16492deab9c2466178425cdecdbc3f6c4896..7194ab80185683fe198a3c19fc7401976976cb19 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -155,6 +155,11 @@ public class PurpurConfig { diff --git a/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch index cff6db86d..c6fbddc97 100644 --- a/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch @@ -17,7 +17,7 @@ index 7a8a1960882e291c46301d07da3e1c5415516893..59d781b5e61c5d2c004bc92300d8d42e } // CraftBukkit end diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c856e5bd83f0b6582efdad036262511ff89ec49f..d3c51f1083c4d4df8e413f47d0636ec829dc37a4 100644 +index 7194ab80185683fe198a3c19fc7401976976cb19..9a6028759f6e3faac57013e6044afbfcb2c481ce 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -178,4 +178,11 @@ public class PurpurConfig { diff --git a/patches/server/0033-Dont-send-useless-entity-packets.patch b/patches/server/0033-Dont-send-useless-entity-packets.patch index a363d91e1..8f94d0095 100644 --- a/patches/server/0033-Dont-send-useless-entity-packets.patch +++ b/patches/server/0033-Dont-send-useless-entity-packets.patch @@ -61,7 +61,7 @@ index c830b257054b7f8153aa9225c1f61f49a6ea0a84..3a66a34db2b8ac612431131cea80e57e this.tracker.c(entityplayer); entityplayer.c(this.tracker); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d3c51f1083c4d4df8e413f47d0636ec829dc37a4..d12749a8084ede08d8efa80db279511f3c84b044 100644 +index 9a6028759f6e3faac57013e6044afbfcb2c481ce..8d5c326b8c3ae0c6117a14b9be749a148293c3cd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -179,6 +179,11 @@ public class PurpurConfig { diff --git a/patches/server/0057-Configurable-TPS-Catchup.patch b/patches/server/0057-Configurable-TPS-Catchup.patch index ecd7757a6..3996f6f9e 100644 --- a/patches/server/0057-Configurable-TPS-Catchup.patch +++ b/patches/server/0057-Configurable-TPS-Catchup.patch @@ -24,7 +24,7 @@ index 34793bc4bd14dc7a34f32ccfec05cf50eb77cee2..5367c3b7bdfb6951986e5c844fb978f4 this.methodProfiler.exit(); this.methodProfiler.b(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d12749a8084ede08d8efa80db279511f3c84b044..8572cc59ad94cb5ac8b7625587c4dc23a1efbd4d 100644 +index 8d5c326b8c3ae0c6117a14b9be749a148293c3cd..5fb05a8b660ee8e43458fbef1e59c5499ccaac9d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -190,4 +190,9 @@ public class PurpurConfig { diff --git a/patches/server/0077-Add-ping-command.patch b/patches/server/0077-Add-ping-command.patch index 794b27b4b..22a9c1405 100644 --- a/patches/server/0077-Add-ping-command.patch +++ b/patches/server/0077-Add-ping-command.patch @@ -67,7 +67,7 @@ index bbad2b1399d9d2e16bfa77563bd564f7c6f640d7..a85c4525335fa46bc23a6dd57cfaea1f List list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource()); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 8572cc59ad94cb5ac8b7625587c4dc23a1efbd4d..33c135aa02bbbaebbc503aaf665d8d00998b6b40 100644 +index 5fb05a8b660ee8e43458fbef1e59c5499ccaac9d..5cb45971721dd39d214434529ce434035173326b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -133,10 +133,12 @@ public class PurpurConfig { diff --git a/patches/server/0083-Add-allow-water-in-end-world-option.patch b/patches/server/0083-Add-allow-water-in-end-world-option.patch index af35da066..30decfa5e 100644 --- a/patches/server/0083-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0083-Add-allow-water-in-end-world-option.patch @@ -68,7 +68,7 @@ index 461c85b426aab30c34529897e55aa842b45d0555..486a03f2582d6ece2775cb2db127953d } else { world.setTypeUpdate(blockposition, Blocks.WATER.getBlockData()); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 33c135aa02bbbaebbc503aaf665d8d00998b6b40..c7962b45e818bbfa841a1249156472dc750d6194 100644 +index 5cb45971721dd39d214434529ce434035173326b..f1e57b679db156b4013f6bc81925462a746001f2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -186,6 +186,11 @@ public class PurpurConfig { diff --git a/patches/server/0088-Configurable-end-spike-seed.patch b/patches/server/0088-Configurable-end-spike-seed.patch index f3fbc88ee..8f57ade5f 100644 --- a/patches/server/0088-Configurable-end-spike-seed.patch +++ b/patches/server/0088-Configurable-end-spike-seed.patch @@ -25,7 +25,7 @@ index dd623702131eaa1a65937a19a0e986e865322258..54ac8444702c3cfc2bcbaa6c8bc40398 List list = worldgenfeatureendspikeconfiguration.c(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c7962b45e818bbfa841a1249156472dc750d6194..4eaf0857339a10570a23259e802b65677a2aa018 100644 +index f1e57b679db156b4013f6bc81925462a746001f2..e9257f76275774518bb1fefe3b78144fd93791ab 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0089-Configurable-dungeon-seed.patch b/patches/server/0089-Configurable-dungeon-seed.patch index 8f0bf6541..495471089 100644 --- a/patches/server/0089-Configurable-dungeon-seed.patch +++ b/patches/server/0089-Configurable-dungeon-seed.patch @@ -31,7 +31,7 @@ index 4a2e3af98ef3383678445c1bdf535203097558ee..363de0352804e6a778d4e6ee34609a94 int i = random.nextInt(2) + 2; int j = -i - 1; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 4eaf0857339a10570a23259e802b65677a2aa018..6faa180bb2a5aa3bd8c4b4845848a63b9366f1eb 100644 +index e9257f76275774518bb1fefe3b78144fd93791ab..c356757bc6c3cca467c0f3839723391c9fc3347e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -142,10 +142,13 @@ public class PurpurConfig { diff --git a/patches/server/0096-Add-option-to-disable-mushroom-block-updates.patch b/patches/server/0096-Add-option-to-disable-mushroom-block-updates.patch index 29d6cca5f..4b07ea949 100644 --- a/patches/server/0096-Add-option-to-disable-mushroom-block-updates.patch +++ b/patches/server/0096-Add-option-to-disable-mushroom-block-updates.patch @@ -73,7 +73,7 @@ index 987301bfb9d963e3bebc2653bd95cf7f17a2a1e4..fd61c18905e81b1b193260f1c32b4ad0 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 6faa180bb2a5aa3bd8c4b4845848a63b9366f1eb..b50c740b799062240e65625cbf44c32ee07f3551 100644 +index c356757bc6c3cca467c0f3839723391c9fc3347e..26cd01fa0aefe9703b11b18468b21898cf5ba2a3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -202,6 +202,11 @@ public class PurpurConfig { diff --git a/patches/server/0099-Add-no-tick-block-list.patch b/patches/server/0099-Add-no-random-tick-block-list.patch similarity index 67% rename from patches/server/0099-Add-no-tick-block-list.patch rename to patches/server/0099-Add-no-random-tick-block-list.patch index 8521e42e5..ec4f7c721 100644 --- a/patches/server/0099-Add-no-tick-block-list.patch +++ b/patches/server/0099-Add-no-random-tick-block-list.patch @@ -1,11 +1,11 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 7 Aug 2020 12:53:36 -0500 -Subject: [PATCH] Add no-tick block list +Subject: [PATCH] Add no-random-tick block list diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java -index bdc1aaa02836cb675224062e59cd635c6fe6e28a..3341a82207ac02be2be8d8baf5a10da183445a7e 100644 +index bdc1aaa02836cb675224062e59cd635c6fe6e28a..345718ed5b30a2ba1ee6082b571e5771112e381b 100644 --- a/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java @@ -532,14 +532,14 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -13,7 +13,7 @@ index bdc1aaa02836cb675224062e59cd635c6fe6e28a..3341a82207ac02be2be8d8baf5a10da1 if (com.destroystokyo.paper.PaperConfig.useOptimizedTickList) { this.nextTickListBlock = new com.destroystokyo.paper.server.ticklist.PaperTickList<>(this, (block) -> { - return block == null || block.getBlockData().isAir(); -+ return block == null || block.getBlockData().isAir() || purpurConfig.noTickBlocks.contains(block); // Purpur ++ return block == null || block.getBlockData().isAir() || purpurConfig.noRandomTickBlocks.contains(block); // Purpur }, IRegistry.BLOCK::getKey, this::b, "Blocks"); // Paper - Timings this.nextTickListFluid = new com.destroystokyo.paper.server.ticklist.PaperTickList<>(this, (fluidtype) -> { return fluidtype == null || fluidtype == FluidTypes.EMPTY; @@ -21,29 +21,29 @@ index bdc1aaa02836cb675224062e59cd635c6fe6e28a..3341a82207ac02be2be8d8baf5a10da1 } else { this.nextTickListBlock = new TickListServer<>(this, (block) -> { - return block == null || block.getBlockData().isAir(); -+ return block == null || block.getBlockData().isAir() || purpurConfig.noTickBlocks.contains(block); // Purpur ++ return block == null || block.getBlockData().isAir() || purpurConfig.noRandomTickBlocks.contains(block); // Purpur }, IRegistry.BLOCK::getKey, this::b, "Blocks"); // Paper - Timings this.nextTickListFluid = new TickListServer<>(this, (fluidtype) -> { return fluidtype == null || fluidtype == FluidTypes.EMPTY; diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java -index 0b852fa247c65cb1e889ad4e55886e256f89a763..2ec82dcb9d989590e59f88a02d1c205b3200cadc 100644 +index 0b852fa247c65cb1e889ad4e55886e256f89a763..aa78176ddd9eced179ceb8e53a1884172490f059 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java @@ -670,10 +670,12 @@ public abstract class BlockBase { } public void a(WorldServer worldserver, BlockPosition blockposition, Random random) { -+ if (worldserver.purpurConfig.noTickBlocks.contains(getBlock())) return; // Purpur ++ if (worldserver.purpurConfig.noRandomTickBlocks.contains(getBlock())) return; // Purpur this.getBlock().tickAlways(this.p(), worldserver, blockposition, random); } public void b(WorldServer worldserver, BlockPosition blockposition, Random random) { -+ if (worldserver.purpurConfig.noTickBlocks.contains(getBlock())) return; // Purpur ++ if (worldserver.purpurConfig.noRandomTickBlocks.contains(getBlock())) return; // Purpur this.getBlock().tick(this.p(), worldserver, blockposition, random); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1e5dfaac19af7047243b991745a341782850cf20..608bd272762314f661920ab16bf17dbf108df178 100644 +index 1e5dfaac19af7047243b991745a341782850cf20..8c04056ec174f02671c088038525637ae0f350cb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -11,8 +11,10 @@ import org.bukkit.configuration.ConfigurationSection; @@ -57,16 +57,28 @@ index 1e5dfaac19af7047243b991745a341782850cf20..608bd272762314f661920ab16bf17dbf import java.util.logging.Level; import static net.pl3x.purpur.PurpurConfig.log; -@@ -201,6 +203,16 @@ public class PurpurWorldConfig { +@@ -201,6 +203,28 @@ public class PurpurWorldConfig { playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack); } -+ public Set noTickBlocks = new HashSet<>(); -+ private void noTickBlocks() { -+ getList("blocks.no-tick", new ArrayList<>()).forEach(key -> { ++ public Set noRandomTickBlocks = new HashSet<>(); ++ private void noRandomTickBlocks() { ++ if (PurpurConfig.version < 11) { ++ List oldList = PurpurConfig.config.getStringList("world-settings." + worldName + ".blocks.no-tick"); ++ if (!oldList.isEmpty()) { ++ PurpurConfig.config.set("world-settings." + worldName + ".blocks.no-random-tick", oldList); ++ PurpurConfig.config.set("world-settings." + worldName + ".blocks.no-tick", null); ++ } ++ oldList = PurpurConfig.config.getStringList("world-settings.default.blocks.no-tick"); ++ if (!oldList.isEmpty()) { ++ PurpurConfig.config.set("world-settings.default.blocks.no-random-tick", oldList); ++ PurpurConfig.config.set("world-settings.default.blocks.no-tick", null); ++ } ++ } ++ getList("blocks.no-random-tick", new ArrayList<>()).forEach(key -> { + Block block = IRegistry.BLOCK.get(new MinecraftKey(key.toString())); + if (!block.getBlockData().isAir()) { -+ noTickBlocks.add(block); ++ noRandomTickBlocks.add(block); + } + }); + } diff --git a/patches/server/0100-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0100-Add-option-to-disable-dolphin-treasure-searching.patch index 856b2230c..b7743c901 100644 --- a/patches/server/0100-Add-option-to-disable-dolphin-treasure-searching.patch +++ b/patches/server/0100-Add-option-to-disable-dolphin-treasure-searching.patch @@ -17,10 +17,10 @@ index 5d18e19eafd5dc01a6caa45075d8c0598f1bb709..e0a9b931c26dbd4e7739d09ae45e1cee } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 608bd272762314f661920ab16bf17dbf108df178..450a582b007fda07e1a2afbb40201a9929b554ba 100644 +index 8c04056ec174f02671c088038525637ae0f350cb..18289cb1453fa00ed00f6a9ae7636eec472b47c1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -353,6 +353,11 @@ public class PurpurWorldConfig { +@@ -365,6 +365,11 @@ public class PurpurWorldConfig { creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance); } diff --git a/patches/server/0101-Short-enderman-height.patch b/patches/server/0101-Short-enderman-height.patch index 2f5b26934..7436c4a66 100644 --- a/patches/server/0101-Short-enderman-height.patch +++ b/patches/server/0101-Short-enderman-height.patch @@ -31,7 +31,7 @@ index 72142f5c777c6218050bc2b69891072d256ea57d..52aa47036acee2ec21ae2d6f4df634ec if (this.tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start for (int i = 0; i < 64; ++i) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index b50c740b799062240e65625cbf44c32ee07f3551..bfae3043ef6bf402011045bd9682117aa3021468 100644 +index 26cd01fa0aefe9703b11b18468b21898cf5ba2a3..2233b798473b0c408c1d755e481e62191c5644a1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -4,6 +4,8 @@ import co.aikar.timings.TimingsManager; diff --git a/patches/server/0102-Stop-squids-floating-on-top-of-water.patch b/patches/server/0102-Stop-squids-floating-on-top-of-water.patch index 3cb8f1087..5d40a8822 100644 --- a/patches/server/0102-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0102-Stop-squids-floating-on-top-of-water.patch @@ -51,10 +51,10 @@ index 92ff03f8e8286f710fd5e63b4d103e489787d453..081929990a8208f643d298a885acc4dd protected void initPathfinder() { this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 450a582b007fda07e1a2afbb40201a9929b554ba..4f5b815f22a906d8438c82204d24417e5d1cc66c 100644 +index 18289cb1453fa00ed00f6a9ae7636eec472b47c1..a13f5e2f242f5ff7bfe7fbd56439a1c1b8b7df2c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -499,8 +499,10 @@ public class PurpurWorldConfig { +@@ -511,8 +511,10 @@ public class PurpurWorldConfig { } public boolean squidImmuneToEAR = true; diff --git a/patches/server/0103-Ridables.patch b/patches/server/0103-Ridables.patch index 1870bd0ec..418038fc4 100644 --- a/patches/server/0103-Ridables.patch +++ b/patches/server/0103-Ridables.patch @@ -88,7 +88,7 @@ index 9de660f0c679f101512bddf7c6582ca6cd18ca5b..e1a6e4a359eb2aa484d479fde398473c public void playerTick() { diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java -index 3341a82207ac02be2be8d8baf5a10da183445a7e..dd1a0cffedc434d570c1b03fa8cf55d90de1f324 100644 +index 345718ed5b30a2ba1ee6082b571e5771112e381b..88741bec1a16b14c6e80737328411c5deb6a467b 100644 --- a/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java @@ -216,6 +216,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -5518,7 +5518,7 @@ index a19a26a88f247d359354902efeece9923f3e0e0b..1119f60890784d953c2cd4e0078af4d0 return new Vec3D(this.x * d0, this.y * d1, this.z * d2); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index bfae3043ef6bf402011045bd9682117aa3021468..2e9cec2d70ab4af5603552ebf8f0c0fa52ccfbe5 100644 +index 2233b798473b0c408c1d755e481e62191c5644a1..5238111a10ca8fcec1dda4cfed1e9c47b1245883 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -137,11 +137,13 @@ public class PurpurConfig { @@ -5536,7 +5536,7 @@ index bfae3043ef6bf402011045bd9682117aa3021468..2e9cec2d70ab4af5603552ebf8f0c0fa public static int dungeonSeed = -1; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4f5b815f22a906d8438c82204d24417e5d1cc66c..8b0afe5ef5d82bf9171a91521681e3ff4e61dffc 100644 +index a13f5e2f242f5ff7bfe7fbd56439a1c1b8b7df2c..19e79cd7ec2c624963affa8587b40d6fc50d0f05 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -42,11 +42,6 @@ public class PurpurWorldConfig { @@ -5551,7 +5551,7 @@ index 4f5b815f22a906d8438c82204d24417e5d1cc66c..8b0afe5ef5d82bf9171a91521681e3ff 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); -@@ -327,61 +322,186 @@ public class PurpurWorldConfig { +@@ -339,61 +334,186 @@ public class PurpurWorldConfig { turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts); } @@ -5738,7 +5738,7 @@ index 4f5b815f22a906d8438c82204d24417e5d1cc66c..8b0afe5ef5d82bf9171a91521681e3ff public float giantStepHeight = 2.0F; public float giantJumpHeight = 1.0F; public double giantMovementSpeed = 0.5D; -@@ -390,6 +510,8 @@ public class PurpurWorldConfig { +@@ -402,6 +522,8 @@ public class PurpurWorldConfig { public boolean giantHaveHostileAI = false; public double giantMaxHealth = 100.0D; private void giantSettings() { @@ -5747,7 +5747,7 @@ index 4f5b815f22a906d8438c82204d24417e5d1cc66c..8b0afe5ef5d82bf9171a91521681e3ff giantStepHeight = (float) getDouble("mobs.giant.step-height", giantStepHeight); giantJumpHeight = (float) getDouble("mobs.giant.jump-height", giantJumpHeight); giantMovementSpeed = getDouble("mobs.giant.movement-speed", giantMovementSpeed); -@@ -404,19 +526,44 @@ public class PurpurWorldConfig { +@@ -416,19 +538,44 @@ public class PurpurWorldConfig { giantMaxHealth = getDouble("mobs.giant.attributes.max-health", giantMaxHealth); } @@ -5792,7 +5792,7 @@ index 4f5b815f22a906d8438c82204d24417e5d1cc66c..8b0afe5ef5d82bf9171a91521681e3ff illusionerMovementSpeed = getDouble("mobs.illusioner.movement-speed", illusionerMovementSpeed); illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange); if (PurpurConfig.version < 8) { -@@ -427,11 +574,76 @@ public class PurpurWorldConfig { +@@ -439,11 +586,76 @@ public class PurpurWorldConfig { illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max-health", illusionerMaxHealth); } @@ -5869,7 +5869,7 @@ index 4f5b815f22a906d8438c82204d24417e5d1cc66c..8b0afe5ef5d82bf9171a91521681e3ff public double phantomAttackedByCrystalRadius = 0.0D; public float phantomAttackedByCrystalDamage = 1.0F; public double phantomOrbitCrystalRadius = 0.0D; -@@ -450,7 +662,13 @@ public class PurpurWorldConfig { +@@ -462,7 +674,13 @@ public class PurpurWorldConfig { public int phantomBurnInLight = 0; public boolean phantomIgnorePlayersWithTorch = false; public boolean phantomBurnInDaylight = true; @@ -5883,7 +5883,7 @@ index 4f5b815f22a906d8438c82204d24417e5d1cc66c..8b0afe5ef5d82bf9171a91521681e3ff phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius); phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage); phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius); -@@ -469,42 +687,187 @@ public class PurpurWorldConfig { +@@ -481,42 +699,187 @@ public class PurpurWorldConfig { phantomBurnInLight = getInt("mobs.phantom.burn-in-light", phantomBurnInLight); phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight); phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch); @@ -6071,7 +6071,7 @@ index 4f5b815f22a906d8438c82204d24417e5d1cc66c..8b0afe5ef5d82bf9171a91521681e3ff public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; public boolean villagerCanBeLeashed = false; -@@ -514,6 +877,8 @@ public class PurpurWorldConfig { +@@ -526,6 +889,8 @@ public class PurpurWorldConfig { public int villagerSpawnIronGolemLimit = 0; public boolean villagerCanBreed = true; private void villagerSettings() { @@ -6080,7 +6080,7 @@ index 4f5b815f22a906d8438c82204d24417e5d1cc66c..8b0afe5ef5d82bf9171a91521681e3ff villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks); villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging); villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed); -@@ -524,45 +889,108 @@ public class PurpurWorldConfig { +@@ -536,45 +901,108 @@ public class PurpurWorldConfig { villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed); } diff --git a/patches/server/0105-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0105-Crying-obsidian-valid-for-portal-frames.patch index e579ee2e3..064926541 100644 --- a/patches/server/0105-Crying-obsidian-valid-for-portal-frames.patch +++ b/patches/server/0105-Crying-obsidian-valid-for-portal-frames.patch @@ -17,7 +17,7 @@ index 5ea059cde9e1a089c2ade12512e4a7abd07c5b8a..97eb81338207c93125bea08225638494 return this == block; } diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java -index 2ec82dcb9d989590e59f88a02d1c205b3200cadc..8d21f9451c60873d1524ad64876094e6e21509e4 100644 +index aa78176ddd9eced179ceb8e53a1884172490f059..936933ab4c9e78877e1a2fc250721c2158e3810c 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java @@ -740,6 +740,7 @@ public abstract class BlockBase { @@ -42,7 +42,7 @@ index 3f8a674345bcad8289a48d2daa5e2a283528e952..3c35f5d171df518f491cad1f49882622 private final GeneratorAccess b; private final EnumDirection.EnumAxis c; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 2e9cec2d70ab4af5603552ebf8f0c0fa52ccfbe5..c61595aa6e42a4cc096bda9126d23c465f8bd3de 100644 +index 5238111a10ca8fcec1dda4cfed1e9c47b1245883..648c496390bbf663df39429631514a1245c3f72d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -180,6 +180,7 @@ public class PurpurConfig { diff --git a/patches/server/0106-Entities-can-use-portals-configuration.patch b/patches/server/0106-Entities-can-use-portals-configuration.patch index 739bcc60d..68c6d1ff7 100644 --- a/patches/server/0106-Entities-can-use-portals-configuration.patch +++ b/patches/server/0106-Entities-can-use-portals-configuration.patch @@ -27,7 +27,7 @@ index d1bbf4127a2e0836bedb33a81e3fd18a8e8eb962..4b4c6477122c51871ce98f34c6e58740 public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8b0afe5ef5d82bf9171a91521681e3ff4e61dffc..c7c33906466a28f65a6f8252a959a6651bd1074e 100644 +index 19e79cd7ec2c624963affa8587b40d6fc50d0f05..66074748c6fd366caf58170de478a01d3adb1430 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -158,6 +158,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0108-Customizable-wither-health-and-healing.patch b/patches/server/0108-Customizable-wither-health-and-healing.patch index 15d977e1c..776930dfc 100644 --- a/patches/server/0108-Customizable-wither-health-and-healing.patch +++ b/patches/server/0108-Customizable-wither-health-and-healing.patch @@ -44,10 +44,10 @@ index 4c0a555cdb5bc34c73040b9533beaee56cbce70a..beb4d59faf4bd7501468b2eaa0e86661 //this.bossBattle.setProgress(this.getHealth() / this.getMaxHealth()); // Paper - Moved down diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c7c33906466a28f65a6f8252a959a6651bd1074e..3e1b97a4003cea3af511ed9b7f13f8a5373f9a20 100644 +index 66074748c6fd366caf58170de478a01d3adb1430..4b851fe1f266dd646e51730d41fbe269ad2c9791 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -921,10 +921,21 @@ public class PurpurWorldConfig { +@@ -933,10 +933,21 @@ public class PurpurWorldConfig { public boolean witherRidable = false; public boolean witherRidableInWater = false; public double witherMaxY = 256D; diff --git a/patches/server/0109-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0109-Allow-toggling-special-MobSpawners-per-world.patch index 7fe16bbc2..eb7460132 100644 --- a/patches/server/0109-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0109-Allow-toggling-special-MobSpawners-per-world.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this. diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java -index dd1a0cffedc434d570c1b03fa8cf55d90de1f324..c74e82feb007764d77f8f9b7f910f7b113e3bf40 100644 +index 88741bec1a16b14c6e80737328411c5deb6a467b..906af187d9f52cd1df9b6ec47b88230d35860471 100644 --- a/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java @@ -92,6 +92,7 @@ import net.minecraft.world.entity.EnumCreatureType; @@ -106,7 +106,7 @@ index c75b1b1e8d99157336065f561d40ac803239c6b7..06ecb1ec2b92f0978c57de6353f63a02 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3e1b97a4003cea3af511ed9b7f13f8a5373f9a20..1d144ed296120eccee1001fd1299ead48351cbfa 100644 +index 4b851fe1f266dd646e51730d41fbe269ad2c9791..b60ac4576578f9dc95b66ad2932b046f7f50317e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -7,6 +7,8 @@ import net.minecraft.world.level.block.Blocks; diff --git a/patches/server/0110-Raid-cooldown-setting.patch b/patches/server/0110-Raid-cooldown-setting.patch index ac3b1f616..b4d18f9bf 100644 --- a/patches/server/0110-Raid-cooldown-setting.patch +++ b/patches/server/0110-Raid-cooldown-setting.patch @@ -52,7 +52,7 @@ index c939ca087af4588e14669a2d53d7c116dcb59f16..11271762dcf5783c3179de1afc6a882c if (!this.raids.containsKey(raid.getId())) { this.raids.put(raid.getId(), raid); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1d144ed296120eccee1001fd1299ead48351cbfa..9dcc2f52641e9196487744f4a1e8ae0f312aaff8 100644 +index b60ac4576578f9dc95b66ad2932b046f7f50317e..847975c3c2309633e1505b9ee37d9d7ba9019f0f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -173,6 +173,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0111-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0111-Despawn-rate-config-options-per-projectile-type.patch index 0e27c10f7..d777ae70b 100644 --- a/patches/server/0111-Despawn-rate-config-options-per-projectile-type.patch +++ b/patches/server/0111-Despawn-rate-config-options-per-projectile-type.patch @@ -300,7 +300,7 @@ index 3914081629669aea19d50530db996728bbfa607f..62fa5be9090c8789e91bf9b9f614e74a public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9dcc2f52641e9196487744f4a1e8ae0f312aaff8..43b11c9e8af513002318e11ed58a3f2afa1c7a89 100644 +index 847975c3c2309633e1505b9ee37d9d7ba9019f0f..4015a27eebbfd655d3723813a0632f3183d48af7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -165,6 +165,35 @@ public class PurpurWorldConfig { diff --git a/patches/server/0112-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0112-Add-option-to-disable-zombie-aggressiveness-towards-.patch index 01573bd6c..ddffd1c84 100644 --- a/patches/server/0112-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/server/0112-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -69,10 +69,10 @@ index 901fe8d224130c67bad00636b065bc798859a18e..88264b7b2c21a377f4b0dd857065e401 this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo)); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 43b11c9e8af513002318e11ed58a3f2afa1c7a89..22aa4709d1db75eb901a6145b75689bd766bf10b 100644 +index 4015a27eebbfd655d3723813a0632f3183d48af7..93d934b020203dbcd20d01ee650a4a204a9ac201 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1023,12 +1023,14 @@ public class PurpurWorldConfig { +@@ -1035,12 +1035,14 @@ public class PurpurWorldConfig { public boolean zombieJockeyOnlyBaby = true; public double zombieJockeyChance = 0.05D; public boolean zombieJockeyTryExistingChickens = true; diff --git a/patches/server/0113-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0113-Persistent-TileEntity-Lore-and-DisplayName.patch index 43a3360ef..0dbdf2900 100644 --- a/patches/server/0113-Persistent-TileEntity-Lore-and-DisplayName.patch +++ b/patches/server/0113-Persistent-TileEntity-Lore-and-DisplayName.patch @@ -214,7 +214,7 @@ index f1e586754396439dfb70a4d63e3b8b34fb36ebf4..8a049d3de8937a6c8afe178ccd134e25 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 22aa4709d1db75eb901a6145b75689bd766bf10b..4843d4a0794e05386d6cdf05a7059598291aafe7 100644 +index 93d934b020203dbcd20d01ee650a4a204a9ac201..abe5bc17ff209edbbcb3bb366669887b8d3c75f3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -200,6 +200,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0115-Flying-squids-Oh-my.patch b/patches/server/0115-Flying-squids-Oh-my.patch index f2b5e6f13..8106603c0 100644 --- a/patches/server/0115-Flying-squids-Oh-my.patch +++ b/patches/server/0115-Flying-squids-Oh-my.patch @@ -38,10 +38,10 @@ index 10e228a36b213a87e17f26a633adfca18a006e94..07b1db0e1fff1beffe464a3984716d5d float f1 = MathHelper.cos(f) * 0.2F; float f2 = -0.1F + this.b.getRandom().nextFloat() * 0.2F; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4843d4a0794e05386d6cdf05a7059598291aafe7..a9f3cec879329101794afa3561bcff63a6db22bf 100644 +index abe5bc17ff209edbbcb3bb366669887b8d3c75f3..53a9208cd22b5057caef0dff5edc100297686422 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -879,10 +879,12 @@ public class PurpurWorldConfig { +@@ -891,10 +891,12 @@ public class PurpurWorldConfig { public boolean squidRidable = false; public boolean squidImmuneToEAR = true; public double squidOffsetWaterCheck = 0.0D; diff --git a/patches/server/0116-Infinity-bow-settings.patch b/patches/server/0116-Infinity-bow-settings.patch index f332d7987..0700a56e2 100644 --- a/patches/server/0116-Infinity-bow-settings.patch +++ b/patches/server/0116-Infinity-bow-settings.patch @@ -26,7 +26,7 @@ index 015f4d71f35a9d512814389b6e6cab74c0daf116..c7e20b25b4d09463fa54c66e62208e90 entityhuman.b(StatisticList.ITEM_USED.b(this)); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a9f3cec879329101794afa3561bcff63a6db22bf..bc4caba06f469f700c89e96f1e70c7b2948329ad 100644 +index 53a9208cd22b5057caef0dff5edc100297686422..c14fcd0c46b1f5ca6b827632cb37dd5f7e3eb6cd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -165,6 +165,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0117-Stonecutter-damage.patch b/patches/server/0117-Stonecutter-damage.patch index 6f3925169..d419a9aaf 100644 --- a/patches/server/0117-Stonecutter-damage.patch +++ b/patches/server/0117-Stonecutter-damage.patch @@ -49,10 +49,10 @@ index 7b92a54cfb64fb77af99e6bf66eacbdb9e769dc1..9d08094165cf18d99116b5c721fff888 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index bc4caba06f469f700c89e96f1e70c7b2948329ad..fdd44288c3d962df02cb65a5de5ac75d3dd4c5b9 100644 +index c14fcd0c46b1f5ca6b827632cb37dd5f7e3eb6cd..8dda3c6aab016c52cf8cc2ee663087cbe9099681 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -383,6 +383,11 @@ public class PurpurWorldConfig { +@@ -395,6 +395,11 @@ public class PurpurWorldConfig { spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone); } diff --git a/patches/server/0118-Configurable-daylight-cycle.patch b/patches/server/0118-Configurable-daylight-cycle.patch index 54a64c91d..72a813dda 100644 --- a/patches/server/0118-Configurable-daylight-cycle.patch +++ b/patches/server/0118-Configurable-daylight-cycle.patch @@ -18,7 +18,7 @@ index 3086ee023685781d94e2fb99fc8dff5264f01165..74c1047305cac5673e274096709c757e public PacketPlayOutUpdateTime() {} diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java -index c74e82feb007764d77f8f9b7f910f7b113e3bf40..63b22bd2dc828f4b5be45f8162745b4cc214382b 100644 +index 906af187d9f52cd1df9b6ec47b88230d35860471..fc77904699bb75cf55e7ea77a55c8ad4a9412c18 100644 --- a/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java @@ -64,6 +64,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutExplosion; @@ -82,7 +82,7 @@ index c74e82feb007764d77f8f9b7f910f7b113e3bf40..63b22bd2dc828f4b5be45f8162745b4c public void doMobSpawning(boolean flag, boolean flag1) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index fdd44288c3d962df02cb65a5de5ac75d3dd4c5b9..ae1202142600a15566c4c3d77487ff65c1f06087 100644 +index 8dda3c6aab016c52cf8cc2ee663087cbe9099681..21bc5f3b398b824a66e089e408e6759d33c30511 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -116,6 +116,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0119-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0119-Allow-infinite-and-mending-enchantments-together.patch index a451c2463..646419074 100644 --- a/patches/server/0119-Allow-infinite-and-mending-enchantments-together.patch +++ b/patches/server/0119-Allow-infinite-and-mending-enchantments-together.patch @@ -17,7 +17,7 @@ index bf9d6d0e593951aa5abc9aef6cf4803430ea18e5..29bebbccf8dd6ff8976d1bfdb4c2ddcf } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c61595aa6e42a4cc096bda9126d23c465f8bd3de..44d3b46fc9fa9852187bacc71beeecaf53040c11 100644 +index 648c496390bbf663df39429631514a1245c3f72d..530645c45a33bc757a64716c39f41e7c0b3e613d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -198,6 +198,16 @@ public class PurpurConfig { diff --git a/patches/server/0120-Infinite-fuel-furnace.patch b/patches/server/0120-Infinite-fuel-furnace.patch index c088f8ecf..db9d2a157 100644 --- a/patches/server/0120-Infinite-fuel-furnace.patch +++ b/patches/server/0120-Infinite-fuel-furnace.patch @@ -57,10 +57,10 @@ index 1997139fb87dc1947acfdf02e1f116577c3fa943..cd7bcedf8474dcb565b5b1157e167706 if (flag1) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ae1202142600a15566c4c3d77487ff65c1f06087..c9a6261e988c85874d24ed78890e668637aaf6d6 100644 +index 21bc5f3b398b824a66e089e408e6759d33c30511..938876a4edb3b37e6b7dcc3b2c1b55cd35df1c8e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -351,6 +351,11 @@ public class PurpurWorldConfig { +@@ -363,6 +363,11 @@ public class PurpurWorldConfig { farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow); } diff --git a/patches/server/0122-Add-tablist-suffix-option-for-afk.patch b/patches/server/0122-Add-tablist-suffix-option-for-afk.patch index 66282d790..5e27e95f7 100644 --- a/patches/server/0122-Add-tablist-suffix-option-for-afk.patch +++ b/patches/server/0122-Add-tablist-suffix-option-for-afk.patch @@ -22,7 +22,7 @@ index e1a6e4a359eb2aa484d479fde398473c349a63ba..9ec4008f2195908130410d2c36fb5bf2 ((WorldServer) world).everyoneSleeping(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 44d3b46fc9fa9852187bacc71beeecaf53040c11..cc354e420befd531a8c1e778fd97e9b7c4c26f90 100644 +index 530645c45a33bc757a64716c39f41e7c0b3e613d..028436ca9e94d816348bd8772611cf71d0604e9e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -136,12 +136,14 @@ public class PurpurConfig { diff --git a/patches/server/0123-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0123-Ability-to-re-add-farmland-mechanics-from-Alpha.patch index 377a4b731..0b9e7d190 100644 --- a/patches/server/0123-Ability-to-re-add-farmland-mechanics-from-Alpha.patch +++ b/patches/server/0123-Ability-to-re-add-farmland-mechanics-from-Alpha.patch @@ -24,10 +24,10 @@ index 2bbaa2fb426869223a9b2f07406496c1b0daff3f..3e8893bf76b8ffda4c595c81086556ea return; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c9a6261e988c85874d24ed78890e668637aaf6d6..f774572a14c0d997aabeab902dca9764a5f1411e 100644 +index 938876a4edb3b37e6b7dcc3b2c1b55cd35df1c8e..6d18cc40841c285664fbb0964ba0ecc30994fc5c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -347,8 +347,10 @@ public class PurpurWorldConfig { +@@ -359,8 +359,10 @@ public class PurpurWorldConfig { } public boolean farmlandGetsMoistFromBelow = false; diff --git a/patches/server/0124-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0124-Add-adjustable-breeding-cooldown-to-config.patch index 434b3dd22..b171a6a66 100644 --- a/patches/server/0124-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0124-Add-adjustable-breeding-cooldown-to-config.patch @@ -102,7 +102,7 @@ index 06ecb1ec2b92f0978c57de6353f63a02e6e363da..266240b2fa9f22c5bff094fdb003a73a this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f774572a14c0d997aabeab902dca9764a5f1411e..23b4593ff14b7a74839f199b1b1056214a6943a0 100644 +index 6d18cc40841c285664fbb0964ba0ecc30994fc5c..34b39dbeb0452fd4488d0cd7b4202782ec49e2c3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -220,6 +220,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0125-Make-entity-breeding-times-configurable.patch b/patches/server/0125-Make-entity-breeding-times-configurable.patch index ef55ae9f1..9d4c1eb24 100644 --- a/patches/server/0125-Make-entity-breeding-times-configurable.patch +++ b/patches/server/0125-Make-entity-breeding-times-configurable.patch @@ -428,10 +428,10 @@ index 64253428ef66145d07f74f8d0e5bdeb5aa5fe02b..828d01abe8202a246ce07c1c652a17cb @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be03c20b1c 100644 +index 34b39dbeb0452fd4488d0cd7b4202782ec49e2c3..71e6f39d8a75061e8bb37db20f03ec616ca1d165 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -434,10 +434,12 @@ public class PurpurWorldConfig { +@@ -446,10 +446,12 @@ public class PurpurWorldConfig { public boolean beeRidable = false; public boolean beeRidableInWater = false; public double beeMaxY = 256D; @@ -444,7 +444,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean blazeRidable = false; -@@ -454,12 +456,14 @@ public class PurpurWorldConfig { +@@ -466,12 +468,14 @@ public class PurpurWorldConfig { public int catSpawnDelay = 1200; public int catSpawnSwampHutScanRange = 16; public int catSpawnVillageScanRange = 48; @@ -459,7 +459,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean caveSpiderRidable = false; -@@ -472,10 +476,12 @@ public class PurpurWorldConfig { +@@ -484,10 +488,12 @@ public class PurpurWorldConfig { public boolean chickenRidable = false; public boolean chickenRidableInWater = false; public boolean chickenRetaliate = false; @@ -472,7 +472,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean codRidable = false; -@@ -486,10 +492,12 @@ public class PurpurWorldConfig { +@@ -498,10 +504,12 @@ public class PurpurWorldConfig { public boolean cowRidable = false; public boolean cowRidableInWater = false; public int cowFeedMushrooms = 0; @@ -485,7 +485,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean creeperRidable = false; -@@ -517,8 +525,10 @@ public class PurpurWorldConfig { +@@ -529,8 +537,10 @@ public class PurpurWorldConfig { } public boolean donkeyRidableInWater = false; @@ -496,7 +496,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean drownedRidable = false; -@@ -576,10 +586,12 @@ public class PurpurWorldConfig { +@@ -588,10 +598,12 @@ public class PurpurWorldConfig { public boolean foxRidable = false; public boolean foxRidableInWater = false; public boolean foxTypeChangesWithTulips = false; @@ -509,7 +509,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean ghastRidable = false; -@@ -624,14 +636,18 @@ public class PurpurWorldConfig { +@@ -636,14 +648,18 @@ public class PurpurWorldConfig { public boolean hoglinRidable = false; public boolean hoglinRidableInWater = false; @@ -528,7 +528,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean huskRidable = false; -@@ -676,9 +692,11 @@ public class PurpurWorldConfig { +@@ -688,9 +704,11 @@ public class PurpurWorldConfig { public boolean llamaRidable = false; public boolean llamaRidableInWater = false; @@ -540,7 +540,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean llamaTraderRidable = false; -@@ -697,28 +715,36 @@ public class PurpurWorldConfig { +@@ -709,28 +727,36 @@ public class PurpurWorldConfig { public boolean mooshroomRidable = false; public boolean mooshroomRidableInWater = false; @@ -577,7 +577,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean parrotRidable = false; -@@ -784,10 +810,12 @@ public class PurpurWorldConfig { +@@ -796,10 +822,12 @@ public class PurpurWorldConfig { public boolean pigRidable = false; public boolean pigRidableInWater = false; public boolean pigGiveSaddleBack = false; @@ -590,7 +590,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean piglinRidable = false; -@@ -815,12 +843,14 @@ public class PurpurWorldConfig { +@@ -827,12 +855,14 @@ public class PurpurWorldConfig { public boolean polarBearRidableInWater = false; public String polarBearBreedableItemString = ""; public Item polarBearBreedableItem = null; @@ -605,7 +605,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean pufferfishRidable = false; -@@ -832,11 +862,13 @@ public class PurpurWorldConfig { +@@ -844,11 +874,13 @@ public class PurpurWorldConfig { public boolean rabbitRidableInWater = false; public double rabbitNaturalToast = 0.0D; public double rabbitNaturalKiller = 0.0D; @@ -619,7 +619,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean ravagerRidable = false; -@@ -853,9 +885,11 @@ public class PurpurWorldConfig { +@@ -865,9 +897,11 @@ public class PurpurWorldConfig { public boolean sheepRidable = false; public boolean sheepRidableInWater = false; @@ -631,7 +631,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean shulkerRidable = false; -@@ -933,9 +967,11 @@ public class PurpurWorldConfig { +@@ -945,9 +979,11 @@ public class PurpurWorldConfig { public boolean striderRidable = false; public boolean striderRidableInWater = false; @@ -643,7 +643,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean tropicalFishRidable = false; -@@ -945,9 +981,11 @@ public class PurpurWorldConfig { +@@ -957,9 +993,11 @@ public class PurpurWorldConfig { public boolean turtleRidable = false; public boolean turtleRidableInWater = false; @@ -655,7 +655,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean vexRidable = false; -@@ -969,6 +1007,7 @@ public class PurpurWorldConfig { +@@ -981,6 +1019,7 @@ public class PurpurWorldConfig { public int villagerSpawnIronGolemRadius = 0; public int villagerSpawnIronGolemLimit = 0; public boolean villagerCanBreed = true; @@ -663,7 +663,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -980,6 +1019,7 @@ public class PurpurWorldConfig { +@@ -992,6 +1031,7 @@ public class PurpurWorldConfig { villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius); villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit); villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed); @@ -671,7 +671,7 @@ index 23b4593ff14b7a74839f199b1b1056214a6943a0..2d4dea3c432fcf52dffd126f8bd910be } public boolean villagerTraderRidable = false; -@@ -1040,9 +1080,11 @@ public class PurpurWorldConfig { +@@ -1052,9 +1092,11 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; diff --git a/patches/server/0126-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0126-Apply-display-names-from-item-forms-of-entities-to-e.patch index 9afc31054..fe8037f81 100644 --- a/patches/server/0126-Apply-display-names-from-item-forms-of-entities-to-e.patch +++ b/patches/server/0126-Apply-display-names-from-item-forms-of-entities-to-e.patch @@ -154,7 +154,7 @@ index 81e2ccfa4f6cf6a4ad9236cf0ce94df8dc3ec5b6..132972755ac74838f3386e0fac503338 NBTTagCompound nbttagcompound = this.a("display"); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2d4dea3c432fcf52dffd126f8bd910be03c20b1c..e1af622206f28186e7eebf135f3786c7a771b337 100644 +index 71e6f39d8a75061e8bb37db20f03ec616ca1d165..d054678a1fc7825a4b43e5841ca9715a86d0d091 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -83,8 +83,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0127-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0127-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch index 5044d12a1..c3f37c5c5 100644 --- a/patches/server/0127-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch +++ b/patches/server/0127-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch @@ -29,7 +29,7 @@ index b9b2b27e534ba87a1aae3c521f393a066a18a199..4f4e9ebb9af4970fe920a540d40dbc56 ((EntityInsentient) newEntityLiving).setPersistent(); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e1af622206f28186e7eebf135f3786c7a771b337..43d23f55283ad8a611073bceaea554368775f483 100644 +index d054678a1fc7825a4b43e5841ca9715a86d0d091..9298bfbf64aae5bcdd758e3cddba14f9e6e2ba4e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -84,9 +84,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0128-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0128-Add-twisting-and-weeping-vines-growth-rates.patch index 147611762..741629432 100644 --- a/patches/server/0128-Add-twisting-and-weeping-vines-growth-rates.patch +++ b/patches/server/0128-Add-twisting-and-weeping-vines-growth-rates.patch @@ -91,10 +91,10 @@ index 2552631084926c2fad40b3f21ae479c0e1cfdb77..198bd8857571872ed3f7437529c330dc + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 43d23f55283ad8a611073bceaea554368775f483..a7a368a0a4e59800b4ba9191ab24cca9ea636ff0 100644 +index 9298bfbf64aae5bcdd758e3cddba14f9e6e2ba4e..6894d0aa124b45bf6eb79d417026b85fc342f25a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -419,6 +419,16 @@ public class PurpurWorldConfig { +@@ -431,6 +431,16 @@ public class PurpurWorldConfig { turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts); } diff --git a/patches/server/0129-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0129-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch index 4edef9f04..97b25591a 100644 --- a/patches/server/0129-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch +++ b/patches/server/0129-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch @@ -89,10 +89,10 @@ index 198bd8857571872ed3f7437529c330dceeb825db..a71f97e87ee7210f3246e542dd768403 // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a7a368a0a4e59800b4ba9191ab24cca9ea636ff0..27863bdfc41fd27a9dbf9e8f9673fcb65b9dc5a4 100644 +index 6894d0aa124b45bf6eb79d417026b85fc342f25a..e11b7abcebefc384b7d15fbae17c6d8e723e2cc5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -366,6 +366,11 @@ public class PurpurWorldConfig { +@@ -378,6 +378,11 @@ public class PurpurWorldConfig { furnaceInfiniteFuel = getBoolean("blocks.furnace.infinite-fuel", furnaceInfiniteFuel); } @@ -104,7 +104,7 @@ index a7a368a0a4e59800b4ba9191ab24cca9ea636ff0..27863bdfc41fd27a9dbf9e8f9673fcb6 public boolean lavaInfinite = false; public int lavaInfiniteRequiredSources = 2; public int lavaSpeedNether = 10; -@@ -420,13 +425,17 @@ public class PurpurWorldConfig { +@@ -432,13 +437,17 @@ public class PurpurWorldConfig { } public double twistingVinesGrowthModifier = 0.10D; diff --git a/patches/server/0130-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0130-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch index 2836a48af..1bab509ac 100644 --- a/patches/server/0130-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch +++ b/patches/server/0130-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch @@ -21,10 +21,10 @@ index 03fa2cfc1d5bc27e03e9979b3f33d88362c19066..18b3f8d1fadd1424327261d92b49977a static class PathfinderGoalEndermanPickupBlock extends PathfinderGoal { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 27863bdfc41fd27a9dbf9e8f9673fcb65b9dc5a4..3a7d060263da6a31f65870833bbb82893700022d 100644 +index e11b7abcebefc384b7d15fbae17c6d8e723e2cc5..fe7d850d110f8ea5746f186694014d8d9fd11a97 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -588,10 +588,12 @@ public class PurpurWorldConfig { +@@ -600,10 +600,12 @@ public class PurpurWorldConfig { public boolean endermanRidable = false; public boolean endermanRidableInWater = false; public boolean endermanAllowGriefing = true; diff --git a/patches/server/0132-Add-configurable-snowball-damage.patch b/patches/server/0132-Add-configurable-snowball-damage.patch index 879506e15..6c2c7965a 100644 --- a/patches/server/0132-Add-configurable-snowball-damage.patch +++ b/patches/server/0132-Add-configurable-snowball-damage.patch @@ -18,7 +18,7 @@ index 0d3b9c81e47eef645335e49a1d6d88db7338aa4b..6bfd3f57e6c04ed426870d6dbf068bf3 entity.damageEntity(DamageSource.projectile(this, this.getShooter()), (float) i); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3a7d060263da6a31f65870833bbb82893700022d..2b6e29463ec6b1d67a0100c650c218f340f72940 100644 +index fe7d850d110f8ea5746f186694014d8d9fd11a97..fd0abfef98944c8ce4cf91c1ddb401d62f82c4e5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -214,6 +214,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0133-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0133-Zombie-break-door-minimum-difficulty-option.patch index d3cf1d168..a1f3a66fc 100644 --- a/patches/server/0133-Zombie-break-door-minimum-difficulty-option.patch +++ b/patches/server/0133-Zombie-break-door-minimum-difficulty-option.patch @@ -50,7 +50,7 @@ index 10ee8a0a717354f50b29e7ebeab0ee2aa7bf42f7..d785066e2a52699c18315f7244d80db6 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2b6e29463ec6b1d67a0100c650c218f340f72940..65de687319e9759630c7114dfe5c70455bb9957a 100644 +index fd0abfef98944c8ce4cf91c1ddb401d62f82c4e5..55b64126f3fc586fefae9a16e7f1b5d28cffc14d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1,6 +1,7 @@ @@ -61,7 +61,7 @@ index 2b6e29463ec6b1d67a0100c650c218f340f72940..65de687319e9759630c7114dfe5c7045 import net.minecraft.world.level.Explosion; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -@@ -1132,6 +1133,7 @@ public class PurpurWorldConfig { +@@ -1144,6 +1145,7 @@ public class PurpurWorldConfig { public double zombieJockeyChance = 0.05D; public boolean zombieJockeyTryExistingChickens = true; public boolean zombieAggressiveTowardsVillagerWhenLagging = true; @@ -69,7 +69,7 @@ index 2b6e29463ec6b1d67a0100c650c218f340f72940..65de687319e9759630c7114dfe5c7045 private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1139,6 +1141,11 @@ public class PurpurWorldConfig { +@@ -1151,6 +1153,11 @@ public class PurpurWorldConfig { zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance); zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens); zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging); diff --git a/patches/server/0134-Add-demo-command.patch b/patches/server/0134-Add-demo-command.patch index 4ccc5a1a7..d7ae20ef2 100644 --- a/patches/server/0134-Add-demo-command.patch +++ b/patches/server/0134-Add-demo-command.patch @@ -30,7 +30,7 @@ index edb6c0ab2826051b04e025a713d794dbc5de4792..0161657748d398b6827ef8bc2b00b8a6 public static final PacketPlayOutGameStateChange.a h = new PacketPlayOutGameStateChange.a(7); public static final PacketPlayOutGameStateChange.a i = new PacketPlayOutGameStateChange.a(8); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index cc354e420befd531a8c1e778fd97e9b7c4c26f90..d61a0e028135486b86ce1d0984eae3aea45e8a9a 100644 +index 028436ca9e94d816348bd8772611cf71d0604e9e..d6c8e584ed4a0fb32bbd052532e2fb9ceec5fa7a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -137,6 +137,7 @@ public class PurpurConfig { diff --git a/patches/server/0137-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0137-Changeable-Mob-Left-Handed-Chance.patch index e6e20baa8..c925053de 100644 --- a/patches/server/0137-Changeable-Mob-Left-Handed-Chance.patch +++ b/patches/server/0137-Changeable-Mob-Left-Handed-Chance.patch @@ -18,7 +18,7 @@ index 8b7f840bb1b24996b40c9bef85f4c1e98e39caec..63d93060b350069040876aaacb91c853 } else { this.setLeftHanded(false); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 65de687319e9759630c7114dfe5c70455bb9957a..6b0b132ce3924722adbd8cb0beb45af446385fe6 100644 +index 55b64126f3fc586fefae9a16e7f1b5d28cffc14d..2265952ae272dc27796f87bd05e171a6c1fdab1b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -129,8 +129,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0138-Add-boat-fall-damage-config.patch b/patches/server/0138-Add-boat-fall-damage-config.patch index a03ea82a0..025b8ee47 100644 --- a/patches/server/0138-Add-boat-fall-damage-config.patch +++ b/patches/server/0138-Add-boat-fall-damage-config.patch @@ -35,7 +35,7 @@ index 9ec4008f2195908130410d2c36fb5bf21b26b991..f942c3ab757b768fbd1d459752b7f290 if (!flag && isSpawnInvulnerable() && damagesource != DamageSource.OUT_OF_WORLD) { // Purpur diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6b0b132ce3924722adbd8cb0beb45af446385fe6..34feb9f133044232846cd04f10268235d3076501 100644 +index 2265952ae272dc27796f87bd05e171a6c1fdab1b..df42e4a1d1c542eb20759ede3e20ce186352e5c2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -224,6 +224,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0139-Config-migration-disable-saving-projectiles-to-disk-.patch b/patches/server/0139-Config-migration-disable-saving-projectiles-to-disk-.patch index a55beecc5..ac5dce774 100644 --- a/patches/server/0139-Config-migration-disable-saving-projectiles-to-disk-.patch +++ b/patches/server/0139-Config-migration-disable-saving-projectiles-to-disk-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: disable saving projectiles to disk -> diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d61a0e028135486b86ce1d0984eae3aea45e8a9a..b43d6d08d1eb2d77a4c8288d5c5f2a76efcab8db 100644 +index d6c8e584ed4a0fb32bbd052532e2fb9ceec5fa7a..08780b09a163311a3eaae4dd89dd8dab2eba310e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,6 +1,7 @@ @@ -36,7 +36,7 @@ index d61a0e028135486b86ce1d0984eae3aea45e8a9a..b43d6d08d1eb2d77a4c8288d5c5f2a76 public static String afkBroadcastBack = "§e§o%s is no longer AFK"; public static String afkTabListPrefix = "[AFK] "; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 34feb9f133044232846cd04f10268235d3076501..15dc2dcbb4bec56efd6e069b1848d6c55a3ffa32 100644 +index df42e4a1d1c542eb20759ede3e20ce186352e5c2..dbd3836c4f35a5ae560234b268d0f69b0a13701d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0140-Snow-Golem-rate-of-fire-config.patch b/patches/server/0140-Snow-Golem-rate-of-fire-config.patch index a4e705668..0d44a262a 100644 --- a/patches/server/0140-Snow-Golem-rate-of-fire-config.patch +++ b/patches/server/0140-Snow-Golem-rate-of-fire-config.patch @@ -23,10 +23,10 @@ index cfcf67e99ae345f77a55771e6a25bdcdb4a9740a..28b5c22ecfe573ac9d91b74e54ebd3e3 this.goalSelector.a(3, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F)); this.goalSelector.a(4, new PathfinderGoalRandomLookaround(this)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 15dc2dcbb4bec56efd6e069b1848d6c55a3ffa32..3387b3af053cc6a79e89b6273b9121ca2734b81e 100644 +index dbd3836c4f35a5ae560234b268d0f69b0a13701d..eb6e752ca3be8fc933eec58f639952990393bb1f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -981,12 +981,20 @@ public class PurpurWorldConfig { +@@ -993,12 +993,20 @@ public class PurpurWorldConfig { public boolean snowGolemLeaveTrailWhenRidden = false; public boolean snowGolemDropsPumpkin = true; public boolean snowGolemPutPumpkinBack = false; diff --git a/patches/server/0142-EMC-Configurable-disable-give-dropping.patch b/patches/server/0142-EMC-Configurable-disable-give-dropping.patch index e33114593..ff857d124 100644 --- a/patches/server/0142-EMC-Configurable-disable-give-dropping.patch +++ b/patches/server/0142-EMC-Configurable-disable-give-dropping.patch @@ -20,7 +20,7 @@ index 6685bf1757458d908e32d4069f7a8a22a28c28d7..82d663d3b8bbbb020c3467ea93b54729 itemstack.setCount(1); entityitem = entityplayer.drop(itemstack, false); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index b43d6d08d1eb2d77a4c8288d5c5f2a76efcab8db..3836602aba80a1e23bbec451d6948159b10dd24d 100644 +index 08780b09a163311a3eaae4dd89dd8dab2eba310e..a8d2df5ba1d6400dc3431f7aaf148a0691007e9c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -193,6 +193,11 @@ public class PurpurConfig { diff --git a/patches/server/0143-Config-migration-climbing-should-not-bypass-cramming.patch b/patches/server/0143-Config-migration-climbing-should-not-bypass-cramming.patch index d563b070e..5dfde8a8a 100644 --- a/patches/server/0143-Config-migration-climbing-should-not-bypass-cramming.patch +++ b/patches/server/0143-Config-migration-climbing-should-not-bypass-cramming.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: climbing should not bypass cramming diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 3836602aba80a1e23bbec451d6948159b10dd24d..322cecf1a7316fb8fe00ff538fe3a2dd21708819 100644 +index a8d2df5ba1d6400dc3431f7aaf148a0691007e9c..7b9f5e04af48e9c5ab9769b8f45ed2b2853dd98c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -145,6 +145,17 @@ public class PurpurConfig { @@ -28,7 +28,7 @@ index 3836602aba80a1e23bbec451d6948159b10dd24d..322cecf1a7316fb8fe00ff538fe3a2dd public static String afkBroadcastBack = "§e§o%s is no longer AFK"; public static String afkTabListPrefix = "[AFK] "; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3387b3af053cc6a79e89b6273b9121ca2734b81e..5ad9b63e50137163ec7bab48560f618f165d676f 100644 +index eb6e752ca3be8fc933eec58f639952990393bb1f..d6f98a1b4bcc44bad7c8e39f31ea61cd7428f071 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -96,6 +96,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0144-Lobotomize-stuck-villagers.patch b/patches/server/0144-Lobotomize-stuck-villagers.patch index 17ea4f7c9..3c9565b02 100644 --- a/patches/server/0144-Lobotomize-stuck-villagers.patch +++ b/patches/server/0144-Lobotomize-stuck-villagers.patch @@ -99,10 +99,10 @@ index a0f0d5e0909da5cfe87078d4722b030635cfeadd..bc14e242f97f9f6d8e581d12319c95ae long i = this.bC + 12000L; long j = this.world.getTime(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5ad9b63e50137163ec7bab48560f618f165d676f..b2e4404e05ba304423803779321321292b306255 100644 +index d6f98a1b4bcc44bad7c8e39f31ea61cd7428f071..50cacb7ab275229c0d2fdeeca4719a565977b630 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1076,6 +1076,8 @@ public class PurpurWorldConfig { +@@ -1088,6 +1088,8 @@ public class PurpurWorldConfig { public int villagerSpawnIronGolemLimit = 0; public boolean villagerCanBreed = true; public int villagerBreedingTicks = 6000; @@ -111,7 +111,7 @@ index 5ad9b63e50137163ec7bab48560f618f165d676f..b2e4404e05ba30442380377932132129 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1088,6 +1090,13 @@ public class PurpurWorldConfig { +@@ -1100,6 +1102,13 @@ public class PurpurWorldConfig { villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit); villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed); villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks); diff --git a/patches/server/0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index f15cd8eed..35dc4a1e8 100644 --- a/patches/server/0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0145-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -224,10 +224,10 @@ index 69de7588eebba7557cdaec129f19ec1fc2c675c5..dd9b678481620856fb7eaaa04c3b812c public static final VillagerProfession FISHERMAN = a("fisherman", VillagePlaceType.i, SoundEffects.ENTITY_VILLAGER_WORK_FISHERMAN); public static final VillagerProfession FLETCHER = a("fletcher", VillagePlaceType.j, SoundEffects.ENTITY_VILLAGER_WORK_FLETCHER); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b2e4404e05ba304423803779321321292b306255..6f0fa3d581fcb1897bc8e591d596a7e1388a667d 100644 +index 50cacb7ab275229c0d2fdeeca4719a565977b630..40ce04e9a3f55f42e44230c63b53efbfe08fcd74 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1078,6 +1078,8 @@ public class PurpurWorldConfig { +@@ -1090,6 +1090,8 @@ public class PurpurWorldConfig { public int villagerBreedingTicks = 6000; public boolean villagerLobotomizeEnabled = false; public int villagerLobotomizeCheck = 60; @@ -236,7 +236,7 @@ index b2e4404e05ba304423803779321321292b306255..6f0fa3d581fcb1897bc8e591d596a7e1 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1097,6 +1099,8 @@ public class PurpurWorldConfig { +@@ -1109,6 +1111,8 @@ public class PurpurWorldConfig { } villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled); villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck); diff --git a/patches/server/0146-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0146-Toggle-for-Zombified-Piglin-death-always-counting-as.patch index 17d122d3e..3f606f290 100644 --- a/patches/server/0146-Toggle-for-Zombified-Piglin-death-always-counting-as.patch +++ b/patches/server/0146-Toggle-for-Zombified-Piglin-death-always-counting-as.patch @@ -35,10 +35,10 @@ index 816a2bd7438f66a5d7ff761b8fcf8b42483561c7..8db9c62093b2f075face65030cb91c24 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6f0fa3d581fcb1897bc8e591d596a7e1388a667d..6c59bd1a0ab69b382b9482d12987828c734dbbb1 100644 +index 40ce04e9a3f55f42e44230c63b53efbfe08fcd74..8854a188a932559fca000def3ded5bd9077ab62b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1210,12 +1210,14 @@ public class PurpurWorldConfig { +@@ -1222,12 +1222,14 @@ public class PurpurWorldConfig { public boolean zombifiedPiglinJockeyOnlyBaby = true; public double zombifiedPiglinJockeyChance = 0.05D; public boolean zombifiedPiglinJockeyTryExistingChickens = true; diff --git a/patches/server/0148-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0148-Configurable-chance-for-wolves-to-spawn-rabid.patch index 7151225bf..17e99e7d6 100644 --- a/patches/server/0148-Configurable-chance-for-wolves-to-spawn-rabid.patch +++ b/patches/server/0148-Configurable-chance-for-wolves-to-spawn-rabid.patch @@ -242,10 +242,10 @@ index dd3c7ad7701ad18ccaf86d73fde7051090ed3d57..e8c6aca70db693250224d1c162e3c268 return super.b(entityhuman, enumhand); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6c59bd1a0ab69b382b9482d12987828c734dbbb1..ecedeb10196b05f0d919f744cdf2e9556eff0a8d 100644 +index 8854a188a932559fca000def3ded5bd9077ab62b..02f83d156e84fe98628d13748ce19d521d3593b6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1161,10 +1161,14 @@ public class PurpurWorldConfig { +@@ -1173,10 +1173,14 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; diff --git a/patches/server/0149-Configurable-default-wolf-collar-color.patch b/patches/server/0149-Configurable-default-wolf-collar-color.patch index 68ba28357..c12910872 100644 --- a/patches/server/0149-Configurable-default-wolf-collar-color.patch +++ b/patches/server/0149-Configurable-default-wolf-collar-color.patch @@ -24,7 +24,7 @@ index e8c6aca70db693250224d1c162e3c2684687ea41..e33aadead6e6c5e0a7b39ef95e7aeb0f @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ecedeb10196b05f0d919f744cdf2e9556eff0a8d..5c5aa1ab859c836945294cfdb06589639006a307 100644 +index 02f83d156e84fe98628d13748ce19d521d3593b6..6f1ea7f760bd3a4ab6ba0787776b4017f9e6d52e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -3,6 +3,7 @@ package net.pl3x.purpur; @@ -35,7 +35,7 @@ index ecedeb10196b05f0d919f744cdf2e9556eff0a8d..5c5aa1ab859c836945294cfdb0658963 import net.minecraft.world.level.Explosion; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -@@ -1161,12 +1162,18 @@ public class PurpurWorldConfig { +@@ -1173,12 +1174,18 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; diff --git a/patches/server/0150-Configurable-entity-base-attributes.patch b/patches/server/0150-Configurable-entity-base-attributes.patch index 724cc5b00..4d27cee80 100644 --- a/patches/server/0150-Configurable-entity-base-attributes.patch +++ b/patches/server/0150-Configurable-entity-base-attributes.patch @@ -1402,10 +1402,10 @@ index 90cbef7fe8803295f82bddd6709fdf303aedcaba..b84916c0c58fd208ef5547299f8db846 @Nullable diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3fb7d20ccc 100644 +index 6f1ea7f760bd3a4ab6ba0787776b4017f9e6d52e..894c0e86dbbd7bcbdbd7af48cd50d38d4507787f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -484,30 +484,58 @@ public class PurpurWorldConfig { +@@ -496,30 +496,58 @@ public class PurpurWorldConfig { public boolean batRidable = false; public boolean batRidableInWater = false; public double batMaxY = 256D; @@ -1464,7 +1464,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean catRidable = false; -@@ -516,6 +544,7 @@ public class PurpurWorldConfig { +@@ -528,6 +556,7 @@ public class PurpurWorldConfig { public int catSpawnSwampHutScanRange = 16; public int catSpawnVillageScanRange = 48; public int catBreedingTicks = 6000; @@ -1472,7 +1472,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f private void catSettings() { catRidable = getBoolean("mobs.cat.ridable", catRidable); catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater); -@@ -523,51 +552,92 @@ public class PurpurWorldConfig { +@@ -535,51 +564,92 @@ public class PurpurWorldConfig { catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange); catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange); catBreedingTicks = getInt("mobs.cat.breeding-delay-ticks", catBreedingTicks); @@ -1565,7 +1565,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean dolphinRidable = false; -@@ -575,19 +645,45 @@ public class PurpurWorldConfig { +@@ -587,19 +657,45 @@ public class PurpurWorldConfig { public float dolphinSpitSpeed = 1.0F; public float dolphinSpitDamage = 2.0F; public boolean dolphinDisableTreasureSearching = false; @@ -1611,7 +1611,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean drownedRidable = false; -@@ -595,73 +691,135 @@ public class PurpurWorldConfig { +@@ -607,73 +703,135 @@ public class PurpurWorldConfig { public boolean drownedJockeyOnlyBaby = true; public double drownedJockeyChance = 0.05D; public boolean drownedJockeyTryExistingChickens = true; @@ -1747,7 +1747,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean giantRidable = false; -@@ -684,31 +842,68 @@ public class PurpurWorldConfig { +@@ -696,31 +854,68 @@ public class PurpurWorldConfig { giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI); if (PurpurConfig.version < 8) { double oldValue = getDouble("mobs.giant.max-health", giantMaxHealth); @@ -1818,7 +1818,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean huskRidable = false; -@@ -716,12 +911,21 @@ public class PurpurWorldConfig { +@@ -728,12 +923,21 @@ public class PurpurWorldConfig { public boolean huskJockeyOnlyBaby = true; public double huskJockeyChance = 0.05D; public boolean huskJockeyTryExistingChickens = true; @@ -1840,7 +1840,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean illusionerRidable = false; -@@ -736,85 +940,188 @@ public class PurpurWorldConfig { +@@ -748,85 +952,188 @@ public class PurpurWorldConfig { illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange); if (PurpurConfig.version < 8) { double oldValue = getDouble("mobs.illusioner.max-health", illusionerMaxHealth); @@ -2031,7 +2031,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean phantomRidable = false; -@@ -841,6 +1148,7 @@ public class PurpurWorldConfig { +@@ -853,6 +1160,7 @@ public class PurpurWorldConfig { public boolean phantomIgnorePlayersWithTorch = false; public boolean phantomBurnInDaylight = true; public boolean phantomAllowGriefing = false; @@ -2039,7 +2039,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f private void phantomSettings() { phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable); phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater); -@@ -866,38 +1174,72 @@ public class PurpurWorldConfig { +@@ -878,38 +1186,72 @@ public class PurpurWorldConfig { phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight); phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch); phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing); @@ -2112,7 +2112,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean polarBearRidable = false; -@@ -905,6 +1247,7 @@ public class PurpurWorldConfig { +@@ -917,6 +1259,7 @@ public class PurpurWorldConfig { public String polarBearBreedableItemString = ""; public Item polarBearBreedableItem = null; public int polarBearBreedingTicks = 6000; @@ -2120,7 +2120,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f private void polarBearSettings() { polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable); polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater); -@@ -912,11 +1255,24 @@ public class PurpurWorldConfig { +@@ -924,11 +1267,24 @@ public class PurpurWorldConfig { Item item = IRegistry.ITEM.get(new MinecraftKey(polarBearBreedableItemString)); if (item != Items.AIR) polarBearBreedableItem = item; polarBearBreedingTicks = getInt("mobs.polar_bear.breeding-delay-ticks", polarBearBreedingTicks); @@ -2145,7 +2145,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean rabbitRidable = false; -@@ -924,68 +1280,142 @@ public class PurpurWorldConfig { +@@ -936,68 +1292,142 @@ public class PurpurWorldConfig { public double rabbitNaturalToast = 0.0D; public double rabbitNaturalKiller = 0.0D; public int rabbitBreedingTicks = 6000; @@ -2288,7 +2288,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean snowGolemRidable = false; -@@ -997,6 +1427,7 @@ public class PurpurWorldConfig { +@@ -1009,6 +1439,7 @@ public class PurpurWorldConfig { public int snowGolemSnowBallMax = 20; public float snowGolemSnowBallModifier = 10.0F; public double snowGolemAttackDistance = 1.25D; @@ -2296,7 +2296,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f private void snowGolemSettings() { snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable); snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater); -@@ -1007,63 +1438,118 @@ public class PurpurWorldConfig { +@@ -1019,63 +1450,118 @@ public class PurpurWorldConfig { snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax); snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier); snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance); @@ -2415,7 +2415,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean villagerRidable = false; -@@ -1081,6 +1567,7 @@ public class PurpurWorldConfig { +@@ -1093,6 +1579,7 @@ public class PurpurWorldConfig { public int villagerLobotomizeCheck = 60; public boolean villagerClericsFarmWarts = false; public boolean villagerClericFarmersThrowWarts = true; @@ -2423,7 +2423,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1102,33 +1589,60 @@ public class PurpurWorldConfig { +@@ -1114,33 +1601,60 @@ public class PurpurWorldConfig { villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck); villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts); villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts); @@ -2484,7 +2484,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean witherRidable = false; -@@ -1145,19 +1659,30 @@ public class PurpurWorldConfig { +@@ -1157,19 +1671,30 @@ public class PurpurWorldConfig { witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay); if (PurpurConfig.version < 8) { double oldValue = getDouble("mobs.wither.max-health", witherMaxHealth); @@ -2517,7 +2517,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean wolfRidable = false; -@@ -1166,6 +1691,7 @@ public class PurpurWorldConfig { +@@ -1178,6 +1703,7 @@ public class PurpurWorldConfig { public boolean wolfMilkCuresRabies = true; public double wolfNaturalRabid = 0.0D; public int wolfBreedingTicks = 6000; @@ -2525,7 +2525,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater); -@@ -1177,13 +1703,26 @@ public class PurpurWorldConfig { +@@ -1189,13 +1715,26 @@ public class PurpurWorldConfig { wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies); wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid); wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks); @@ -2552,7 +2552,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean zombieRidable = false; -@@ -1193,6 +1732,8 @@ public class PurpurWorldConfig { +@@ -1205,6 +1744,8 @@ public class PurpurWorldConfig { public boolean zombieJockeyTryExistingChickens = true; public boolean zombieAggressiveTowardsVillagerWhenLagging = true; public EnumDifficulty zombieBreakDoorMinDifficulty = EnumDifficulty.HARD; @@ -2561,7 +2561,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1205,15 +1746,40 @@ public class PurpurWorldConfig { +@@ -1217,15 +1758,40 @@ public class PurpurWorldConfig { } catch (IllegalArgumentException ignore) { zombieBreakDoorMinDifficulty = EnumDifficulty.HARD; } @@ -2602,7 +2602,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean zombifiedPiglinRidable = false; -@@ -1222,6 +1788,8 @@ public class PurpurWorldConfig { +@@ -1234,6 +1800,8 @@ public class PurpurWorldConfig { public double zombifiedPiglinJockeyChance = 0.05D; public boolean zombifiedPiglinJockeyTryExistingChickens = true; public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true; @@ -2611,7 +2611,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -1229,6 +1797,13 @@ public class PurpurWorldConfig { +@@ -1241,6 +1809,13 @@ public class PurpurWorldConfig { zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance); zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens); zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry); @@ -2625,7 +2625,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f } public boolean zombieVillagerRidable = false; -@@ -1236,11 +1811,20 @@ public class PurpurWorldConfig { +@@ -1248,11 +1823,20 @@ public class PurpurWorldConfig { public boolean zombieVillagerJockeyOnlyBaby = true; public double zombieVillagerJockeyChance = 0.05D; public boolean zombieVillagerJockeyTryExistingChickens = true; diff --git a/patches/server/0151-Phantom-flames-on-swoop.patch b/patches/server/0151-Phantom-flames-on-swoop.patch index 387f77acb..b8aaadf14 100644 --- a/patches/server/0151-Phantom-flames-on-swoop.patch +++ b/patches/server/0151-Phantom-flames-on-swoop.patch @@ -17,10 +17,10 @@ index 902b26d609aef8dd46e8875cb7c06f187511e8d5..4f3d4f2596c69881f0653bddcc3bf2b9 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d0473f64fbb743f12eb7c98a59231b3fb7d20ccc..b22344e942a212a204dd0935d3c6d55a37c23477 100644 +index 894c0e86dbbd7bcbdbd7af48cd50d38d4507787f..572fcffa3c09cb55abe3799575a1e2cbfbeda186 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1148,6 +1148,7 @@ public class PurpurWorldConfig { +@@ -1160,6 +1160,7 @@ public class PurpurWorldConfig { public boolean phantomIgnorePlayersWithTorch = false; public boolean phantomBurnInDaylight = true; public boolean phantomAllowGriefing = false; @@ -28,7 +28,7 @@ index d0473f64fbb743f12eb7c98a59231b3fb7d20ccc..b22344e942a212a204dd0935d3c6d55a public double phantomMaxHealth = 20.0D; private void phantomSettings() { phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable); -@@ -1174,6 +1175,7 @@ public class PurpurWorldConfig { +@@ -1186,6 +1187,7 @@ public class PurpurWorldConfig { phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight); phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch); phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing); diff --git a/patches/server/0152-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0152-Option-for-chests-to-open-even-with-a-solid-block-on.patch index cd1d4b935..c13461d28 100644 --- a/patches/server/0152-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0152-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -17,10 +17,10 @@ index a45ee959f41e7f349ff2c309f21fa44ec671cb87..cddf8e3d34385eb264cd28ba6b4392d6 return iblockaccess.getType(blockposition1).isOccluding(iblockaccess, blockposition1); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b22344e942a212a204dd0935d3c6d55a37c23477..06af8583af105765e758ca4f6c81babbfe199e25 100644 +index 572fcffa3c09cb55abe3799575a1e2cbfbeda186..53fbe648404aa1681c1fe9116247d267ca461b28 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -381,6 +381,11 @@ public class PurpurWorldConfig { +@@ -393,6 +393,11 @@ public class PurpurWorldConfig { } } diff --git a/patches/server/0154-Striders-give-saddle-back.patch b/patches/server/0154-Striders-give-saddle-back.patch index 472526e60..a101d8381 100644 --- a/patches/server/0154-Striders-give-saddle-back.patch +++ b/patches/server/0154-Striders-give-saddle-back.patch @@ -28,10 +28,10 @@ index 892aa844a98ae0d192737c6fc6df0a219256a47b..5e4cc99a746d98231bbb71672fbc0243 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 06af8583af105765e758ca4f6c81babbfe199e25..6afdcad6b6ab47f77dba3dcc97c2b6580b774e1c 100644 +index 53fbe648404aa1681c1fe9116247d267ca461b28..7f9720b4d3239dcbd2bba4d8fb61680600647f25 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1502,11 +1502,13 @@ public class PurpurWorldConfig { +@@ -1514,11 +1514,13 @@ public class PurpurWorldConfig { public boolean striderRidable = false; public boolean striderRidableInWater = false; public int striderBreedingTicks = 6000; diff --git a/patches/server/0156-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0156-Full-netherite-armor-grants-fire-resistance.patch index 3ade642f1..6abfb46ba 100644 --- a/patches/server/0156-Full-netherite-armor-grants-fire-resistance.patch +++ b/patches/server/0156-Full-netherite-armor-grants-fire-resistance.patch @@ -26,7 +26,7 @@ index 907bfe42bd866188639f7d25150fcde039c1e5f7..b63019f40b28a2e543528a7919bbc08a protected ItemCooldown i() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6afdcad6b6ab47f77dba3dcc97c2b6580b774e1c..73213bf975ffe38ff6ee9b05c5a48b232f767727 100644 +index 7f9720b4d3239dcbd2bba4d8fb61680600647f25..ea9b5be83f65eee0651c0ca5afd514b41944bb85 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -310,6 +310,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0159-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0159-Add-mobGriefing-bypass-to-everything-affected.patch index 18babc0fd..89fb47570 100644 --- a/patches/server/0159-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0159-Add-mobGriefing-bypass-to-everything-affected.patch @@ -338,7 +338,7 @@ index 04504901b1933ed760b34b8abb994de8ec340a4e..e18be05c9a9230105ec54395d4391c86 return true; // Purpur end diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa55617797970 100644 +index ea9b5be83f65eee0651c0ca5afd514b41944bb85..7c9c425b6917f3fbcdecdff718421ec77acdd23e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -252,6 +252,7 @@ public class PurpurWorldConfig { @@ -357,7 +357,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen); persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames); persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames); -@@ -406,9 +408,11 @@ public class PurpurWorldConfig { +@@ -418,9 +420,11 @@ public class PurpurWorldConfig { dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils); } @@ -369,7 +369,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow); farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha); } -@@ -467,10 +471,12 @@ public class PurpurWorldConfig { +@@ -479,10 +483,12 @@ public class PurpurWorldConfig { stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage); } @@ -382,7 +382,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs); turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems); turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts); -@@ -742,12 +748,14 @@ public class PurpurWorldConfig { +@@ -754,12 +760,14 @@ public class PurpurWorldConfig { public boolean enderDragonRidableInWater = false; public double enderDragonMaxY = 256D; public boolean enderDragonAlwaysDropsFullExp = false; @@ -397,7 +397,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 if (PurpurConfig.version < 8) { double oldValue = getDouble("mobs.ender_dragon.max-health", enderDragonMaxHealth); set("mobs.ender_dragon.max-health", null); -@@ -763,12 +771,14 @@ public class PurpurWorldConfig { +@@ -775,12 +783,14 @@ public class PurpurWorldConfig { public boolean endermanRidable = false; public boolean endermanRidableInWater = false; public boolean endermanAllowGriefing = true; @@ -412,7 +412,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock); if (PurpurConfig.version < 10) { double oldValue = getDouble("mobs.enderman.attributes.max-health", endermanMaxHealth); -@@ -794,10 +804,12 @@ public class PurpurWorldConfig { +@@ -806,10 +816,12 @@ public class PurpurWorldConfig { public boolean evokerRidable = false; public boolean evokerRidableInWater = false; @@ -425,7 +425,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 if (PurpurConfig.version < 10) { double oldValue = getDouble("mobs.evoker.attributes.max-health", evokerMaxHealth); set("mobs.evoker.attributes.max-health", null); -@@ -808,12 +820,14 @@ public class PurpurWorldConfig { +@@ -820,12 +832,14 @@ public class PurpurWorldConfig { public boolean foxRidable = false; public boolean foxRidableInWater = false; @@ -440,7 +440,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips); foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks); if (PurpurConfig.version < 10) { -@@ -1250,10 +1264,12 @@ public class PurpurWorldConfig { +@@ -1262,10 +1276,12 @@ public class PurpurWorldConfig { public boolean pillagerRidable = false; public boolean pillagerRidableInWater = false; @@ -453,7 +453,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 if (PurpurConfig.version < 10) { double oldValue = getDouble("mobs.pillager.attributes.max-health", pillagerMaxHealth); set("mobs.pillager.attributes.max-health", null); -@@ -1297,6 +1313,7 @@ public class PurpurWorldConfig { +@@ -1309,6 +1325,7 @@ public class PurpurWorldConfig { public boolean rabbitRidable = false; public boolean rabbitRidableInWater = false; @@ -461,7 +461,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 public double rabbitNaturalToast = 0.0D; public double rabbitNaturalKiller = 0.0D; public int rabbitBreedingTicks = 6000; -@@ -1304,6 +1321,7 @@ public class PurpurWorldConfig { +@@ -1316,6 +1333,7 @@ public class PurpurWorldConfig { private void rabbitSettings() { rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable); rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater); @@ -469,7 +469,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast); rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller); rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks); -@@ -1317,10 +1335,12 @@ public class PurpurWorldConfig { +@@ -1329,10 +1347,12 @@ public class PurpurWorldConfig { public boolean ravagerRidable = false; public boolean ravagerRidableInWater = false; @@ -482,7 +482,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 if (PurpurConfig.version < 10) { double oldValue = getDouble("mobs.ravager.attributes.max-health", ravagerMaxHealth); set("mobs.ravager.attributes.max-health", null); -@@ -1344,11 +1364,13 @@ public class PurpurWorldConfig { +@@ -1356,11 +1376,13 @@ public class PurpurWorldConfig { public boolean sheepRidable = false; public boolean sheepRidableInWater = false; public int sheepBreedingTicks = 6000; @@ -496,7 +496,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 if (PurpurConfig.version < 10) { double oldValue = getDouble("mobs.sheep.attributes.max-health", sheepMaxHealth); set("mobs.sheep.attributes.max-health", null); -@@ -1373,10 +1395,12 @@ public class PurpurWorldConfig { +@@ -1385,10 +1407,12 @@ public class PurpurWorldConfig { public boolean silverfishRidable = false; public boolean silverfishRidableInWater = false; @@ -509,7 +509,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 if (PurpurConfig.version < 10) { double oldValue = getDouble("mobs.silverfish.attributes.max-health", silverfishMaxHealth); set("mobs.silverfish.attributes.max-health", null); -@@ -1441,6 +1465,7 @@ public class PurpurWorldConfig { +@@ -1453,6 +1477,7 @@ public class PurpurWorldConfig { public boolean snowGolemRidable = false; public boolean snowGolemRidableInWater = false; public boolean snowGolemLeaveTrailWhenRidden = false; @@ -517,7 +517,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 public boolean snowGolemDropsPumpkin = true; public boolean snowGolemPutPumpkinBack = false; public int snowGolemSnowBallMin = 20; -@@ -1452,6 +1477,7 @@ public class PurpurWorldConfig { +@@ -1464,6 +1489,7 @@ public class PurpurWorldConfig { snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable); snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater); snowGolemLeaveTrailWhenRidden = getBoolean("mobs.snow_golem.leave-trail-when-ridden", snowGolemLeaveTrailWhenRidden); @@ -525,7 +525,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin); snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack); snowGolemSnowBallMin = getInt("mobs.snow_golem.min-shoot-interval-ticks", snowGolemSnowBallMin); -@@ -1670,6 +1696,7 @@ public class PurpurWorldConfig { +@@ -1682,6 +1708,7 @@ public class PurpurWorldConfig { public boolean witherRidable = false; public boolean witherRidableInWater = false; public double witherMaxY = 256D; @@ -533,7 +533,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 public float witherHealthRegenAmount = 1.0f; public int witherHealthRegenDelay = 20; public double witherMaxHealth = 300.0D; -@@ -1677,6 +1704,7 @@ public class PurpurWorldConfig { +@@ -1689,6 +1716,7 @@ public class PurpurWorldConfig { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); witherMaxY = getDouble("mobs.wither.ridable-max-y", witherMaxY); @@ -541,7 +541,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount); witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay); if (PurpurConfig.version < 8) { -@@ -1749,6 +1777,7 @@ public class PurpurWorldConfig { +@@ -1761,6 +1789,7 @@ public class PurpurWorldConfig { public boolean zombieRidable = false; public boolean zombieRidableInWater = false; @@ -549,7 +549,7 @@ index 73213bf975ffe38ff6ee9b05c5a48b232f767727..9fae36ee7c25a0cf3a7677223a7aa556 public boolean zombieJockeyOnlyBaby = true; public double zombieJockeyChance = 0.05D; public boolean zombieJockeyTryExistingChickens = true; -@@ -1759,6 +1788,7 @@ public class PurpurWorldConfig { +@@ -1771,6 +1800,7 @@ public class PurpurWorldConfig { private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); diff --git a/patches/server/0160-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0160-Config-to-allow-Note-Block-sounds-when-blocked.patch index a2a7a8d48..f64f7ddaf 100644 --- a/patches/server/0160-Config-to-allow-Note-Block-sounds-when-blocked.patch +++ b/patches/server/0160-Config-to-allow-Note-Block-sounds-when-blocked.patch @@ -22,7 +22,7 @@ index feec1db88b22a4d13ffd3034633da79ed41b94fe..4882046f46c33a8d828d13325af17237 org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.get(BlockNote.INSTRUMENT), data.get(BlockNote.NOTE)); if (!event.isCancelled()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9fae36ee7c25a0cf3a7677223a7aa55617797970..c992521116d7aadebd43d2793d5ea1875841d51d 100644 +index 7c9c425b6917f3fbcdecdff718421ec77acdd23e..08cc40919630e942578507bbd11b73666c68c3ef 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -254,6 +254,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0161-Add-EntityTeleportHinderedEvent.patch b/patches/server/0161-Add-EntityTeleportHinderedEvent.patch index d584bbf3c..bcc422b54 100644 --- a/patches/server/0161-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0161-Add-EntityTeleportHinderedEvent.patch @@ -82,7 +82,7 @@ index d918194e45953764fa3fd286b715714330a60941..70496562faa89e92da34a4f7b891f845 if (this.exitPortal == null && this.world.getTypeKey() == DimensionManager.THE_END) { // CraftBukkit - work in alternate worlds this.a((WorldServer) this.world); diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java -index 8d21f9451c60873d1524ad64876094e6e21509e4..5e8b3791ebec2f745af2527dc52c792f30f63106 100644 +index 936933ab4c9e78877e1a2fc250721c2158e3810c..c47c98480572e83b1385fcd62940d4c69a79f9dc 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBase.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBase.java @@ -302,6 +302,7 @@ public abstract class BlockBase { @@ -94,10 +94,10 @@ index 8d21f9451c60873d1524ad64876094e6e21509e4..5e8b3791ebec2f745af2527dc52c792f public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) {} diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c992521116d7aadebd43d2793d5ea1875841d51d..61bc3507a9f473e9dc1c948299e3bf11a02b632b 100644 +index 08cc40919630e942578507bbd11b73666c68c3ef..559f79dd4280ed513c4a2aa320d2a80342a4cd9f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1881,4 +1881,9 @@ public class PurpurWorldConfig { +@@ -1893,4 +1893,9 @@ public class PurpurWorldConfig { zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth); zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements); } diff --git a/patches/server/0163-Farmland-trampling-changes.patch b/patches/server/0163-Farmland-trampling-changes.patch index cc80f9a58..1f811f2bc 100644 --- a/patches/server/0163-Farmland-trampling-changes.patch +++ b/patches/server/0163-Farmland-trampling-changes.patch @@ -54,10 +54,10 @@ index d3fd0b418b9088b621e44f5da452db74b433efe8..e7e5ee52cb7ac7e406c837db686d0a96 if (CraftEventFactory.callEntityChangeBlockEvent(entity, blockposition, Blocks.DIRT.getBlockData()).isCancelled()) { return; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 61bc3507a9f473e9dc1c948299e3bf11a02b632b..498abbe8e9324d215b4ac409e1af10a4db5f02d5 100644 +index 559f79dd4280ed513c4a2aa320d2a80342a4cd9f..61a8525667951ec777134dc0b38f079ace407c6f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -413,10 +413,16 @@ public class PurpurWorldConfig { +@@ -425,10 +425,16 @@ public class PurpurWorldConfig { public boolean farmlandBypassMobGriefing = false; public boolean farmlandGetsMoistFromBelow = false; public boolean farmlandAlpha = false; diff --git a/patches/server/0164-Movement-options-for-armor-stands.patch b/patches/server/0164-Movement-options-for-armor-stands.patch index 4425d656d..beb86df72 100644 --- a/patches/server/0164-Movement-options-for-armor-stands.patch +++ b/patches/server/0164-Movement-options-for-armor-stands.patch @@ -74,7 +74,7 @@ index 43dc0925887e2e9e86445cccff57be7994ca0d58..ecb797e67554d30e35b3aca4d0fc9b0e + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 498abbe8e9324d215b4ac409e1af10a4db5f02d5..01304a630d22a7de1a6d8beb8d9753a36a31fc42 100644 +index 61a8525667951ec777134dc0b38f079ace407c6f..28648fc6cfd5592071d3f0674e6e72bcadb0b7f1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -111,10 +111,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0165-Fix-stuck-in-portals.patch b/patches/server/0165-Fix-stuck-in-portals.patch index 4c0a1f775..aec3ff082 100644 --- a/patches/server/0165-Fix-stuck-in-portals.patch +++ b/patches/server/0165-Fix-stuck-in-portals.patch @@ -37,10 +37,10 @@ index ee1f0ccce5c5c920b2595ced9e72fd1544e2459a..fcbbf100990faf60250357b744cbd587 this.inPortal = true; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 01304a630d22a7de1a6d8beb8d9753a36a31fc42..82b4ece3c12d8180b7ab275c3f240e94578177fc 100644 +index 28648fc6cfd5592071d3f0674e6e72bcadb0b7f1..f75838c6b1f5788b2e18a6f7af5bee8023fd37e7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -350,6 +350,11 @@ public class PurpurWorldConfig { +@@ -362,6 +362,11 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0167-Config-to-use-infinity-bows-without-arrows.patch b/patches/server/0167-Config-to-use-infinity-bows-without-arrows.patch index f177ccb8a..5a20f0acb 100644 --- a/patches/server/0167-Config-to-use-infinity-bows-without-arrows.patch +++ b/patches/server/0167-Config-to-use-infinity-bows-without-arrows.patch @@ -20,7 +20,7 @@ index c7e20b25b4d09463fa54c66e62208e90515013e2..59b803ec4552058f2dda269e9435daf6 } else { entityhuman.c(enumhand); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 82b4ece3c12d8180b7ab275c3f240e94578177fc..7ba0c16271fccf7609680b1409a93e2653aa0af2 100644 +index f75838c6b1f5788b2e18a6f7af5bee8023fd37e7..a103dbcf9c91204b1993cc3d33fc726f2a9083fb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -209,10 +209,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0168-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0168-Toggle-for-water-sensitive-mob-damage.patch index 537c2ee29..8685f8a1c 100644 --- a/patches/server/0168-Toggle-for-water-sensitive-mob-damage.patch +++ b/patches/server/0168-Toggle-for-water-sensitive-mob-damage.patch @@ -83,10 +83,10 @@ index 5e4cc99a746d98231bbb71672fbc02431e4fab48..f52ae7446c16d5b8ac51bd2e12bb51d2 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd9960f2c59b 100644 +index a103dbcf9c91204b1993cc3d33fc726f2a9083fb..d28a19721a700f8fe706c90eab8452871dfd4788 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -571,6 +571,7 @@ public class PurpurWorldConfig { +@@ -583,6 +583,7 @@ public class PurpurWorldConfig { public boolean blazeRidableInWater = false; public double blazeMaxY = 256D; public double blazeMaxHealth = 20.0D; @@ -94,7 +94,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99 private void blazeSettings() { blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable); blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater); -@@ -581,6 +582,7 @@ public class PurpurWorldConfig { +@@ -593,6 +594,7 @@ public class PurpurWorldConfig { set("mobs.blaze.attributes.max_health", oldValue); } blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth); @@ -102,7 +102,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99 } public boolean catRidable = false; -@@ -795,6 +797,7 @@ public class PurpurWorldConfig { +@@ -807,6 +809,7 @@ public class PurpurWorldConfig { public boolean endermanBypassMobGriefing = false; public boolean endermanDespawnEvenWithBlock = false; public double endermanMaxHealth = 40.0D; @@ -110,7 +110,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99 private void endermanSettings() { endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable); endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater); -@@ -807,6 +810,7 @@ public class PurpurWorldConfig { +@@ -819,6 +822,7 @@ public class PurpurWorldConfig { set("mobs.enderman.attributes.max_health", oldValue); } endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth); @@ -118,7 +118,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99 } public boolean endermiteRidable = false; -@@ -1494,6 +1498,7 @@ public class PurpurWorldConfig { +@@ -1506,6 +1510,7 @@ public class PurpurWorldConfig { public float snowGolemSnowBallModifier = 10.0F; public double snowGolemAttackDistance = 1.25D; public double snowGolemMaxHealth = 4.0D; @@ -126,7 +126,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99 private void snowGolemSettings() { snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable); snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater); -@@ -1511,6 +1516,7 @@ public class PurpurWorldConfig { +@@ -1523,6 +1528,7 @@ public class PurpurWorldConfig { set("mobs.snow_golem.attributes.max_health", oldValue); } snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth); @@ -134,7 +134,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99 } public boolean squidRidable = false; -@@ -1564,6 +1570,7 @@ public class PurpurWorldConfig { +@@ -1576,6 +1582,7 @@ public class PurpurWorldConfig { public int striderBreedingTicks = 6000; public boolean striderGiveSaddleBack = false; public double striderMaxHealth = 20.0D; @@ -142,7 +142,7 @@ index 7ba0c16271fccf7609680b1409a93e2653aa0af2..3c0a9b8e71663ad60cf78d4f66f4fd99 private void striderSettings() { striderRidable = getBoolean("mobs.strider.ridable", striderRidable); striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater); -@@ -1575,6 +1582,7 @@ public class PurpurWorldConfig { +@@ -1587,6 +1594,7 @@ public class PurpurWorldConfig { set("mobs.strider.attributes.max_health", oldValue); } striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth); diff --git a/patches/server/0169-Config-to-always-tame-in-Creative.patch b/patches/server/0169-Config-to-always-tame-in-Creative.patch index f82bbcb26..d714aca4e 100644 --- a/patches/server/0169-Config-to-always-tame-in-Creative.patch +++ b/patches/server/0169-Config-to-always-tame-in-Creative.patch @@ -59,7 +59,7 @@ index 090903fbc8f6cd1522c7afb358f708f5ae3395f4..884a3f03c73efb8fb0863976615fba5e this.navigation.o(); this.setGoalTarget((EntityLiving) null); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3c0a9b8e71663ad60cf78d4f66f4fd9960f2c59b..b49a909bf1dcf0bebce3eec03b54d05583af2e43 100644 +index d28a19721a700f8fe706c90eab8452871dfd4788..c9ef027ed3785de20155e27c6e8cc8e3f7112ce0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -255,6 +255,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0170-End-crystal-explosion-options.patch b/patches/server/0170-End-crystal-explosion-options.patch index c54bbc6c2..df1f191b4 100644 --- a/patches/server/0170-End-crystal-explosion-options.patch +++ b/patches/server/0170-End-crystal-explosion-options.patch @@ -52,10 +52,10 @@ index 2c983e6a092464d1867fcbe875b2e1461ec8556b..a92c900a6092c07b34711428fac268f4 this.a(damagesource); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b49a909bf1dcf0bebce3eec03b54d05583af2e43..16eac6648c7bb17fb10f5741857ac5e8283aed50 100644 +index c9ef027ed3785de20155e27c6e8cc8e3f7112ce0..593dfa8fdfbceb74bcc78072ac5c6e7df8ded242 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1915,4 +1915,33 @@ public class PurpurWorldConfig { +@@ -1927,4 +1927,33 @@ public class PurpurWorldConfig { private void imposeTeleportRestrictionsOnGateways() { imposeTeleportRestrictionsOnGateways = getBoolean("gameplay-mechanics.impose-teleport-restrictions-on-gateways", imposeTeleportRestrictionsOnGateways); } diff --git a/patches/server/0172-Add-ghast-allow-griefing-option.patch b/patches/server/0172-Add-ghast-allow-griefing-option.patch index 46ee8b506..08459e4b2 100644 --- a/patches/server/0172-Add-ghast-allow-griefing-option.patch +++ b/patches/server/0172-Add-ghast-allow-griefing-option.patch @@ -38,10 +38,10 @@ index 61f06eacb4ea4ef869b60c9014cc23b25583eead..627915ee205fdcc93c5424ad7d7ea057 // CraftBukkit start - fire ExplosionPrimeEvent ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity()); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 16eac6648c7bb17fb10f5741857ac5e8283aed50..ba4377422abe55a6ce98551eb9f8633589f37f4c 100644 +index 593dfa8fdfbceb74bcc78072ac5c6e7df8ded242..fcf3f156ac8a2ec9078a00c326105888a8412df9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -868,6 +868,7 @@ public class PurpurWorldConfig { +@@ -880,6 +880,7 @@ public class PurpurWorldConfig { public boolean ghastRidable = false; public boolean ghastRidableInWater = false; public double ghastMaxY = 256D; @@ -49,7 +49,7 @@ index 16eac6648c7bb17fb10f5741857ac5e8283aed50..ba4377422abe55a6ce98551eb9f86335 public double ghastMaxHealth = 10.0D; private void ghastSettings() { ghastRidable = getBoolean("mobs.ghast.ridable", ghastRidable); -@@ -878,6 +879,7 @@ public class PurpurWorldConfig { +@@ -890,6 +891,7 @@ public class PurpurWorldConfig { set("mobs.ghast.attributes.max-health", null); set("mobs.ghast.attributes.max_health", oldValue); } diff --git a/patches/server/0173-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0173-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch index afe2118d8..a0642d0fd 100644 --- a/patches/server/0173-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch +++ b/patches/server/0173-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch @@ -42,10 +42,10 @@ index fa6b72c7a12b20f8ccffa360a3895e4d8f4277e4..4a3e0f7f59ca4fd64be62a580d08b6ab } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ba4377422abe55a6ce98551eb9f8633589f37f4c..d4f7d0550b499018896964e2528f2481e2245dc6 100644 +index fcf3f156ac8a2ec9078a00c326105888a8412df9..292ae9b4196654b2aff9e959a9c39da5f4076b86 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -775,6 +775,7 @@ public class PurpurWorldConfig { +@@ -787,6 +787,7 @@ public class PurpurWorldConfig { public boolean enderDragonAlwaysDropsFullExp = false; public boolean enderDragonBypassMobGriefing = false; public double enderDragonMaxHealth = 200.0D; @@ -53,7 +53,7 @@ index ba4377422abe55a6ce98551eb9f8633589f37f4c..d4f7d0550b499018896964e2528f2481 private void enderDragonSettings() { enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable); enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater); -@@ -791,6 +792,7 @@ public class PurpurWorldConfig { +@@ -803,6 +804,7 @@ public class PurpurWorldConfig { set("mobs.ender_dragon.attributes.max_health", oldValue); } enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth); @@ -61,7 +61,7 @@ index ba4377422abe55a6ce98551eb9f8633589f37f4c..d4f7d0550b499018896964e2528f2481 } public boolean endermanRidable = false; -@@ -1733,6 +1735,7 @@ public class PurpurWorldConfig { +@@ -1745,6 +1747,7 @@ public class PurpurWorldConfig { public float witherHealthRegenAmount = 1.0f; public int witherHealthRegenDelay = 20; public double witherMaxHealth = 300.0D; @@ -69,7 +69,7 @@ index ba4377422abe55a6ce98551eb9f8633589f37f4c..d4f7d0550b499018896964e2528f2481 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -1750,6 +1753,7 @@ public class PurpurWorldConfig { +@@ -1762,6 +1765,7 @@ public class PurpurWorldConfig { set("mobs.wither.attributes.max_health", oldValue); } witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth); diff --git a/patches/server/0174-Dont-run-with-scissors.patch b/patches/server/0174-Dont-run-with-scissors.patch index 615908136..fb39565bd 100644 --- a/patches/server/0174-Dont-run-with-scissors.patch +++ b/patches/server/0174-Dont-run-with-scissors.patch @@ -22,7 +22,7 @@ index c7c26cd1b99c911efd12e325e0ca09d9ac98c6f4..bdcc8ced52a858d2dd0bbfaab5a21197 this.o = this.player.locX(); this.p = this.player.locY(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d4f7d0550b499018896964e2528f2481e2245dc6..7f5383518d45134bc2e3e39de310f8fa4ecf2451 100644 +index 292ae9b4196654b2aff9e959a9c39da5f4076b86..4beb7c5f2f2782d032348f491c04fda050f97bae 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -168,6 +168,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0175-One-Punch-Man.patch b/patches/server/0175-One-Punch-Man.patch index 3d3e89b44..e1ce4d997 100644 --- a/patches/server/0175-One-Punch-Man.patch +++ b/patches/server/0175-One-Punch-Man.patch @@ -45,7 +45,7 @@ index 132972755ac74838f3386e0fac5033380b71fce5..26fff0540e3d8863e83b0a60df220542 Object object; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7f5383518d45134bc2e3e39de310f8fa4ecf2451..ef75a80793a5a36177dd99879d19a91a52077e95 100644 +index 4beb7c5f2f2782d032348f491c04fda050f97bae..7adae0150198a35f3e7cec8916b38a998e2bd43e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -274,6 +274,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0176-Add-config-for-snow-on-blue-ice.patch b/patches/server/0176-Add-config-for-snow-on-blue-ice.patch index 170e76528..69fa9b57a 100644 --- a/patches/server/0176-Add-config-for-snow-on-blue-ice.patch +++ b/patches/server/0176-Add-config-for-snow-on-blue-ice.patch @@ -29,10 +29,10 @@ index d44b88185ce58346007c6ef70b76f8e0df23e95c..4b7497acc5b26da48375625b4a31fb05 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ef75a80793a5a36177dd99879d19a91a52077e95..d4fbbfbbf96c7cb843d7867289a51febef36218f 100644 +index 7adae0150198a35f3e7cec8916b38a998e2bd43e..e4b1019b89febf04e544208ccabc43798ccd44ef 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -419,6 +419,11 @@ public class PurpurWorldConfig { +@@ -431,6 +431,11 @@ public class PurpurWorldConfig { } } diff --git a/patches/server/0177-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0177-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch index 53f416495..dc8c8f151 100644 --- a/patches/server/0177-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch +++ b/patches/server/0177-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch @@ -43,7 +43,7 @@ index 9896d77381e7fadf1ef2619210713e190c1445d0..61512c6755f29cb2c228ae3e80b1e083 // Paper end if (entityhuman instanceof net.minecraft.server.level.EntityPlayer) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d4fbbfbbf96c7cb843d7867289a51febef36218f..14c7a7054744080c5ebe820d10d37fa2c0b33cde 100644 +index e4b1019b89febf04e544208ccabc43798ccd44ef..db4f818982d7f920b1083c25f1272f88a719302f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -170,6 +170,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0178-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0178-Config-to-ignore-nearby-mobs-when-sleeping.patch index 37dfc72d4..334ec5b3a 100644 --- a/patches/server/0178-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0178-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -18,7 +18,7 @@ index ccee67df065dcdee5e0e24ab12476572ca696687..b4dbc59faff3fd6ceb74d829762eb68e } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 14c7a7054744080c5ebe820d10d37fa2c0b33cde..aa1fd10c975a4948233139ab29757d42791bda1d 100644 +index db4f818982d7f920b1083c25f1272f88a719302f..dc6eb1a7bda92d28fafa722b4a1ccb4cf0319fd2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -283,6 +283,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0179-Config-for-Enderman-to-aggro-spawned-Endermites.patch b/patches/server/0179-Config-for-Enderman-to-aggro-spawned-Endermites.patch index 931cb68e3..44765d844 100644 --- a/patches/server/0179-Config-for-Enderman-to-aggro-spawned-Endermites.patch +++ b/patches/server/0179-Config-for-Enderman-to-aggro-spawned-Endermites.patch @@ -19,10 +19,10 @@ index d290787f74579dd4c138eb827e44544814bfe315..46143a710e057378ebe0ad644de27560 private int br = Integer.MIN_VALUE; private int bs; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index aa1fd10c975a4948233139ab29757d42791bda1d..208668cf92b9e881ae300be6de8c8ae7677812ea 100644 +index dc6eb1a7bda92d28fafa722b4a1ccb4cf0319fd2..b770d490868b2bf4691fbb8f3a7843e405d39093 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -823,6 +823,7 @@ public class PurpurWorldConfig { +@@ -835,6 +835,7 @@ public class PurpurWorldConfig { public boolean endermanDespawnEvenWithBlock = false; public double endermanMaxHealth = 40.0D; public boolean endermanTakeDamageFromWater = true; @@ -30,7 +30,7 @@ index aa1fd10c975a4948233139ab29757d42791bda1d..208668cf92b9e881ae300be6de8c8ae7 private void endermanSettings() { endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable); endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater); -@@ -836,6 +837,7 @@ public class PurpurWorldConfig { +@@ -848,6 +849,7 @@ public class PurpurWorldConfig { } endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth); endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater); diff --git a/patches/server/0180-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0180-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch index 29bf67046..9c6b80c8b 100644 --- a/patches/server/0180-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch +++ b/patches/server/0180-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch @@ -28,10 +28,10 @@ index 46143a710e057378ebe0ad644de275604b11d886..0ed19429c1a9021e636fdfffa582b4e0 } else { Vec3D vec3d = entityhuman.f(1.0F).d(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 208668cf92b9e881ae300be6de8c8ae7677812ea..4f484cb094b3c8e2dd07feb394f96360931f6642 100644 +index b770d490868b2bf4691fbb8f3a7843e405d39093..9699b9fa71a70df64b31b9313d3a24164b3abf44 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -824,6 +824,8 @@ public class PurpurWorldConfig { +@@ -836,6 +836,8 @@ public class PurpurWorldConfig { public double endermanMaxHealth = 40.0D; public boolean endermanTakeDamageFromWater = true; public boolean endermanAggroSpawnedEndermites = false; @@ -40,7 +40,7 @@ index 208668cf92b9e881ae300be6de8c8ae7677812ea..4f484cb094b3c8e2dd07feb394f96360 private void endermanSettings() { endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable); endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater); -@@ -838,6 +840,8 @@ public class PurpurWorldConfig { +@@ -850,6 +852,8 @@ public class PurpurWorldConfig { endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth); endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater); endermanAggroSpawnedEndermites = getBoolean("mobs.enderman.aggressive-towards-spawned-endermites", endermanAggroSpawnedEndermites); diff --git a/patches/server/0182-Tick-fluids-config.patch b/patches/server/0182-Tick-fluids-config.patch index acc9ed2ca..022a9e8fd 100644 --- a/patches/server/0182-Tick-fluids-config.patch +++ b/patches/server/0182-Tick-fluids-config.patch @@ -36,7 +36,7 @@ index 0ed8d938b8fafdb03e01a00a201ba3f8597ac6e9..0eff89bf9e114271c34c37cad1b98691 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4f484cb094b3c8e2dd07feb394f96360931f6642..6b44bc7efdfe992302782d23f5a6a46265d31f6d 100644 +index 9699b9fa71a70df64b31b9313d3a24164b3abf44..0d970ee7a6a38d2ecd920176acd7b43831d776bc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -261,6 +261,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0183-Config-to-disable-Llama-caravans.patch b/patches/server/0183-Config-to-disable-Llama-caravans.patch index 25667f057..25a9f0590 100644 --- a/patches/server/0183-Config-to-disable-Llama-caravans.patch +++ b/patches/server/0183-Config-to-disable-Llama-caravans.patch @@ -32,10 +32,10 @@ index 762fed5ba27474951c1962e6f034e8494b1035d6..567a1da3c167c20ae3fb86c2a1f3608e this.bB.bC = this; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6b44bc7efdfe992302782d23f5a6a46265d31f6d..e3aee2e73b453105b47aaa5a38b07b54f3406138 100644 +index 0d970ee7a6a38d2ecd920176acd7b43831d776bc..bdfa0908692db012c437e78428bc5fa0e0c62c42 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1063,6 +1063,7 @@ public class PurpurWorldConfig { +@@ -1075,6 +1075,7 @@ public class PurpurWorldConfig { public boolean llamaRidable = false; public boolean llamaRidableInWater = false; @@ -43,7 +43,7 @@ index 6b44bc7efdfe992302782d23f5a6a46265d31f6d..e3aee2e73b453105b47aaa5a38b07b54 public int llamaBreedingTicks = 6000; public double llamaMaxHealthMin = 15.0D; public double llamaMaxHealthMax = 30.0D; -@@ -1073,6 +1074,7 @@ public class PurpurWorldConfig { +@@ -1085,6 +1086,7 @@ public class PurpurWorldConfig { private void llamaSettings() { llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable); llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater); diff --git a/patches/server/0184-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0184-Config-to-make-Creepers-explode-on-death.patch index febb049fc..57ef2b2c5 100644 --- a/patches/server/0184-Config-to-make-Creepers-explode-on-death.patch +++ b/patches/server/0184-Config-to-make-Creepers-explode-on-death.patch @@ -57,10 +57,10 @@ index 6461e09e05f9255a399a6ce65d8fb90789a2fd7f..5e70746494c5397d4d798d24b7292c57 private void createEffectCloud() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e3aee2e73b453105b47aaa5a38b07b54f3406138..9c23c5939fcdecb7dbb86aa073582712a4f2230a 100644 +index bdfa0908692db012c437e78428bc5fa0e0c62c42..cddab26ccdf6725538d93733774d472aaed0bc16 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -699,12 +699,14 @@ public class PurpurWorldConfig { +@@ -711,12 +711,14 @@ public class PurpurWorldConfig { public boolean creeperRidable = false; public boolean creeperRidableInWater = false; diff --git a/patches/server/0185-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0185-Configurable-ravager-griefable-blocks-list.patch index 3982ede29..6e8452839 100644 --- a/patches/server/0185-Configurable-ravager-griefable-blocks-list.patch +++ b/patches/server/0185-Configurable-ravager-griefable-blocks-list.patch @@ -31,10 +31,10 @@ index 5f8366beeaac7153a0421554f9bf91fbf265edca..7fca4d1713e8061d9de825cdae484012 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9c23c5939fcdecb7dbb86aa073582712a4f2230a..332da1c508b68b02988756fe00c34fd55ef84df5 100644 +index cddab26ccdf6725538d93733774d472aaed0bc16..ff26d61385981c9bac3fd9ceeee76068824d10a7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1404,6 +1404,7 @@ public class PurpurWorldConfig { +@@ -1416,6 +1416,7 @@ public class PurpurWorldConfig { public boolean ravagerRidableInWater = false; public boolean ravagerBypassMobGriefing = false; public double ravagerMaxHealth = 100.0D; @@ -42,7 +42,7 @@ index 9c23c5939fcdecb7dbb86aa073582712a4f2230a..332da1c508b68b02988756fe00c34fd5 private void ravagerSettings() { ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable); ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater); -@@ -1414,6 +1415,23 @@ public class PurpurWorldConfig { +@@ -1426,6 +1427,23 @@ public class PurpurWorldConfig { set("mobs.ravager.attributes.max_health", oldValue); } ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth); diff --git a/patches/server/0186-Sneak-to-bulk-process-composter.patch b/patches/server/0186-Sneak-to-bulk-process-composter.patch index 22c89fd00..7629f62b2 100644 --- a/patches/server/0186-Sneak-to-bulk-process-composter.patch +++ b/patches/server/0186-Sneak-to-bulk-process-composter.patch @@ -44,10 +44,10 @@ index e4e519ba773388b8d26a8f794a6eff51e3d8f72e..c0b235d5edf3cd14021696d1b4f76ce3 // CraftBukkit start double rand = worldserver.getRandom().nextDouble(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 332da1c508b68b02988756fe00c34fd55ef84df5..91f007cb1e14a0921d0b05f168be7dea15c57667 100644 +index ff26d61385981c9bac3fd9ceeee76068824d10a7..02d95020f24c02af7cda3937d7bc510d3c2e15f1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -444,6 +444,11 @@ public class PurpurWorldConfig { +@@ -456,6 +456,11 @@ public class PurpurWorldConfig { chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop); } diff --git a/patches/server/0187-Config-for-skipping-night.patch b/patches/server/0187-Config-for-skipping-night.patch index 0aab584fb..30f483434 100644 --- a/patches/server/0187-Config-for-skipping-night.patch +++ b/patches/server/0187-Config-for-skipping-night.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java -index 63b22bd2dc828f4b5be45f8162745b4cc214382b..1dbd63f1b62851775f6289846118d9b18788cb86 100644 +index fc77904699bb75cf55e7ea77a55c8ad4a9412c18..5d8326b465458f1f4eeff9f17ef4fe3f12453225 100644 --- a/src/main/java/net/minecraft/server/level/WorldServer.java +++ b/src/main/java/net/minecraft/server/level/WorldServer.java @@ -1026,7 +1026,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -18,7 +18,7 @@ index 63b22bd2dc828f4b5be45f8162745b4cc214382b..1dbd63f1b62851775f6289846118d9b1 })) { // CraftBukkit start diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 91f007cb1e14a0921d0b05f168be7dea15c57667..fcf6095d1ff6deb4231866cd482f7d5d3040ad19 100644 +index 02d95020f24c02af7cda3937d7bc510d3c2e15f1..bcebbb0ada90236edc22602884076c47c68a49b1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -289,6 +289,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0188-Add-config-for-villager-trading.patch b/patches/server/0188-Add-config-for-villager-trading.patch index 2d167ddb9..f8cd3de54 100644 --- a/patches/server/0188-Add-config-for-villager-trading.patch +++ b/patches/server/0188-Add-config-for-villager-trading.patch @@ -31,10 +31,10 @@ index b84916c0c58fd208ef5547299f8db8462d1c42fe..0b6b6aa6b358759c45bbcf4a9ffa5377 this.openTrade(entityhuman, this.getScoreboardDisplayName(), 1); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index fcf6095d1ff6deb4231866cd482f7d5d3040ad19..adb9166b15654a81b2a852b518beea52a1ee8327 100644 +index bcebbb0ada90236edc22602884076c47c68a49b1..ae2137017cd149812e3e51d513d8768026a37a9c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1712,6 +1712,7 @@ public class PurpurWorldConfig { +@@ -1724,6 +1724,7 @@ public class PurpurWorldConfig { public boolean villagerClericsFarmWarts = false; public boolean villagerClericFarmersThrowWarts = true; public double villagerMaxHealth = 20.0D; @@ -42,7 +42,7 @@ index fcf6095d1ff6deb4231866cd482f7d5d3040ad19..adb9166b15654a81b2a852b518beea52 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1739,6 +1740,7 @@ public class PurpurWorldConfig { +@@ -1751,6 +1752,7 @@ public class PurpurWorldConfig { set("mobs.villager.attributes.max_health", oldValue); } villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth); @@ -50,7 +50,7 @@ index fcf6095d1ff6deb4231866cd482f7d5d3040ad19..adb9166b15654a81b2a852b518beea52 } public boolean villagerTraderRidable = false; -@@ -1746,6 +1748,7 @@ public class PurpurWorldConfig { +@@ -1758,6 +1760,7 @@ public class PurpurWorldConfig { public boolean villagerTraderCanBeLeashed = false; public boolean villagerTraderFollowEmeraldBlock = false; public double villagerTraderMaxHealth = 20.0D; @@ -58,7 +58,7 @@ index fcf6095d1ff6deb4231866cd482f7d5d3040ad19..adb9166b15654a81b2a852b518beea52 private void villagerTraderSettings() { villagerTraderRidable = getBoolean("mobs.wandering_trader.ridable", villagerTraderRidable); villagerTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", villagerTraderRidableInWater); -@@ -1757,6 +1760,7 @@ public class PurpurWorldConfig { +@@ -1769,6 +1772,7 @@ public class PurpurWorldConfig { set("mobs.wandering_trader.attributes.max_health", oldValue); } villagerTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", villagerTraderMaxHealth); diff --git a/patches/server/0189-Allow-infinity-on-crossbows.patch b/patches/server/0189-Allow-infinity-on-crossbows.patch index cd3f807ee..569f7b27f 100644 --- a/patches/server/0189-Allow-infinity-on-crossbows.patch +++ b/patches/server/0189-Allow-infinity-on-crossbows.patch @@ -63,7 +63,7 @@ index cf41863bc8b0be9f2a73ca2dd02a4d414d4f230e..2b75432d74df4f627d08d32c6553bd1a private EnchantmentSlotType() {} diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 322cecf1a7316fb8fe00ff538fe3a2dd21708819..91677ee1dbb983179261bc1f09ccb08f93406aa9 100644 +index 7b9f5e04af48e9c5ab9769b8f45ed2b2853dd98c..e04150685e1ec9d2e318ca6a7ae24f9251fcc326 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -231,6 +231,7 @@ public class PurpurConfig { diff --git a/patches/server/0190-Drowning-Settings.patch b/patches/server/0190-Drowning-Settings.patch index 3bbb5790f..5664be089 100644 --- a/patches/server/0190-Drowning-Settings.patch +++ b/patches/server/0190-Drowning-Settings.patch @@ -40,10 +40,10 @@ index 659ccc8075945531ca714c43a034f2d5baa5defb..1d319ad82179ae261738d6e70aac3bbb } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index adb9166b15654a81b2a852b518beea52a1ee8327..66b0e4a2225ae9407a3b80b5354e960e6e1420b9 100644 +index ae2137017cd149812e3e51d513d8768026a37a9c..7eb1353adb100a73645ca63e012ee60afc53ae5e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1987,6 +1987,15 @@ public class PurpurWorldConfig { +@@ -1999,6 +1999,15 @@ public class PurpurWorldConfig { imposeTeleportRestrictionsOnGateways = getBoolean("gameplay-mechanics.impose-teleport-restrictions-on-gateways", imposeTeleportRestrictionsOnGateways); } diff --git a/patches/server/0191-Break-individual-slabs-when-sneaking.patch b/patches/server/0191-Break-individual-slabs-when-sneaking.patch index 199716966..0734a0e18 100644 --- a/patches/server/0191-Break-individual-slabs-when-sneaking.patch +++ b/patches/server/0191-Break-individual-slabs-when-sneaking.patch @@ -57,10 +57,10 @@ index 12c0fa5072755fd2a4f575b0cc5e4222617490ce..94965b216d50b29b95f09fa9019c177b + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 66b0e4a2225ae9407a3b80b5354e960e6e1420b9..1e5cb69d5c1e61b7dd01d7ab615dbee88f9520e6 100644 +index 7eb1353adb100a73645ca63e012ee60afc53ae5e..c5988ff57622eb64922e447d9387068097377c98 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -517,6 +517,11 @@ public class PurpurWorldConfig { +@@ -529,6 +529,11 @@ public class PurpurWorldConfig { signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit); } diff --git a/patches/server/0192-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0192-Config-to-disable-hostile-mob-spawn-on-ice.patch index 807bdb323..8a94a5354 100644 --- a/patches/server/0192-Config-to-disable-hostile-mob-spawn-on-ice.patch +++ b/patches/server/0192-Config-to-disable-hostile-mob-spawn-on-ice.patch @@ -22,10 +22,10 @@ index c484e27650364b6537fe6b2e8e14de98382b86a3..096a7b76e0ae42ba8b859159e20fb72e return false; } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1e5cb69d5c1e61b7dd01d7ab615dbee88f9520e6..81769dea86810ebf8f173e2cf3414c6753191ca7 100644 +index c5988ff57622eb64922e447d9387068097377c98..d82bb5bc5d4ba9fafcbbfaa1a4fcede3118e5562 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -437,8 +437,12 @@ public class PurpurWorldConfig { +@@ -449,8 +449,12 @@ public class PurpurWorldConfig { } public boolean snowOnBlueIce = true; diff --git a/patches/server/0193-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0193-Config-to-show-Armor-Stand-arms-on-spawn.patch index a460b3c97..3f4ee7a27 100644 --- a/patches/server/0193-Config-to-show-Armor-Stand-arms-on-spawn.patch +++ b/patches/server/0193-Config-to-show-Armor-Stand-arms-on-spawn.patch @@ -17,7 +17,7 @@ index ecb797e67554d30e35b3aca4d0fc9b0e3f6c1a50..ddc1c3383cdc32fa832485f3922c7418 public EntityArmorStand(World world, double d0, double d1, double d2) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 81769dea86810ebf8f173e2cf3414c6753191ca7..0173077fadaf6d61c3b516e3d783608ae72c4284 100644 +index d82bb5bc5d4ba9fafcbbfaa1a4fcede3118e5562..327adbf000c6b6e22126d0a8a0df661fc555a702 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -114,6 +114,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0194-Option-to-make-doors-require-restone.patch b/patches/server/0194-Option-to-make-doors-require-restone.patch index afc8daae8..ce626ed43 100644 --- a/patches/server/0194-Option-to-make-doors-require-restone.patch +++ b/patches/server/0194-Option-to-make-doors-require-restone.patch @@ -70,10 +70,10 @@ index 453b46851f021d4285be123bedc8982fc8844da2..2a7695c899b12c87ab89d00116b6f0dd + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0173077fadaf6d61c3b516e3d783608ae72c4284..480d1791bf6b5c5ea51468fd8e16c571f558c5a0 100644 +index 327adbf000c6b6e22126d0a8a0df661fc555a702..eb91425fa9bdbb2bd2a25e7362b99e2b6687da80 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -438,6 +438,16 @@ public class PurpurWorldConfig { +@@ -450,6 +450,16 @@ public class PurpurWorldConfig { } }