diff --git a/patches/server/0023-Fix-vanilla-command-permission-handler.patch b/patches/server/0023-Fix-vanilla-command-permission-handler.patch deleted file mode 100644 index 6dbbd6bf5..000000000 --- a/patches/server/0023-Fix-vanilla-command-permission-handler.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sat, 28 Mar 2020 01:51:32 -0500 -Subject: [PATCH] Fix vanilla command permission handler - - -diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java -index 39844531b03eb8a6c70700b4ecbf0ff1a557424d..632ae75cb3bbc7a3955872d14ad0fbc2459f32e8 100644 ---- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java -+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java -@@ -35,6 +35,7 @@ public abstract class CommandNode implements Comparable> { - private final boolean forks; - private Command command; - public LiteralCommandNode clientNode = null; // Paper -+ private String permission = null; public String getPermission() { return permission; } public void setPermission(String permission) { this.permission = permission; } // Purpur - // CraftBukkit start - public void removeCommand(String name) { - this.children.remove(name); -diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java -index 6035af2cf08353b3d3801220d8116d8611a0cd37..7774ab6a2e553a40def4bb4dceea9e5f58d31c1e 100644 ---- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java -+++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java -@@ -94,6 +94,7 @@ public final class VanillaCommandWrapper extends BukkitCommand { - } - - public static String getPermission(CommandNode vanillaCommand) { -+ if (vanillaCommand.getPermission() != null) return vanillaCommand.getPermission(); // Purpur - // Paper start - final String commandName; - if (vanillaCommand.getRedirect() == null) { diff --git a/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0023-Logger-settings-suppressing-pointless-logs.patch similarity index 100% rename from patches/server/0024-Logger-settings-suppressing-pointless-logs.patch rename to patches/server/0023-Logger-settings-suppressing-pointless-logs.patch diff --git a/patches/server/0025-Disable-outdated-build-check.patch b/patches/server/0024-Disable-outdated-build-check.patch similarity index 92% rename from patches/server/0025-Disable-outdated-build-check.patch rename to patches/server/0024-Disable-outdated-build-check.patch index 0d63114c6..93eda87aa 100644 --- a/patches/server/0025-Disable-outdated-build-check.patch +++ b/patches/server/0024-Disable-outdated-build-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable outdated build check diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index f5266df43726a7805ee2664ed18a2dcf79ab6cde..ad4bc3f46bb6f02284ecf62e2701bb627e096b15 100644 +index 5758ce3033c2d4121970eb8757beabc1975c5c83..f1755b7f71672383566a9591348b5af5c658350b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -285,7 +285,7 @@ public class Main { diff --git a/patches/server/0026-Giants-AI-settings.patch b/patches/server/0025-Giants-AI-settings.patch similarity index 98% rename from patches/server/0026-Giants-AI-settings.patch rename to patches/server/0025-Giants-AI-settings.patch index 673607040..9fdfabb43 100644 --- a/patches/server/0026-Giants-AI-settings.patch +++ b/patches/server/0025-Giants-AI-settings.patch @@ -120,7 +120,7 @@ index 2050230df7949e21f2158d2be5be885461afb66d..14b393c8b70a1aa950df9dcaef648a90 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 1046f6de8a04c4368870596f90236fe01671173d..db811ee761ffd92a7eba4d0209894be54834387f 100644 +index 5320558a12d811afbea5f3a96c3ccce249e6962a..e697c549fd1097b071350a937acb097d39fbd4cd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -551,6 +551,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0027-Zombie-horse-naturally-spawn.patch b/patches/server/0026-Zombie-horse-naturally-spawn.patch similarity index 94% rename from patches/server/0027-Zombie-horse-naturally-spawn.patch rename to patches/server/0026-Zombie-horse-naturally-spawn.patch index cdc641da2..8dc2262ca 100644 --- a/patches/server/0027-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0026-Zombie-horse-naturally-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b40bc54e80dadc8eb426ed6217b879631833e4d7..a7c153f957af48cf42ecbb01ada5f8f384c4e5e4 100644 +index 3d641a5721b90230c79dca9e43ccc6fa21f24946..575be84b580f7d7f4968bc4e2a69e0a067a3a617 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -830,10 +830,18 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -30,7 +30,7 @@ index b40bc54e80dadc8eb426ed6217b879631833e4d7..a7c153f957af48cf42ecbb01ada5f8f3 entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()); this.addFreshEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index db811ee761ffd92a7eba4d0209894be54834387f..c9a38cf24041df4cdcbea59d9b1e09aa45d29e55 100644 +index e697c549fd1097b071350a937acb097d39fbd4cd..5d390156e36b953ade9b009b17332c2907e30b3c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1481,6 +1481,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0028-Charged-creeper-naturally-spawn.patch b/patches/server/0027-Charged-creeper-naturally-spawn.patch similarity index 96% rename from patches/server/0028-Charged-creeper-naturally-spawn.patch rename to patches/server/0027-Charged-creeper-naturally-spawn.patch index 76f4e42f3..34a89976c 100644 --- a/patches/server/0028-Charged-creeper-naturally-spawn.patch +++ b/patches/server/0027-Charged-creeper-naturally-spawn.patch @@ -24,7 +24,7 @@ index 50fa28f8348625be15e93800e2c071e243afd39a..76d796600411144b73d1e7e67f70bb03 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c9a38cf24041df4cdcbea59d9b1e09aa45d29e55..f4a8e143ba35e36e6d5fb417e249feb3d4e5a7da 100644 +index 5d390156e36b953ade9b009b17332c2907e30b3c..3f994f5563950ebcd23c077e21f3ad691f900762 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -342,6 +342,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0029-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0028-Rabbit-naturally-spawn-toast-and-killer.patch similarity index 96% rename from patches/server/0029-Rabbit-naturally-spawn-toast-and-killer.patch rename to patches/server/0028-Rabbit-naturally-spawn-toast-and-killer.patch index ed5a85de6..b5c520e71 100644 --- a/patches/server/0029-Rabbit-naturally-spawn-toast-and-killer.patch +++ b/patches/server/0028-Rabbit-naturally-spawn-toast-and-killer.patch @@ -33,7 +33,7 @@ index ebb85ac5b77450a1ae91c986512125814fa0907f..620cf2c9927648804155495a908df1d3 int i = world.getRandom().nextInt(100); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f4a8e143ba35e36e6d5fb417e249feb3d4e5a7da..238f1a5bb2f2c826f71c11b7718cd4b64930565d 100644 +index 3f994f5563950ebcd23c077e21f3ad691f900762..ca4f635ac65dcbdf5ebbe8d351623f64dded41e0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -985,6 +985,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0030-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0029-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0031-Tulips-change-fox-type.patch b/patches/server/0030-Tulips-change-fox-type.patch similarity index 97% rename from patches/server/0031-Tulips-change-fox-type.patch rename to patches/server/0030-Tulips-change-fox-type.patch index c259c081b..a684570ab 100644 --- a/patches/server/0031-Tulips-change-fox-type.patch +++ b/patches/server/0030-Tulips-change-fox-type.patch @@ -75,7 +75,7 @@ index 5de86c59bf857e6697bb768e3dd71a05739fb3d2..d5f536eb87163c946815ace610ba99ad // Paper start - Cancellable death event protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(DamageSource source) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 238f1a5bb2f2c826f71c11b7718cd4b64930565d..93bdefe8ec286f24df65f72c246673a8833d3050 100644 +index ca4f635ac65dcbdf5ebbe8d351623f64dded41e0..470833e60081dd32a58d5efacad1ecff5b5b1812 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -506,6 +506,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0032-Breedable-Polar-Bears.patch b/patches/server/0031-Breedable-Polar-Bears.patch similarity index 97% rename from patches/server/0032-Breedable-Polar-Bears.patch rename to patches/server/0031-Breedable-Polar-Bears.patch index c0005cfbe..0fa5101a2 100644 --- a/patches/server/0032-Breedable-Polar-Bears.patch +++ b/patches/server/0031-Breedable-Polar-Bears.patch @@ -59,7 +59,7 @@ index 90e5114a5c1a341d0ac64d72d6306ddeb09cb728..69a0e50a4f136a3e799f8fc079bd931a this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0D)); this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 93bdefe8ec286f24df65f72c246673a8833d3050..63d0bd7b55d57b1dbdc8a319709e5d8ba2c1c8d5 100644 +index 470833e60081dd32a58d5efacad1ecff5b5b1812..5eaf43ea5d983db45b95acb5c9e5e97e79606785 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -957,6 +957,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0033-Chickens-can-retaliate.patch b/patches/server/0032-Chickens-can-retaliate.patch similarity index 97% rename from patches/server/0033-Chickens-can-retaliate.patch rename to patches/server/0032-Chickens-can-retaliate.patch index bd2f07dbb..0afb697be 100644 --- a/patches/server/0033-Chickens-can-retaliate.patch +++ b/patches/server/0032-Chickens-can-retaliate.patch @@ -51,7 +51,7 @@ index 5207a2a8c06cd413e1d62c5eec7a232dce952b8b..da281eb1355fd753dfdb69cee1366181 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 63d0bd7b55d57b1dbdc8a319709e5d8ba2c1c8d5..47bd9c45b4a560b1fcc01eee9606afef7416f70d 100644 +index 5eaf43ea5d983db45b95acb5c9e5e97e79606785..cefd5086a7fef31a88ed4781b6d0bdbd014d36c6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -296,6 +296,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0034-Add-option-to-set-armorstand-step-height.patch b/patches/server/0033-Add-option-to-set-armorstand-step-height.patch similarity index 92% rename from patches/server/0034-Add-option-to-set-armorstand-step-height.patch rename to patches/server/0033-Add-option-to-set-armorstand-step-height.patch index 951b1cefd..d2e663e43 100644 --- a/patches/server/0034-Add-option-to-set-armorstand-step-height.patch +++ b/patches/server/0033-Add-option-to-set-armorstand-step-height.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a0f63263a2439df93757309a6d9f6394abf81073..af6da7a9b93ef808759c7e213354ebfeed7e7a77 100644 +index 8c158da219c3ee91942ae93454317cfe87641f0d..a332f75440b336f371a30f9a6d6d9a1662fff5bd 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -319,7 +319,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -30,7 +30,7 @@ index 3677dd991ae73428984e62e4d6fb757317987887..697d6d6cca0a1c8df9c5bf6852495130 if (!this.canTick) { if (this.noTickPoseDirty) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 47bd9c45b4a560b1fcc01eee9606afef7416f70d..7fe6efbed2bd5f9a9d5b9a8ff5118a799cda4d11 100644 +index cefd5086a7fef31a88ed4781b6d0bdbd014d36c6..09fd86fd7b5a73c65301a7d23e559acf468fd3de 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -92,6 +92,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0035-Cat-spawning-options.patch b/patches/server/0034-Cat-spawning-options.patch similarity index 97% rename from patches/server/0035-Cat-spawning-options.patch rename to patches/server/0034-Cat-spawning-options.patch index a21df5b45..3fb229db5 100644 --- a/patches/server/0035-Cat-spawning-options.patch +++ b/patches/server/0034-Cat-spawning-options.patch @@ -51,7 +51,7 @@ index 5f407535298a31a34cfe114dd863fd6a9b977707..29c7e33fe961020e5a0007287fe9b663 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7fe6efbed2bd5f9a9d5b9a8ff5118a799cda4d11..47106d83ed3c1d4fef75cb3e77b8dc87f936bde5 100644 +index 09fd86fd7b5a73c65301a7d23e559acf468fd3de..21fec77f9cbbac41b92450cf7fd4ffc53efc27c3 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -269,6 +269,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0036-Cows-eat-mushrooms.patch b/patches/server/0035-Cows-eat-mushrooms.patch similarity index 98% rename from patches/server/0036-Cows-eat-mushrooms.patch rename to patches/server/0035-Cows-eat-mushrooms.patch index be813bb21..fc38158c8 100644 --- a/patches/server/0036-Cows-eat-mushrooms.patch +++ b/patches/server/0035-Cows-eat-mushrooms.patch @@ -114,7 +114,7 @@ index e24173dcd6f083a3ae61edcf71bb7236d644a422..b7a0ee0e055d12e36b411859211367c9 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 47106d83ed3c1d4fef75cb3e77b8dc87f936bde5..5d3e7a0a1fa5b84badd43fb9d474e3c10de35868 100644 +index 21fec77f9cbbac41b92450cf7fd4ffc53efc27c3..068e387bdda6d7fe44fafd54aaee66eb44ff4380 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -339,6 +339,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0037-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0036-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0037-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0036-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0038-Pigs-give-saddle-back.patch b/patches/server/0037-Pigs-give-saddle-back.patch similarity index 96% rename from patches/server/0038-Pigs-give-saddle-back.patch rename to patches/server/0037-Pigs-give-saddle-back.patch index dc4a055ad..c41e49596 100644 --- a/patches/server/0038-Pigs-give-saddle-back.patch +++ b/patches/server/0037-Pigs-give-saddle-back.patch @@ -27,7 +27,7 @@ index 17cd8463fa5b601946782174f0a0a77a93aacf4d..8734738ce69e2e776b80a4695fce3bcf if (!this.level.isClientSide) { player.startRiding(this); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5d3e7a0a1fa5b84badd43fb9d474e3c10de35868..b2851cd99429671d41264b306321552ed2caebef 100644 +index 068e387bdda6d7fe44fafd54aaee66eb44ff4380..7b1387f46691bad7d092fb82e3311c309e0be76b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -908,6 +908,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0039-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0038-Snowman-drop-and-put-back-pumpkin.patch similarity index 96% rename from patches/server/0039-Snowman-drop-and-put-back-pumpkin.patch rename to patches/server/0038-Snowman-drop-and-put-back-pumpkin.patch index b10cd2493..0a0ab8923 100644 --- a/patches/server/0039-Snowman-drop-and-put-back-pumpkin.patch +++ b/patches/server/0038-Snowman-drop-and-put-back-pumpkin.patch @@ -32,7 +32,7 @@ index 7da9fcf10e6480a71d7a3e9934bb91320cac227e..6c6e020522261ca5bbc47a59c25d3e98 this.forceDrops = false; // CraftBukkit } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b2851cd99429671d41264b306321552ed2caebef..4a7f80f623d30a3781c04e05aa1bcf57f47caab2 100644 +index 7b1387f46691bad7d092fb82e3311c309e0be76b..6c227e9bebd4b6f44ad7da552686468180709f92 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1171,6 +1171,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0040-Ender-dragon-always-drop-full-exp.patch b/patches/server/0039-Ender-dragon-always-drop-full-exp.patch similarity index 95% rename from patches/server/0040-Ender-dragon-always-drop-full-exp.patch rename to patches/server/0039-Ender-dragon-always-drop-full-exp.patch index d3bec21ad..5c7cc623f 100644 --- a/patches/server/0040-Ender-dragon-always-drop-full-exp.patch +++ b/patches/server/0039-Ender-dragon-always-drop-full-exp.patch @@ -18,7 +18,7 @@ index a23458734a192425ddbec9b114d8485d8e7a2bd3..178c01444b7894833265c21a50ff6805 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4a7f80f623d30a3781c04e05aa1bcf57f47caab2..d0ce35d161498220eb1b0ce7ff8d0abd8a06fc35 100644 +index 6c227e9bebd4b6f44ad7da552686468180709f92..61afa4ef024e6bb9b48029aeb42977d977a41620 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -452,6 +452,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0041-Signs-editable-on-right-click.patch b/patches/server/0040-Signs-editable-on-right-click.patch similarity index 97% rename from patches/server/0041-Signs-editable-on-right-click.patch rename to patches/server/0040-Signs-editable-on-right-click.patch index d268215eb..7873777ca 100644 --- a/patches/server/0041-Signs-editable-on-right-click.patch +++ b/patches/server/0040-Signs-editable-on-right-click.patch @@ -50,7 +50,7 @@ index aface9a9697095a29edaf73c9cdabc2c1414b9d7..1a04d0a601b8e481dd6e2592b849b907 } else { return InteractionResult.PASS; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d0ce35d161498220eb1b0ce7ff8d0abd8a06fc35..8db5d37e22bc3c20bf9c8f0737968c39d475db9f 100644 +index 61afa4ef024e6bb9b48029aeb42977d977a41620..485925e025c5b374b9bbd183a007380eed0c663e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -151,6 +151,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0042-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0041-Allow-soil-to-moisten-from-water-directly-under-it.patch similarity index 94% rename from patches/server/0042-Allow-soil-to-moisten-from-water-directly-under-it.patch rename to patches/server/0041-Allow-soil-to-moisten-from-water-directly-under-it.patch index cf4f52559..aa89a854c 100644 --- a/patches/server/0042-Allow-soil-to-moisten-from-water-directly-under-it.patch +++ b/patches/server/0041-Allow-soil-to-moisten-from-water-directly-under-it.patch @@ -18,7 +18,7 @@ index 34d744837e599633a3c2c0b72f253bb0e157f226..fce9ebcaaac18ecee24c7091ea77a32a @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8db5d37e22bc3c20bf9c8f0737968c39d475db9f..7b0829e64b04affe1af155419722c78a187ff216 100644 +index 485925e025c5b374b9bbd183a007380eed0c663e..028581cd6f36f267c81e5c8d09aa6be0172c8691 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -151,6 +151,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0043-Minecart-settings-and-WASD-controls.patch b/patches/server/0042-Minecart-settings-and-WASD-controls.patch similarity index 99% rename from patches/server/0043-Minecart-settings-and-WASD-controls.patch rename to patches/server/0042-Minecart-settings-and-WASD-controls.patch index c74772835..4547633e9 100644 --- a/patches/server/0043-Minecart-settings-and-WASD-controls.patch +++ b/patches/server/0042-Minecart-settings-and-WASD-controls.patch @@ -149,7 +149,7 @@ index 505503a3f59d4b747649275c6f6faa504b7c7b64..532a9920bccfc90ee75ac21714812e88 protected final float explosionResistance; protected final boolean isRandomlyTicking; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7b0829e64b04affe1af155419722c78a187ff216..4ed7b12a08df116807be89123b7b9b689eace49a 100644 +index 028581cd6f36f267c81e5c8d09aa6be0172c8691..49d8e35b254e0df25963f7247326625928ed89e1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -97,6 +97,68 @@ public class PurpurWorldConfig { diff --git a/patches/server/0044-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0043-Disable-loot-drops-on-death-by-cramming.patch similarity index 92% rename from patches/server/0044-Disable-loot-drops-on-death-by-cramming.patch rename to patches/server/0043-Disable-loot-drops-on-death-by-cramming.patch index 93e2ac22e..a503c97ea 100644 --- a/patches/server/0044-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0043-Disable-loot-drops-on-death-by-cramming.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index cf7ac9f5e18921723b0a8cfd0ed8a829d73e1fd4..5ce0906f891f9465eea4dc8c574b83ccc937f80c 100644 +index ad1591644a429b33c042e84a0114fe36bbcc6ec4..161d52ff7b303f5f1eb5f094a63ed63e06d11d08 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1756,6 +1756,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -25,7 +25,7 @@ index cf7ac9f5e18921723b0a8cfd0ed8a829d73e1fd4..5ce0906f891f9465eea4dc8c574b83cc // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops, () -> { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4ed7b12a08df116807be89123b7b9b689eace49a..6cfd8e222d432ffc23eeb21db240a21e1e52f678 100644 +index 49d8e35b254e0df25963f7247326625928ed89e1..2495ef7023aabb704d47e6b35c100d24828f0208 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -97,6 +97,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0045-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0044-Option-to-toggle-milk-curing-bad-omen.patch similarity index 95% rename from patches/server/0045-Option-to-toggle-milk-curing-bad-omen.patch rename to patches/server/0044-Option-to-toggle-milk-curing-bad-omen.patch index 9e4bae146..b9d984d60 100644 --- a/patches/server/0045-Option-to-toggle-milk-curing-bad-omen.patch +++ b/patches/server/0044-Option-to-toggle-milk-curing-bad-omen.patch @@ -28,7 +28,7 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 6cfd8e222d432ffc23eeb21db240a21e1e52f678..58ada439e2d02383573c69859f48a2f6286a8899 100644 +index 2495ef7023aabb704d47e6b35c100d24828f0208..ac1cc7a535f76d84877c7f4cb047ddb41c089845 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -98,8 +98,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0046-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0045-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0046-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0045-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0047-Skip-events-if-there-s-no-listeners.patch b/patches/server/0046-Skip-events-if-there-s-no-listeners.patch similarity index 100% rename from patches/server/0047-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0046-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0048-Add-permission-for-F3-N-debug.patch b/patches/server/0047-Add-permission-for-F3-N-debug.patch similarity index 100% rename from patches/server/0048-Add-permission-for-F3-N-debug.patch rename to patches/server/0047-Add-permission-for-F3-N-debug.patch diff --git a/patches/server/0049-Configurable-TPS-Catchup.patch b/patches/server/0048-Configurable-TPS-Catchup.patch similarity index 95% rename from patches/server/0049-Configurable-TPS-Catchup.patch rename to patches/server/0048-Configurable-TPS-Catchup.patch index c991566f4..d463f4330 100644 --- a/patches/server/0049-Configurable-TPS-Catchup.patch +++ b/patches/server/0048-Configurable-TPS-Catchup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c4f8caf7001bb022117466ce723a9ac3ada03d6b..ffc045d1bf40e620fb8364ac8694f39afdb9067b 100644 +index 6cdcd4f105b15f10d60499572f6f4f830565513e..ceaafede643bac0b6714df3d5475b4cb03b2eaed 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1178,7 +1178,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop dispatcher) { + dispatcher.register(Commands.literal("ping") -+ .requires((listener) -> listener.hasPermission(2)) ++ .requires((listener) -> listener.hasPermission(2, "bukkit.command.ping")) + .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException()))) + .then(Commands.argument("targets", EntityArgument.players()) + .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets"))) + ) -+ ).setPermission("bukkit.command.ping"); ++ ); + } + + private static int execute(CommandSourceStack sender, Collection targets) { diff --git a/patches/server/0066-Add-demo-command.patch b/patches/server/0065-Add-demo-command.patch similarity index 96% rename from patches/server/0066-Add-demo-command.patch rename to patches/server/0065-Add-demo-command.patch index 36c2a8204..ab388a7e9 100644 --- a/patches/server/0066-Add-demo-command.patch +++ b/patches/server/0065-Add-demo-command.patch @@ -38,7 +38,7 @@ index 27b35e12eafd3ee735fcea201c9d371c2480e4da..fdcffdc618fcbc2413f6e6949d82ed1f diff --git a/src/main/java/org/purpurmc/purpur/command/DemoCommand.java b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..83b3d1fb934d417702fc280e679f88d80f63cff2 +index 0000000000000000000000000000000000000000..cb76bb1345738084e4f5797229fd04bd65e8e0f6 --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/command/DemoCommand.java @@ -0,0 +1,34 @@ @@ -58,12 +58,12 @@ index 0000000000000000000000000000000000000000..83b3d1fb934d417702fc280e679f88d8 +public class DemoCommand { + public static void register(CommandDispatcher dispatcher) { + dispatcher.register(Commands.literal("demo") -+ .requires((listener) -> listener.hasPermission(2)) ++ .requires((listener) -> listener.hasPermission(2, "bukkit.command.demo")) + .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException()))) + .then(Commands.argument("targets", EntityArgument.players()) + .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets"))) + ) -+ ).setPermission("bukkit.command.demo"); ++ ); + } + + private static int execute(CommandSourceStack sender, Collection targets) { diff --git a/patches/server/0067-Add-credits-command.patch b/patches/server/0066-Add-credits-command.patch similarity index 96% rename from patches/server/0067-Add-credits-command.patch rename to patches/server/0066-Add-credits-command.patch index bf4aed6ac..b14fa9d43 100644 --- a/patches/server/0067-Add-credits-command.patch +++ b/patches/server/0066-Add-credits-command.patch @@ -38,7 +38,7 @@ index fdcffdc618fcbc2413f6e6949d82ed1f138086b1..28711abdabec6894faefb3a5bcff503c } diff --git a/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java b/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..2189ca24f9fe53ad20ffba73ea73f6a0dc7891b8 +index 0000000000000000000000000000000000000000..8ea09a5154a566b310648ebc32f6840c510a4eba --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/command/CreditsCommand.java @@ -0,0 +1,34 @@ @@ -58,12 +58,12 @@ index 0000000000000000000000000000000000000000..2189ca24f9fe53ad20ffba73ea73f6a0 +public class CreditsCommand { + public static void register(CommandDispatcher dispatcher) { + dispatcher.register(Commands.literal("credits") -+ .requires((listener) -> listener.hasPermission(2)) ++ .requires((listener) -> listener.hasPermission(2, "bukkit.command.credits")) + .executes((context) -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException()))) + .then(Commands.argument("targets", EntityArgument.players()) + .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets"))) + ) -+ ).setPermission("bukkit.command.credits"); ++ ); + } + + private static int execute(CommandSourceStack sender, Collection targets) { diff --git a/patches/server/0068-Configurable-jockey-options.patch b/patches/server/0067-Configurable-jockey-options.patch similarity index 99% rename from patches/server/0068-Configurable-jockey-options.patch rename to patches/server/0067-Configurable-jockey-options.patch index 6cc025105..b76eb8fb4 100644 --- a/patches/server/0068-Configurable-jockey-options.patch +++ b/patches/server/0067-Configurable-jockey-options.patch @@ -167,7 +167,7 @@ index 2df1aa1af12b403e9cd87d61b2ff1516f754f589..f2c690c92dd2bf55f986f629ed79b76f @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2802191b8582840532e0774369082bca487a081d..c362dbe806269a04765babafa0866b774ed396a1 100644 +index 0ea436e503d76a7ee74c8ef30722dfd06ed7449f..d98383a21bb7fbc64525e701add25f8d32499e9a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -590,6 +590,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0069-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0068-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 99% rename from patches/server/0069-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0068-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index 51b0a3429..28b24c4ed 100644 --- a/patches/server/0069-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0068-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -258,7 +258,7 @@ index e271555ac03fcbb565a7fe08efdc9a6036164e74..fd02dfb905c71fa10e0830cf0a02d4b6 private float speed = 0.1F; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c362dbe806269a04765babafa0866b774ed396a1..988e7255df7f32dff84f1d2abc2ec642095e3d58 100644 +index d98383a21bb7fbc64525e701add25f8d32499e9a..20573f2979277aa53f5377974ad910ec4428c435 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1067,6 +1067,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0070-Add-phantom-spawning-options.patch b/patches/server/0069-Add-phantom-spawning-options.patch similarity index 98% rename from patches/server/0070-Add-phantom-spawning-options.patch rename to patches/server/0069-Add-phantom-spawning-options.patch index 12d671b48..a967b438f 100644 --- a/patches/server/0070-Add-phantom-spawning-options.patch +++ b/patches/server/0069-Add-phantom-spawning-options.patch @@ -40,7 +40,7 @@ index e8ae4449696d73c8c9b8b27d4d2e20db933a72cc..f55c50f6637a4f930b15565d6ac82bb4 for (int l = 0; l < k; ++l) { // Paper start diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 988e7255df7f32dff84f1d2abc2ec642095e3d58..cf0842e65e1360d6860f4b519631a71a91c40145 100644 +index 20573f2979277aa53f5377974ad910ec4428c435..f3502992e3c7eaa955c793acce3b8fc07e7c9a93 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1070,6 +1070,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0071-Implement-bed-explosion-options.patch b/patches/server/0070-Implement-bed-explosion-options.patch similarity index 100% rename from patches/server/0071-Implement-bed-explosion-options.patch rename to patches/server/0070-Implement-bed-explosion-options.patch diff --git a/patches/server/0072-Implement-respawn-anchor-explosion-options.patch b/patches/server/0071-Implement-respawn-anchor-explosion-options.patch similarity index 97% rename from patches/server/0072-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0071-Implement-respawn-anchor-explosion-options.patch index 9097a21f8..a7b2a515d 100644 --- a/patches/server/0072-Implement-respawn-anchor-explosion-options.patch +++ b/patches/server/0071-Implement-respawn-anchor-explosion-options.patch @@ -18,7 +18,7 @@ index bcea8af63b9911c36873290e5c34567b1eeaacf4..a81fe948398a4d65929d75c821177f09 public static boolean canSetSpawn(Level world) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8adb2b6094da7c1d865b3cf78c2f2dd7f810be5b..f3e0e2096ffbc6d2577bf1ffa34930855cd94102 100644 +index b647527fe6214ca803fad96a8d739811dd2a3a06..482c145bb6d24de52c31bfa44d95f36428cabb7d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -330,6 +330,27 @@ public class PurpurWorldConfig { diff --git a/patches/server/0073-Add-allow-water-in-end-world-option.patch b/patches/server/0072-Add-allow-water-in-end-world-option.patch similarity index 100% rename from patches/server/0073-Add-allow-water-in-end-world-option.patch rename to patches/server/0072-Add-allow-water-in-end-world-option.patch diff --git a/patches/server/0074-Allow-color-codes-in-books.patch b/patches/server/0073-Allow-color-codes-in-books.patch similarity index 97% rename from patches/server/0074-Allow-color-codes-in-books.patch rename to patches/server/0073-Allow-color-codes-in-books.patch index 774bd1600..d11da07bb 100644 --- a/patches/server/0074-Allow-color-codes-in-books.patch +++ b/patches/server/0073-Allow-color-codes-in-books.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 112d830b024bd67297d24c030e7f02450be5eecf..9ec106d3e550eba93ca154094a3b51aa42732d88 100644 +index ca23fe56e7ccc0ee4fcb8bb2c801dd0360b92e8a..f85084bde6f29a8ecd3d660e55916874f8b7d38b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1341,13 +1341,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0075-Entity-lifespan.patch b/patches/server/0074-Entity-lifespan.patch similarity index 98% rename from patches/server/0075-Entity-lifespan.patch rename to patches/server/0074-Entity-lifespan.patch index 97c82c51e..7fa162000 100644 --- a/patches/server/0075-Entity-lifespan.patch +++ b/patches/server/0074-Entity-lifespan.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9ec106d3e550eba93ca154094a3b51aa42732d88..2cc00ca01f40e1509d82bfb18ddc8c17ab816e2e 100644 +index f85084bde6f29a8ecd3d660e55916874f8b7d38b..4ddd14db772f003f603a4965166a3f939327e330 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2854,6 +2854,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0076-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0075-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 100% rename from patches/server/0076-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0075-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch diff --git a/patches/server/0077-Squid-EAR-immunity.patch b/patches/server/0076-Squid-EAR-immunity.patch similarity index 96% rename from patches/server/0077-Squid-EAR-immunity.patch rename to patches/server/0076-Squid-EAR-immunity.patch index b68c28f3b..4ce19dc0f 100644 --- a/patches/server/0077-Squid-EAR-immunity.patch +++ b/patches/server/0076-Squid-EAR-immunity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Squid EAR immunity diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2cbab8dc920fff0d1573072b791f39debd61a710..6b2a2b898d8a4b75f7c9d1ec7112e4f748413e95 100644 +index 8a0d0406440a43683641dcd6e43f75da5db9c734..b7e811c786db1a4749acdc9309f841e6f1d615e5 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1455,6 +1455,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0078-Phantoms-burn-in-light.patch b/patches/server/0077-Phantoms-burn-in-light.patch similarity index 98% rename from patches/server/0078-Phantoms-burn-in-light.patch rename to patches/server/0077-Phantoms-burn-in-light.patch index 0fb936ebe..6c76fd230 100644 --- a/patches/server/0078-Phantoms-burn-in-light.patch +++ b/patches/server/0077-Phantoms-burn-in-light.patch @@ -53,7 +53,7 @@ index fd02dfb905c71fa10e0830cf0a02d4b63b81f23f..b601c542e28bc0a588e56aa37c243fe9 list.sort(Comparator.comparing((Entity e) -> { return e.getY(); }).reversed()); // CraftBukkit - decompile error Iterator iterator = list.iterator(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 6b2a2b898d8a4b75f7c9d1ec7112e4f748413e95..99866d1ddf31dd231c2b097716e4f1d7300e0680 100644 +index b7e811c786db1a4749acdc9309f841e6f1d615e5..a33efd04ed2f0dc61d889062221e8138fa9ae0b1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1125,6 +1125,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0079-Configurable-villager-breeding.patch b/patches/server/0078-Configurable-villager-breeding.patch similarity index 95% rename from patches/server/0079-Configurable-villager-breeding.patch rename to patches/server/0078-Configurable-villager-breeding.patch index f6ee9fdaf..7db507aec 100644 --- a/patches/server/0079-Configurable-villager-breeding.patch +++ b/patches/server/0078-Configurable-villager-breeding.patch @@ -18,7 +18,7 @@ index 979bbbf4229a9355b31913454cb565fc98049911..aa95cd7e04e25dec63c172d219f1f16c private boolean hungry() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 99866d1ddf31dd231c2b097716e4f1d7300e0680..992b4fd09aeb6ef23310b1351b8dec38e4527c8d 100644 +index a33efd04ed2f0dc61d889062221e8138fa9ae0b1..c50c47c88bdf1bf1c613172970e346f81e18d142 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1613,6 +1613,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0080-Redstone-deactivates-spawners.patch b/patches/server/0079-Redstone-deactivates-spawners.patch similarity index 94% rename from patches/server/0080-Redstone-deactivates-spawners.patch rename to patches/server/0079-Redstone-deactivates-spawners.patch index 2d04279f3..3d727302e 100644 --- a/patches/server/0080-Redstone-deactivates-spawners.patch +++ b/patches/server/0079-Redstone-deactivates-spawners.patch @@ -17,7 +17,7 @@ index 31ac0e5ca26c7bdfa9b710d0bb78d846ddf6863e..feb65fc9ee04141fe6f77400660442ed } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 992b4fd09aeb6ef23310b1351b8dec38e4527c8d..4be13340ff4de6205b0e35f60e785ad458d7539c 100644 +index c50c47c88bdf1bf1c613172970e346f81e18d142..4e2f77ca0587ea3328e958c5a0583d4abec6221c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -363,6 +363,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0081-Totems-work-in-inventory.patch b/patches/server/0080-Totems-work-in-inventory.patch similarity index 93% rename from patches/server/0081-Totems-work-in-inventory.patch rename to patches/server/0080-Totems-work-in-inventory.patch index 367f92230..e8503ac1e 100644 --- a/patches/server/0081-Totems-work-in-inventory.patch +++ b/patches/server/0080-Totems-work-in-inventory.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e41d27f486c5efa1269822c177bc2f1214d27b58..91d4f504b3f2992c8d98b8d75504229101816139 100644 +index 587a88a0c4954cba28fbdb31228ec81f2ba59b82..f7e95a73f60d06a102f79677bb0e31bf9532894d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1551,6 +1551,18 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -28,7 +28,7 @@ index e41d27f486c5efa1269822c177bc2f1214d27b58..91d4f504b3f2992c8d98b8d755042291 EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot); event.setCancelled(itemstack == null); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4be13340ff4de6205b0e35f60e785ad458d7539c..e683f958f1d2afca87b7e337d04151b7aba35efb 100644 +index 4e2f77ca0587ea3328e958c5a0583d4abec6221c..af181872d94ae506bb17589bc7b6d6f511dcefe2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -247,6 +247,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0082-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0081-Add-vindicator-johnny-spawn-chance.patch similarity index 96% rename from patches/server/0082-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0081-Add-vindicator-johnny-spawn-chance.patch index e8cf232b0..fa0702f6b 100644 --- a/patches/server/0082-Add-vindicator-johnny-spawn-chance.patch +++ b/patches/server/0081-Add-vindicator-johnny-spawn-chance.patch @@ -22,7 +22,7 @@ index 0a4f7125c38d3138ec8eedec4ca72000f25ba6ac..29039b35c60c7c6370c6593a53b8aa2a } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e683f958f1d2afca87b7e337d04151b7aba35efb..5fd70f3cb91fa4f965f829a354155f5d075f485f 100644 +index af181872d94ae506bb17589bc7b6d6f511dcefe2..fc5c24f00639dd5d9bfd05c5ba768b4129598944 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1640,6 +1640,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0083-Add-option-to-disable-certain-block-updates.patch b/patches/server/0082-Add-option-to-disable-certain-block-updates.patch similarity index 100% rename from patches/server/0083-Add-option-to-disable-certain-block-updates.patch rename to patches/server/0082-Add-option-to-disable-certain-block-updates.patch diff --git a/patches/server/0084-Dispensers-place-anvils-option.patch b/patches/server/0083-Dispensers-place-anvils-option.patch similarity index 96% rename from patches/server/0084-Dispensers-place-anvils-option.patch rename to patches/server/0083-Dispensers-place-anvils-option.patch index 38976a2c8..5cedbecdb 100644 --- a/patches/server/0084-Dispensers-place-anvils-option.patch +++ b/patches/server/0083-Dispensers-place-anvils-option.patch @@ -41,7 +41,7 @@ index 9598aa381978194fee859721731196f0e6ee08fc..2db46452d374f9b53db7bd80be5fbd9c static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5fd70f3cb91fa4f965f829a354155f5d075f485f..994b43f68127ab6f10e86efa079f0f833be352be 100644 +index fc5c24f00639dd5d9bfd05c5ba768b4129598944..9f40c3ec5c3d87f8090c25317148231a22064795 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -321,8 +321,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0085-Allow-anvil-colors.patch b/patches/server/0084-Allow-anvil-colors.patch similarity index 98% rename from patches/server/0085-Allow-anvil-colors.patch rename to patches/server/0084-Allow-anvil-colors.patch index 586720fc3..10d36653c 100644 --- a/patches/server/0085-Allow-anvil-colors.patch +++ b/patches/server/0084-Allow-anvil-colors.patch @@ -64,7 +64,7 @@ index 8475a8514b39d543cc7cf0dbfef6d2aabb6127d0..2281dba58d32b6314a7abcdb103c03c7 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 994b43f68127ab6f10e86efa079f0f833be352be..c336b4df270b324e6ef8a897c8cafcfd7d0c9c7d 100644 +index 9f40c3ec5c3d87f8090c25317148231a22064795..c5c975f4ebc04f12e40f2e1c9a8ca5aa37ec141a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -299,6 +299,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0086-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0085-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 95% rename from patches/server/0086-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0085-Add-option-to-disable-dolphin-treasure-searching.patch index d3c2dee01..877b6fcc2 100644 --- a/patches/server/0086-Add-option-to-disable-dolphin-treasure-searching.patch +++ b/patches/server/0085-Add-option-to-disable-dolphin-treasure-searching.patch @@ -17,7 +17,7 @@ index 0accc5595461ce92259e3f819a9837aabd442d77..3b65375703732966d0fcbbb68ba0805e } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c336b4df270b324e6ef8a897c8cafcfd7d0c9c7d..d21b1d357cb9a9fd008b86d3c067cc8649ffbdec 100644 +index c5c975f4ebc04f12e40f2e1c9a8ca5aa37ec141a..fa07216c52848c957871a8884e844d6534aa6c66 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -612,6 +612,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0087-Short-enderman-height.patch b/patches/server/0086-Short-enderman-height.patch similarity index 100% rename from patches/server/0087-Short-enderman-height.patch rename to patches/server/0086-Short-enderman-height.patch diff --git a/patches/server/0088-Stop-squids-floating-on-top-of-water.patch b/patches/server/0087-Stop-squids-floating-on-top-of-water.patch similarity index 95% rename from patches/server/0088-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0087-Stop-squids-floating-on-top-of-water.patch index 96bc77079..7fdc27442 100644 --- a/patches/server/0088-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0087-Stop-squids-floating-on-top-of-water.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7b9f92b3e42146ac33fd72ca943ed91fba4992ad..e157763e945660ca15c4f2371edbf7cda68022c8 100644 +index 2c624a1779ada0c89ce0eb13234a4924bb16b9e4..7f90a35652f543f68773309208bfa8ae727abdd0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4224,6 +4224,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -54,7 +54,7 @@ index ffc76354ead6937daf366c3d87bcb51d3e4c47f5..5b98d42b5d6bc07265fbb017e51a6281 + // Purpur } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d21b1d357cb9a9fd008b86d3c067cc8649ffbdec..404300394bf9e4e7ff43cae3c39e8898382e5ac0 100644 +index fa07216c52848c957871a8884e844d6534aa6c66..1d53cf3ff8a7695e609e236e091f5e7259700678 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1480,6 +1480,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0089-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0088-Crying-obsidian-valid-for-portal-frames.patch similarity index 100% rename from patches/server/0089-Crying-obsidian-valid-for-portal-frames.patch rename to patches/server/0088-Crying-obsidian-valid-for-portal-frames.patch diff --git a/patches/server/0090-Entities-can-use-portals-configuration.patch b/patches/server/0089-Entities-can-use-portals-configuration.patch similarity index 94% rename from patches/server/0090-Entities-can-use-portals-configuration.patch rename to patches/server/0089-Entities-can-use-portals-configuration.patch index ec6e7d498..37e8d9978 100644 --- a/patches/server/0090-Entities-can-use-portals-configuration.patch +++ b/patches/server/0089-Entities-can-use-portals-configuration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ac6d250f143ea0198a823f2c24166bfa891adfe9..d3d920d647168c8c7445f526726736d454ccaffc 100644 +index 7f90a35652f543f68773309208bfa8ae727abdd0..adb5f4fa1f1f4ec3180da4f8ad0a322eaa47f9ac 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2940,7 +2940,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -27,7 +27,7 @@ index ac6d250f143ea0198a823f2c24166bfa891adfe9..d3d920d647168c8c7445f526726736d4 public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 404300394bf9e4e7ff43cae3c39e8898382e5ac0..c68801aa022a59155d37bb8a930a5cbef4b91dfa 100644 +index 1d53cf3ff8a7695e609e236e091f5e7259700678..8be52e5cd16bcfae3b714cd8ec865e5036a3e631 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -100,6 +100,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0091-LivingEntity-broadcastItemBreak.patch b/patches/server/0090-LivingEntity-broadcastItemBreak.patch similarity index 100% rename from patches/server/0091-LivingEntity-broadcastItemBreak.patch rename to patches/server/0090-LivingEntity-broadcastItemBreak.patch diff --git a/patches/server/0092-Customizable-wither-health-and-healing.patch b/patches/server/0091-Customizable-wither-health-and-healing.patch similarity index 96% rename from patches/server/0092-Customizable-wither-health-and-healing.patch rename to patches/server/0091-Customizable-wither-health-and-healing.patch index 9f62911af..3544c0b8a 100644 --- a/patches/server/0092-Customizable-wither-health-and-healing.patch +++ b/patches/server/0091-Customizable-wither-health-and-healing.patch @@ -23,7 +23,7 @@ index 864ebffb6c903acb9de5594029838b927eea4318..b22d0af2267581467af9a4d0e8104146 this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth()); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c68801aa022a59155d37bb8a930a5cbef4b91dfa..146dfeddb9572eb017e137656c849dcd15162db8 100644 +index 8be52e5cd16bcfae3b714cd8ec865e5036a3e631..307f03cc8af263f851d7d6054337b4de84a9f7d4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1719,6 +1719,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0093-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0092-Allow-toggling-special-MobSpawners-per-world.patch similarity index 96% rename from patches/server/0093-Allow-toggling-special-MobSpawners-per-world.patch rename to patches/server/0092-Allow-toggling-special-MobSpawners-per-world.patch index 539027e05..4560a1ded 100644 --- a/patches/server/0093-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0092-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/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a7c153f957af48cf42ecbb01ada5f8f384c4e5e4..5a6c5972f6044cc4bda46259679d7ca19f2d7704 100644 +index 575be84b580f7d7f4968bc4e2a69e0a067a3a617..9807f610aca29d6882bb5314a30161727dfe7c34 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -543,7 +543,24 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -59,7 +59,7 @@ index 5d199fe497bd852827d3d18fb7566a09e70331a3..6cd8a50289a6404441e9e5e08d82d2eb if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) { blockposition1 = blockposition2; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 146dfeddb9572eb017e137656c849dcd15162db8..dd70c75ef196dec6e3c781695240fb74fbbf48c7 100644 +index 307f03cc8af263f851d7d6054337b4de84a9f7d4..ead2c290915b247fa5a430bfff6d2adac9af6119 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -71,6 +71,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0094-Raid-cooldown-setting.patch b/patches/server/0093-Raid-cooldown-setting.patch similarity index 97% rename from patches/server/0094-Raid-cooldown-setting.patch rename to patches/server/0093-Raid-cooldown-setting.patch index ed503ad01..270a6128a 100644 --- a/patches/server/0094-Raid-cooldown-setting.patch +++ b/patches/server/0093-Raid-cooldown-setting.patch @@ -49,7 +49,7 @@ index fabce3bc592b1b172b227395a07febdbb66ec3c9..df48bcc8f329e3855bb7426bdfe0e3c7 if (!this.raidMap.containsKey(raid.getId())) { this.raidMap.put(raid.getId(), raid); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index dd70c75ef196dec6e3c781695240fb74fbbf48c7..f5e89d6193b4bb032355571320fbc56fd1ef934b 100644 +index ead2c290915b247fa5a430bfff6d2adac9af6119..d62f275ab355b1ff559f7a770b4c5c428b46e008 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -111,6 +111,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0095-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0094-Despawn-rate-config-options-per-projectile-type.patch similarity index 96% rename from patches/server/0095-Despawn-rate-config-options-per-projectile-type.patch rename to patches/server/0094-Despawn-rate-config-options-per-projectile-type.patch index fa109836b..36a0f2137 100644 --- a/patches/server/0095-Despawn-rate-config-options-per-projectile-type.patch +++ b/patches/server/0094-Despawn-rate-config-options-per-projectile-type.patch @@ -7,7 +7,7 @@ This patch's implementation has been removed in favor of Pufferfish's entity-tim The config remains for migration purposes. diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f5e89d6193b4bb032355571320fbc56fd1ef934b..8b7da9f1e1c073b1cf93aa403aadf0b42da9a1e6 100644 +index d62f275ab355b1ff559f7a770b4c5c428b46e008..bc326cb023feae60e1341939550de549ca6365bd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -292,6 +292,39 @@ public class PurpurWorldConfig { diff --git a/patches/server/0096-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0095-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 98% rename from patches/server/0096-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/server/0095-Add-option-to-disable-zombie-aggressiveness-towards-.patch index 3d976364e..f83a0dcab 100644 --- a/patches/server/0096-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/server/0095-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -71,7 +71,7 @@ index fb41431f25081c8ca0cf03dc5128f78f589e4e26..ebeeb8c31d05a0ad2e291599a0b6ebe1 this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR)); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8b7da9f1e1c073b1cf93aa403aadf0b42da9a1e6..9c0b696ed17ea75831419c9e1102215b2e60ff34 100644 +index bc326cb023feae60e1341939550de549ca6365bd..d5d83c8a79cca8d8216b24c7116c7c475924d104 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1852,6 +1852,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0097-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0096-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/server/0097-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/server/0096-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/server/0098-Flying-squids-Oh-my.patch b/patches/server/0097-Flying-squids-Oh-my.patch similarity index 97% rename from patches/server/0098-Flying-squids-Oh-my.patch rename to patches/server/0097-Flying-squids-Oh-my.patch index 21df497e0..021840f2b 100644 --- a/patches/server/0098-Flying-squids-Oh-my.patch +++ b/patches/server/0097-Flying-squids-Oh-my.patch @@ -58,7 +58,7 @@ index de1bf4aea2661763948aba01d93e7685f3ef73cb..c396874d24ae535b4c07649e303e60b7 float f1 = Mth.cos(f) * 0.2F; float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9c0b696ed17ea75831419c9e1102215b2e60ff34..e279df79e3ce5a12205c45c611e252bfaa6ffbdb 100644 +index d5d83c8a79cca8d8216b24c7116c7c475924d104..18baed72b56398846a76229bbc46638125cb82f8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -904,10 +904,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0099-Infinity-bow-settings.patch b/patches/server/0098-Infinity-bow-settings.patch similarity index 97% rename from patches/server/0099-Infinity-bow-settings.patch rename to patches/server/0098-Infinity-bow-settings.patch index 95728d2ab..ffdae9e60 100644 --- a/patches/server/0099-Infinity-bow-settings.patch +++ b/patches/server/0098-Infinity-bow-settings.patch @@ -27,7 +27,7 @@ index 08d597db1a5345a343777a01427655e6bf2c926b..33df0ca406dc8321b76b393f317bbd1c } else { user.startUsingItem(hand); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e279df79e3ce5a12205c45c611e252bfaa6ffbdb..7853ce4653b379d1510e62bec0d784620e9e5347 100644 +index 18baed72b56398846a76229bbc46638125cb82f8..7b212f784be68e737197a3a16b4cdee1c45e42a6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -142,6 +142,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0100-Configurable-daylight-cycle.patch b/patches/server/0099-Configurable-daylight-cycle.patch similarity index 95% rename from patches/server/0100-Configurable-daylight-cycle.patch rename to patches/server/0099-Configurable-daylight-cycle.patch index 8975bf640..5580b51dc 100644 --- a/patches/server/0100-Configurable-daylight-cycle.patch +++ b/patches/server/0099-Configurable-daylight-cycle.patch @@ -18,7 +18,7 @@ index 9ec6145fe04ec64bbee8ec6a837719caebdbc6f5..358d610ad020cada1bb83e393deeeaae public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) { this.gameTime = time; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 585b5cd7361c01157ba279f21fea05e990738e34..371de53f342e6dba7da54a6d60c1907f06fa9191 100644 +index 65ba915d3644b638ce3b5314c0aed5b2018f67e0..52487bc86a28a2f2c1c677b07c9fec77685f2af0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1522,7 +1522,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop recipe, NonNullList slots, int count) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 1faa69be3acd182d9c7d676b05c820ab1b6eff06..8b80282e3816dacb428ee08acd1a5cb034a75457 100644 +index 3f0f7264aef8942d82f8d12ccf9bc48c72104ab5..f607e8fc2bc998c93f86f01dbb556f960825489e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -415,6 +415,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0103-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0102-Arrows-should-not-reset-despawn-counter.patch similarity index 95% rename from patches/server/0103-Arrows-should-not-reset-despawn-counter.patch rename to patches/server/0102-Arrows-should-not-reset-despawn-counter.patch index 3ac3108db..fc65e301e 100644 --- a/patches/server/0103-Arrows-should-not-reset-despawn-counter.patch +++ b/patches/server/0102-Arrows-should-not-reset-despawn-counter.patch @@ -20,7 +20,7 @@ index 5d6d26cfe8f0ab68a3145214b3fc126ca7a71a66..1ea5664e1e7dc73cbd2d1cc38c830a19 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8b80282e3816dacb428ee08acd1a5cb034a75457..9569c51ceffe45931211353893c56fe896bac952 100644 +index f607e8fc2bc998c93f86f01dbb556f960825489e..70911b0e8c47d505e43e11e5d29da150afb19272 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -103,6 +103,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0104-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0103-Ability-to-re-add-farmland-mechanics-from-Alpha.patch similarity index 95% rename from patches/server/0104-Ability-to-re-add-farmland-mechanics-from-Alpha.patch rename to patches/server/0103-Ability-to-re-add-farmland-mechanics-from-Alpha.patch index 4037302c3..3bd1fb88a 100644 --- a/patches/server/0104-Ability-to-re-add-farmland-mechanics-from-Alpha.patch +++ b/patches/server/0103-Ability-to-re-add-farmland-mechanics-from-Alpha.patch @@ -24,7 +24,7 @@ index fce9ebcaaac18ecee24c7091ea77a32ac567762e..8725ca6eec1becc401951a746a90f678 return; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9569c51ceffe45931211353893c56fe896bac952..cc6ba8be24f9ac5c08a17dff9f22ae9c0159a54c 100644 +index 70911b0e8c47d505e43e11e5d29da150afb19272..00e4930d899b547f4a410fae3bc91dfe16259ed6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -416,8 +416,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0105-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0104-Add-adjustable-breeding-cooldown-to-config.patch similarity index 98% rename from patches/server/0105-Add-adjustable-breeding-cooldown-to-config.patch rename to patches/server/0104-Add-adjustable-breeding-cooldown-to-config.patch index ebd7e1121..0470f2055 100644 --- a/patches/server/0105-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0104-Add-adjustable-breeding-cooldown-to-config.patch @@ -95,7 +95,7 @@ index d0e0ce953dd0cdd6b54bb00224e82dca62f793cd..52d2fa575a29ec36280bb4dbcab6954a this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cc6ba8be24f9ac5c08a17dff9f22ae9c0159a54c..94e2fe3e094b2519d4a12ff653e5041b4f93b94c 100644 +index 00e4930d899b547f4a410fae3bc91dfe16259ed6..f3e623890c29726d2bfa7713ab5183a788664ed7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -117,6 +117,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0106-Make-entity-breeding-times-configurable.patch b/patches/server/0105-Make-entity-breeding-times-configurable.patch similarity index 99% rename from patches/server/0106-Make-entity-breeding-times-configurable.patch rename to patches/server/0105-Make-entity-breeding-times-configurable.patch index 22152e6cf..fc54f0aab 100644 --- a/patches/server/0106-Make-entity-breeding-times-configurable.patch +++ b/patches/server/0105-Make-entity-breeding-times-configurable.patch @@ -477,7 +477,7 @@ index e818bd705b03aa1fedfd981ec44c9b8267c67a00..b56db8da5002bd18552fbc5a96a74fbd public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java -index 30ff9967aa19a9e77bdf7d32e494276b1b72ab72..f5d2f12c2a95c274823ec37ac1c14a54a48a9cdc 100644 +index f27c71fbcebce21b0cde8375a476a0d19b6c2ae4..a34f41878bffa7bbe01310be95bf4bc6711cc0ef 100644 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java @@ -101,6 +101,11 @@ public class Sniffer extends Animal { @@ -525,7 +525,7 @@ index b855647ebd374e4d01e90b78a5d650ceab85173d..6e8715bf332826c8326c00c5288e2402 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 94e2fe3e094b2519d4a12ff653e5041b4f93b94c..901fc6601b9e0cb25e9641de9e14755b12c6297d 100644 +index f3e623890c29726d2bfa7713ab5183a788664ed7..c2651f1a01a1ae04b937316671bc16a33b6c9b8e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -512,10 +512,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0107-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0106-Apply-display-names-from-item-forms-of-entities-to-e.patch similarity index 99% rename from patches/server/0107-Apply-display-names-from-item-forms-of-entities-to-e.patch rename to patches/server/0106-Apply-display-names-from-item-forms-of-entities-to-e.patch index 5ba02c8f7..193e340e1 100644 --- a/patches/server/0107-Apply-display-names-from-item-forms-of-entities-to-e.patch +++ b/patches/server/0106-Apply-display-names-from-item-forms-of-entities-to-e.patch @@ -136,7 +136,7 @@ index b2ad6d230de2c29f371178bccde1111c7532ee70..6667926519a0f1c151e53f59cce36e74 if (((HangingEntity) object).survives()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 901fc6601b9e0cb25e9641de9e14755b12c6297d..09aff91bb1609b4ec91a16a3843839269eb536e0 100644 +index c2651f1a01a1ae04b937316671bc16a33b6c9b8e..dfd60520c7924e4258d1a481fc1f72ff182ed6b9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -99,8 +99,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0108-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0107-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch similarity index 96% rename from patches/server/0108-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch rename to patches/server/0107-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch index 1bceff4db..1c38ef278 100644 --- a/patches/server/0108-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch +++ b/patches/server/0107-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch @@ -17,7 +17,7 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155 ((Mob) newEntityLiving).setPersistenceRequired(); // Paper end diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 09aff91bb1609b4ec91a16a3843839269eb536e0..a0f05155f761941de87710d5c7846b878eb86ec7 100644 +index dfd60520c7924e4258d1a481fc1f72ff182ed6b9..c5c02479efbe1531f7b86bfd18e86f6fff7e27fe 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -100,9 +100,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0109-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0108-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch similarity index 96% rename from patches/server/0109-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch rename to patches/server/0108-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch index 5c0cd13fe..f6b2bf3cd 100644 --- a/patches/server/0109-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch +++ b/patches/server/0108-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch @@ -21,7 +21,7 @@ index d8123aa5585cb4c0cc1210ced04fdf08f731fdb2..757aa2e3fa1c4608f07adbff0f718ad8 private static class EndermanFreezeWhenLookedAt extends Goal { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a0f05155f761941de87710d5c7846b878eb86ec7..8410a3c5f13b94b096d1d544690abe684595df9b 100644 +index c5c02479efbe1531f7b86bfd18e86f6fff7e27fe..2d63b6de58149bd160d8455becbf224757cb3baf 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -835,6 +835,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0110-Add-configurable-snowball-damage.patch b/patches/server/0109-Add-configurable-snowball-damage.patch similarity index 95% rename from patches/server/0110-Add-configurable-snowball-damage.patch rename to patches/server/0109-Add-configurable-snowball-damage.patch index dba5d181e..2b38794d4 100644 --- a/patches/server/0110-Add-configurable-snowball-damage.patch +++ b/patches/server/0109-Add-configurable-snowball-damage.patch @@ -18,7 +18,7 @@ index 6cded52e4627c2b6073fa221fc6d6583f1b2a96d..5827236f351cd0679af764644bb22bb2 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8410a3c5f13b94b096d1d544690abe684595df9b..5e1bfa72f902fb24dd67a973b4ef4b202d803269 100644 +index 2d63b6de58149bd160d8455becbf224757cb3baf..c9559508d8962b891b5aca3a7ee1138b935a078b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -356,6 +356,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0111-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0110-Changeable-Mob-Left-Handed-Chance.patch similarity index 95% rename from patches/server/0111-Changeable-Mob-Left-Handed-Chance.patch rename to patches/server/0110-Changeable-Mob-Left-Handed-Chance.patch index 3227912bd..15c67ecf9 100644 --- a/patches/server/0111-Changeable-Mob-Left-Handed-Chance.patch +++ b/patches/server/0110-Changeable-Mob-Left-Handed-Chance.patch @@ -18,7 +18,7 @@ index 183261a031a2a0b6b95dbb983236cee3cd3a0398..9dae07b1f1e18cbc86d64e5f793a5eb1 } else { this.setLeftHanded(false); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5e1bfa72f902fb24dd67a973b4ef4b202d803269..1b19d4cd80166420a9a7918bd96cf39d5616b439 100644 +index c9559508d8962b891b5aca3a7ee1138b935a078b..a673ae630a0551fb242d920470c9165f4531f5fb 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -158,8 +158,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0112-Add-boat-fall-damage-config.patch b/patches/server/0111-Add-boat-fall-damage-config.patch similarity index 94% rename from patches/server/0112-Add-boat-fall-damage-config.patch rename to patches/server/0111-Add-boat-fall-damage-config.patch index 4a0e66c45..53b5c2d27 100644 --- a/patches/server/0112-Add-boat-fall-damage-config.patch +++ b/patches/server/0111-Add-boat-fall-damage-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8b113b7ac096e6237577685a4f1961a757a5b7fa..ead34927019224e76063ac1a040dea78022fb36a 100644 +index 81f9b830df5cec8c5748027b09fe97a5a47bb1c7..dc1cffa39659505f44ee81a38066c274fda09a43 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1069,7 +1069,16 @@ public class ServerPlayer extends Player { @@ -27,7 +27,7 @@ index 8b113b7ac096e6237577685a4f1961a757a5b7fa..ead34927019224e76063ac1a040dea78 if (!flag && isSpawnInvulnerable() && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) { // Purpur diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 1b19d4cd80166420a9a7918bd96cf39d5616b439..57c460b7fff28dd5e9538e4f96cefee12eb0e2c2 100644 +index a673ae630a0551fb242d920470c9165f4531f5fb..780c094431e8206a7cd42b1f0bdfb098c1af8af2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -114,6 +114,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0113-Snow-Golem-rate-of-fire-config.patch b/patches/server/0112-Snow-Golem-rate-of-fire-config.patch similarity index 97% rename from patches/server/0113-Snow-Golem-rate-of-fire-config.patch rename to patches/server/0112-Snow-Golem-rate-of-fire-config.patch index 8e7a27018..81503ae5d 100644 --- a/patches/server/0113-Snow-Golem-rate-of-fire-config.patch +++ b/patches/server/0112-Snow-Golem-rate-of-fire-config.patch @@ -23,7 +23,7 @@ index 6c6e020522261ca5bbc47a59c25d3e98bf0b4007..30abf3ee1b9d3aef9291076a1f0bf865 this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F)); this.goalSelector.addGoal(4, new RandomLookAroundGoal(this)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a79b5fcfdee45cca589a13c470b9fc83a750980c..96385e4294a990c75d059416f66a6243db103d52 100644 +index 780c094431e8206a7cd42b1f0bdfb098c1af8af2..496b797910b1248662289fab16ed5fa3390d0c4d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1607,6 +1607,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0114-EMC-Configurable-disable-give-dropping.patch b/patches/server/0113-EMC-Configurable-disable-give-dropping.patch similarity index 100% rename from patches/server/0114-EMC-Configurable-disable-give-dropping.patch rename to patches/server/0113-EMC-Configurable-disable-give-dropping.patch diff --git a/patches/server/0115-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 99% rename from patches/server/0115-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to patches/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index 8f6adfcd8..cb2f675a3 100644 --- a/patches/server/0115-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -181,7 +181,7 @@ index ac70c2c03241e73943bd517a8c69dd05e0873634..0318663a824d2a9515f867a075d148c3 public static final VillagerProfession FISHERMAN = register("fisherman", PoiTypes.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN); public static final VillagerProfession FLETCHER = register("fletcher", PoiTypes.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 96385e4294a990c75d059416f66a6243db103d52..bb40cbe7be6fa07f8e4e44eed3f3b485b7eea5f1 100644 +index 496b797910b1248662289fab16ed5fa3390d0c4d..1ffdd96306b525f217a630b4f8f05e16c0e8b7cd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1810,6 +1810,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0116-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0115-Toggle-for-Zombified-Piglin-death-always-counting-as.patch similarity index 97% rename from patches/server/0116-Toggle-for-Zombified-Piglin-death-always-counting-as.patch rename to patches/server/0115-Toggle-for-Zombified-Piglin-death-always-counting-as.patch index 07c2931f6..c70a6f87b 100644 --- a/patches/server/0116-Toggle-for-Zombified-Piglin-death-always-counting-as.patch +++ b/patches/server/0115-Toggle-for-Zombified-Piglin-death-always-counting-as.patch @@ -35,7 +35,7 @@ index f2c690c92dd2bf55f986f629ed79b76fbdfa32a4..6e8f0c9df06e2930084a6d58213f6edf } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index bb40cbe7be6fa07f8e4e44eed3f3b485b7eea5f1..8e6a803eaba8a3fb2ed2c37266cb5ea12a212a7f 100644 +index 1ffdd96306b525f217a630b4f8f05e16c0e8b7cd..86d033f990e19c80db0209aacd0a60a506a6e607 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2054,6 +2054,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0117-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0116-Configurable-chance-for-wolves-to-spawn-rabid.patch similarity index 99% rename from patches/server/0117-Configurable-chance-for-wolves-to-spawn-rabid.patch rename to patches/server/0116-Configurable-chance-for-wolves-to-spawn-rabid.patch index 63fb54850..31ac804f2 100644 --- a/patches/server/0117-Configurable-chance-for-wolves-to-spawn-rabid.patch +++ b/patches/server/0116-Configurable-chance-for-wolves-to-spawn-rabid.patch @@ -222,7 +222,7 @@ index e43fd3e59fd8c74828ae65965fade27f56beef65..b2f133c8baabba1cffa6e92ea0f85453 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8e6a803eaba8a3fb2ed2c37266cb5ea12a212a7f..8ce6573ab423c955d38ad0ab764d307e5144e8c7 100644 +index 86d033f990e19c80db0209aacd0a60a506a6e607..a6fbccd217af50fa3abfe703de7e9e9894916f40 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1939,6 +1939,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0118-Configurable-default-collar-color.patch b/patches/server/0117-Configurable-default-collar-color.patch similarity index 97% rename from patches/server/0118-Configurable-default-collar-color.patch rename to patches/server/0117-Configurable-default-collar-color.patch index e858b3063..ced610109 100644 --- a/patches/server/0118-Configurable-default-collar-color.patch +++ b/patches/server/0117-Configurable-default-collar-color.patch @@ -43,7 +43,7 @@ index 079d41636f1420a8755442843f1843e397cdbbf9..214d5d27f8c4f352839c1a45a083c329 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8ce6573ab423c955d38ad0ab764d307e5144e8c7..ec1662fcc6a22f670644a82d16ea5200a2f07205 100644 +index a6fbccd217af50fa3abfe703de7e9e9894916f40..38dbd6ff79fe1e1f5e4abb8ca57548ff6f46e60a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -623,6 +623,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0119-Phantom-flames-on-swoop.patch b/patches/server/0118-Phantom-flames-on-swoop.patch similarity index 95% rename from patches/server/0119-Phantom-flames-on-swoop.patch rename to patches/server/0118-Phantom-flames-on-swoop.patch index 7bdd51184..66471c006 100644 --- a/patches/server/0119-Phantom-flames-on-swoop.patch +++ b/patches/server/0118-Phantom-flames-on-swoop.patch @@ -17,7 +17,7 @@ index b601c542e28bc0a588e56aa37c243fe92145547e..ed5c75d390babced3dc062428176e968 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ec1662fcc6a22f670644a82d16ea5200a2f07205..39a31ab49d6b8eeac6df8fb86faee4bde1f519f7 100644 +index 38dbd6ff79fe1e1f5e4abb8ca57548ff6f46e60a..b77cc1019396f8fa63baf9aad81227ff7452400d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1301,6 +1301,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0120-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0119-Option-for-chests-to-open-even-with-a-solid-block-on.patch similarity index 94% rename from patches/server/0120-Option-for-chests-to-open-even-with-a-solid-block-on.patch rename to patches/server/0119-Option-for-chests-to-open-even-with-a-solid-block-on.patch index e4dd41d87..d18c688e0 100644 --- a/patches/server/0120-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0119-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -17,7 +17,7 @@ index 5e22d175b1048a58802cdf64ac70a8b56329e915..d81946b400f208c39941128ce823ff77 return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 39a31ab49d6b8eeac6df8fb86faee4bde1f519f7..6d5571112fb8e13291121cd0942230996be58224 100644 +index b77cc1019396f8fa63baf9aad81227ff7452400d..bcb384761d4ad7abb6624d78e501084817c678e0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -425,6 +425,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0121-Implement-TPSBar.patch b/patches/server/0120-Implement-TPSBar.patch similarity index 99% rename from patches/server/0121-Implement-TPSBar.patch rename to patches/server/0120-Implement-TPSBar.patch index 3a7cdde23..9aa4a7229 100644 --- a/patches/server/0121-Implement-TPSBar.patch +++ b/patches/server/0120-Implement-TPSBar.patch @@ -156,7 +156,7 @@ index 126eb32d182b78b07add872aad6a821334639662..5b0625955e2a65f689c8a128d73170bc public static boolean enderChestPermissionRows = false; diff --git a/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java b/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..7c367d17fa843d4d7562d05780ecffd47400fc13 +index 0000000000000000000000000000000000000000..1ac51b238569bb825f8b3f7696164492c536ff76 --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/command/TPSBarCommand.java @@ -0,0 +1,43 @@ @@ -180,12 +180,12 @@ index 0000000000000000000000000000000000000000..7c367d17fa843d4d7562d05780ecffd4 +public class TPSBarCommand { + public static void register(CommandDispatcher dispatcher) { + dispatcher.register(Commands.literal("tpsbar") -+ .requires(listener -> listener.hasPermission(2)) ++ .requires(listener -> listener.hasPermission(2, "bukkit.command.tpsbar")) + .executes(context -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException()))) + .then(Commands.argument("targets", EntityArgument.players()) + .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets"))) + ) -+ ).setPermission("bukkit.command.tpsbar"); ++ ); + } + + private static int execute(CommandSourceStack sender, Collection targets) { diff --git a/patches/server/0122-Striders-give-saddle-back.patch b/patches/server/0121-Striders-give-saddle-back.patch similarity index 96% rename from patches/server/0122-Striders-give-saddle-back.patch rename to patches/server/0121-Striders-give-saddle-back.patch index ed5fd2999..0bc1954a4 100644 --- a/patches/server/0122-Striders-give-saddle-back.patch +++ b/patches/server/0121-Striders-give-saddle-back.patch @@ -29,7 +29,7 @@ index 1be6dc3608b839b0ed7d2fcd968991ce5bbeb89b..270135cb5a5f50b39683f74da84045ea if (!this.level.isClientSide) { player.startRiding(this); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 6d5571112fb8e13291121cd0942230996be58224..4f2416691bea7b53166d7d8448f57019147e1629 100644 +index bcb384761d4ad7abb6624d78e501084817c678e0..c877d28640ad083ef4d117b7c2deecbed3bcc12a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1713,6 +1713,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0123-PlayerBookTooLargeEvent.patch b/patches/server/0122-PlayerBookTooLargeEvent.patch similarity index 96% rename from patches/server/0123-PlayerBookTooLargeEvent.patch rename to patches/server/0122-PlayerBookTooLargeEvent.patch index 671e38474..7b5f201cb 100644 --- a/patches/server/0123-PlayerBookTooLargeEvent.patch +++ b/patches/server/0122-PlayerBookTooLargeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2cc00ca01f40e1509d82bfb18ddc8c17ab816e2e..52232316039ad0ac81b83802afb05a0541a761b3 100644 +index 4ddd14db772f003f603a4965166a3f939327e330..a235aa137c7d0f37a848376d41acb6766c4d8ace 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1261,10 +1261,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0124-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0123-Full-netherite-armor-grants-fire-resistance.patch similarity index 94% rename from patches/server/0124-Full-netherite-armor-grants-fire-resistance.patch rename to patches/server/0123-Full-netherite-armor-grants-fire-resistance.patch index 2319dcdbf..6e067986d 100644 --- a/patches/server/0124-Full-netherite-armor-grants-fire-resistance.patch +++ b/patches/server/0123-Full-netherite-armor-grants-fire-resistance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Full netherite armor grants fire resistance diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 9e4a8278ef601b17311ba53cb187329a434f7bab..dc395219fddf7f994200bc943768d9348201e656 100644 +index cd5d9b5e6853cebb556c347ebdcb0ec912a61f87..6e6fbcaab227b83144640e3e1024a0382984fdae 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -365,6 +365,16 @@ public abstract class Player extends LivingEntity { @@ -26,7 +26,7 @@ index 9e4a8278ef601b17311ba53cb187329a434f7bab..dc395219fddf7f994200bc943768d934 protected ItemCooldowns createItemCooldowns() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4f2416691bea7b53166d7d8448f57019147e1629..2224f6ef1b011c52597a769a3c0d7ae2dfb11b35 100644 +index c877d28640ad083ef4d117b7c2deecbed3bcc12a..0232f39eabedefbe0054a7e96d85fa7033da74f0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -297,6 +297,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0125-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0124-Fix-rotating-UP-DOWN-CW-and-CCW.patch similarity index 100% rename from patches/server/0125-Fix-rotating-UP-DOWN-CW-and-CCW.patch rename to patches/server/0124-Fix-rotating-UP-DOWN-CW-and-CCW.patch diff --git a/patches/server/0126-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0125-Add-mobGriefing-bypass-to-everything-affected.patch similarity index 99% rename from patches/server/0126-Add-mobGriefing-bypass-to-everything-affected.patch rename to patches/server/0125-Add-mobGriefing-bypass-to-everything-affected.patch index 774033678..b8f996965 100644 --- a/patches/server/0126-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0125-Add-mobGriefing-bypass-to-everything-affected.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 91d4f504b3f2992c8d98b8d75504229101816139..39f59d3575e8663d5b1a0acd31421158d25b6b67 100644 +index f7e95a73f60d06a102f79677bb0e31bf9532894d..f8957ef4d25c66002eb2dc992334a6db617ea5e0 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1723,7 +1723,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -374,7 +374,7 @@ index 1942649e868fc985a488034c411a6721595ecc67..7495e0e8beedad59fff24ebf189b58b3 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5553950f84cd14a01aa3b3bee379428128e5aa94..0d091dc0535a65ddc57643bbe0eae57b60df288a 100644 +index 0232f39eabedefbe0054a7e96d85fa7033da74f0..a30ad2eb176b748f77dc396043b397f462027943 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -117,8 +117,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0127-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0126-Config-to-allow-Note-Block-sounds-when-blocked.patch similarity index 97% rename from patches/server/0127-Config-to-allow-Note-Block-sounds-when-blocked.patch rename to patches/server/0126-Config-to-allow-Note-Block-sounds-when-blocked.patch index fec04ec3e..3fdfa15ce 100644 --- a/patches/server/0127-Config-to-allow-Note-Block-sounds-when-blocked.patch +++ b/patches/server/0126-Config-to-allow-Note-Block-sounds-when-blocked.patch @@ -22,7 +22,7 @@ index 42e8e2d9d673947ecbfb55e0f31fc22afe3223b6..0b5ce2db558e721807944d9d0f672a77 // org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, pos, state.getValue(NoteBlock.INSTRUMENT), state.getValue(NoteBlock.NOTE)); // if (event.isCancelled()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e83b296e24d561080b679193ebe7e32d9ad08688..622a6226ac1ed4e97dc667fdc30679a97d4f44b0 100644 +index a30ad2eb176b748f77dc396043b397f462027943..a5eb4756b750196847899b52cd390e8d1cbcbeeb 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -120,6 +120,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0128-Add-EntityTeleportHinderedEvent.patch b/patches/server/0127-Add-EntityTeleportHinderedEvent.patch similarity index 100% rename from patches/server/0128-Add-EntityTeleportHinderedEvent.patch rename to patches/server/0127-Add-EntityTeleportHinderedEvent.patch diff --git a/patches/server/0129-Farmland-trampling-changes.patch b/patches/server/0128-Farmland-trampling-changes.patch similarity index 97% rename from patches/server/0129-Farmland-trampling-changes.patch rename to patches/server/0128-Farmland-trampling-changes.patch index ce5ce7063..59316ab8b 100644 --- a/patches/server/0129-Farmland-trampling-changes.patch +++ b/patches/server/0128-Farmland-trampling-changes.patch @@ -37,7 +37,7 @@ index f66a556e93469204e19baa5bf2decbf974701a5d..eed062c9cf1103d7ac96695e3620d427 if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) { return; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 444879c211a1298d59e6c38e769a5521241fa060..d4586962197af458eebeb56a27abc43797f21e02 100644 +index 8ef0190cbfc88cd74ea43cd5669b4dd1350a5df4..9336f5e5435e12f95c9e361a214a45584359ca56 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -463,10 +463,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0130-Movement-options-for-armor-stands.patch b/patches/server/0129-Movement-options-for-armor-stands.patch similarity index 96% rename from patches/server/0130-Movement-options-for-armor-stands.patch rename to patches/server/0129-Movement-options-for-armor-stands.patch index 864e5bafa..7fdd98745 100644 --- a/patches/server/0130-Movement-options-for-armor-stands.patch +++ b/patches/server/0129-Movement-options-for-armor-stands.patch @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index d3d920d647168c8c7445f526726736d454ccaffc..a1a7efb5cc2859c40ae99e13032b5da62974122b 100644 +index adb5f4fa1f1f4ec3180da4f8ad0a322eaa47f9ac..a59d5b1aa9ff67830f521ea3ff1d27e7874ba4bb 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1745,7 +1745,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -66,7 +66,7 @@ index 5b4523320de59167bd5864b2f17187590afb5ad6..88949e8ca7e4a5e74a8a365bb1aa6d46 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d4586962197af458eebeb56a27abc43797f21e02..98b72e5d2492391aaabb002521ab41e14ea12525 100644 +index 9336f5e5435e12f95c9e361a214a45584359ca56..24ce48b5aef4f1a59506f9a17af3a3333cb1ebbe 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -101,10 +101,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0131-Fix-stuck-in-portals.patch b/patches/server/0130-Fix-stuck-in-portals.patch similarity index 92% rename from patches/server/0131-Fix-stuck-in-portals.patch rename to patches/server/0130-Fix-stuck-in-portals.patch index 3c6d6534c..f07770be0 100644 --- a/patches/server/0131-Fix-stuck-in-portals.patch +++ b/patches/server/0130-Fix-stuck-in-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index adceeb21805e207b0bc0cfa0035eefcb82029311..5f616eba7aa8c6ece6999e4d45e107a66d822132 100644 +index a7f674f456be825bbabb2c86c93afde77db96a33..fad36f2d2a302a2da1c5bd9d199437e9489349b9 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1228,6 +1228,7 @@ public class ServerPlayer extends Player { @@ -17,7 +17,7 @@ index adceeb21805e207b0bc0cfa0035eefcb82029311..5f616eba7aa8c6ece6999e4d45e107a6 // CraftBukkit end this.setLevel(worldserver); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8d5557f11c4f240b301961de894312869fcc5e07..7dc06fc1a8074881c65618a0252939c3c7eb0100 100644 +index a59d5b1aa9ff67830f521ea3ff1d27e7874ba4bb..bfc65117bb9223799a8daee00f3c6833f10e4900 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2937,12 +2937,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -37,7 +37,7 @@ index 8d5557f11c4f240b301961de894312869fcc5e07..7dc06fc1a8074881c65618a0252939c3 this.isInsidePortal = true; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8d292ba6aa30f4882fb3d0c81d4e583f1491c579..418e36a220f9f28785e5ed9210883ea59a69131e 100644 +index 24ce48b5aef4f1a59506f9a17af3a3333cb1ebbe..52049de384f22443f9ee106552cf8dc6c56e9a38 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -337,6 +337,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0132-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0131-Toggle-for-water-sensitive-mob-damage.patch similarity index 100% rename from patches/server/0132-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0131-Toggle-for-water-sensitive-mob-damage.patch diff --git a/patches/server/0133-Config-to-always-tame-in-Creative.patch b/patches/server/0132-Config-to-always-tame-in-Creative.patch similarity index 98% rename from patches/server/0133-Config-to-always-tame-in-Creative.patch rename to patches/server/0132-Config-to-always-tame-in-Creative.patch index 030e42541..ef922ea36 100644 --- a/patches/server/0133-Config-to-always-tame-in-Creative.patch +++ b/patches/server/0132-Config-to-always-tame-in-Creative.patch @@ -59,7 +59,7 @@ index 9b2422f9fb0d046ba2246167f9350ed6828f6265..e2109e66a8ab205d7c33adeca5884418 this.navigation.stop(); this.setTarget((LivingEntity) null); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index de37cac820761077ed2d39f2bcc7b97110340fa0..aee1a40b47c34a7d0c5d7374d413cf9755729276 100644 +index c615f1a81cdc1c3846f5c8652a9a5d095e9b5db9..83083e335ed5e942be756f2ceaecb027f03545ec 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -119,6 +119,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0134-End-crystal-explosion-options.patch b/patches/server/0133-End-crystal-explosion-options.patch similarity index 98% rename from patches/server/0134-End-crystal-explosion-options.patch rename to patches/server/0133-End-crystal-explosion-options.patch index e1a343cbf..1440c7e04 100644 --- a/patches/server/0134-End-crystal-explosion-options.patch +++ b/patches/server/0133-End-crystal-explosion-options.patch @@ -54,7 +54,7 @@ index b373f9e4b5a2604bcbccd36cd3de961f3a41cd32..a4fc0e9cb52bb5937effe5cd09f8bbef this.onDestroyedBy(source); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4120334507d0811dcfd65f08ee2272aff431b4f3..d319ef7fefc979f265a8ad6c277e81649d489e4d 100644 +index 83083e335ed5e942be756f2ceaecb027f03545ec..7227e9619f5b908bd3d4b787d9dc468414194236 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -470,6 +470,43 @@ public class PurpurWorldConfig { diff --git a/patches/server/0135-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0134-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 97% rename from patches/server/0135-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0134-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch index 8c0772bfa..30a958914 100644 --- a/patches/server/0135-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch +++ b/patches/server/0134-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch @@ -29,7 +29,7 @@ index cad1246e6a8dbf92f367d0714306a428697bf1c1..c38c92a9967a50515f6d185d116578b6 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d319ef7fefc979f265a8ad6c277e81649d489e4d..e3d6108c58e4a6447eca536764cdf20507603ebf 100644 +index 7227e9619f5b908bd3d4b787d9dc468414194236..1e0566329eccba7cb50ba183dc13032afc5c40a0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -949,6 +949,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0136-Dont-run-with-scissors.patch b/patches/server/0135-Dont-run-with-scissors.patch similarity index 98% rename from patches/server/0136-Dont-run-with-scissors.patch rename to patches/server/0135-Dont-run-with-scissors.patch index b326833c5..a6472bd7a 100644 --- a/patches/server/0136-Dont-run-with-scissors.patch +++ b/patches/server/0135-Dont-run-with-scissors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors! diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 52232316039ad0ac81b83802afb05a0541a761b3..d97b35d9ca448c8ef0b20a31b873022dd08085f5 100644 +index a235aa137c7d0f37a848376d41acb6766c4d8ace..0ace3d20fb71359a58659bb9ddf938d547f3750f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1696,6 +1696,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0137-One-Punch-Man.patch b/patches/server/0136-One-Punch-Man.patch similarity index 93% rename from patches/server/0137-One-Punch-Man.patch rename to patches/server/0136-One-Punch-Man.patch index 6ee45b1f8..abcf884da 100644 --- a/patches/server/0137-One-Punch-Man.patch +++ b/patches/server/0136-One-Punch-Man.patch @@ -5,7 +5,7 @@ Subject: [PATCH] One Punch Man! diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 39f59d3575e8663d5b1a0acd31421158d25b6b67..7f0049324f816bf09b262c29260bd1b37fc0aa55 100644 +index f8957ef4d25c66002eb2dc992334a6db617ea5e0..e12f9a021097267147268b3b0ec2824cf9081058 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2257,6 +2257,20 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -30,7 +30,7 @@ index 39f59d3575e8663d5b1a0acd31421158d25b6b67..7f0049324f816bf09b262c29260bd1b3 if (human) { // PAIL: Be sure to drag all this code from the EntityHuman subclass each update. diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index afa4f88f0aae074a05d6a38547fb4a069a813964..bff3b16a446e6fae722908d44a30221ae543830a 100644 +index 6d20f1788cd7ce776a984ad57a6efaeead8cd490..b3347a38973bbb3fe84b5b1118e767cd40f3ccfa 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -348,6 +348,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0138-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0137-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 98% rename from patches/server/0138-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0137-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch index 3e7dcb1b5..2e8ae1711 100644 --- a/patches/server/0138-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch +++ b/patches/server/0137-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch @@ -43,7 +43,7 @@ index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f // Paper end if (user instanceof net.minecraft.server.level.ServerPlayer) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index bff3b16a446e6fae722908d44a30221ae543830a..966c6c71e52ebb239631c61b40bbb3f4cc63a416 100644 +index b3347a38973bbb3fe84b5b1118e767cd40f3ccfa..58ab672c238b243a66e615171c0cbf2c941ccd14 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -203,6 +203,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0139-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0138-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 92% rename from patches/server/0139-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0138-Config-to-ignore-nearby-mobs-when-sleeping.patch index 1f62dd14c..ac6220d4a 100644 --- a/patches/server/0139-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0138-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 5f616eba7aa8c6ece6999e4d45e107a66d822132..8e537c5b3926b6196f6cfd36cead4cb75ea9534a 100644 +index fad36f2d2a302a2da1c5bd9d199437e9489349b9..f94f50541210f5b13dca3b546d84983ba246e399 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1387,7 +1387,7 @@ public class ServerPlayer extends Player { @@ -18,7 +18,7 @@ index 5f616eba7aa8c6ece6999e4d45e107a66d822132..8e537c5b3926b6196f6cfd36cead4cb7 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d22d0a64c6a744b843105c32ec4b5a141030ec1c..28b209423cddc091fce79b9bfe69b4c63fb8d761 100644 +index 58ab672c238b243a66e615171c0cbf2c941ccd14..878224a1a86e486d13010ef0bc1dd336c37ffa55 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -357,6 +357,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0140-Add-back-player-spawned-endermite-API.patch b/patches/server/0139-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/server/0140-Add-back-player-spawned-endermite-API.patch rename to patches/server/0139-Add-back-player-spawned-endermite-API.patch diff --git a/patches/server/0141-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0140-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 97% rename from patches/server/0141-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0140-Config-Enderman-aggressiveness-towards-Endermites.patch index d77236034..5df98d6b1 100644 --- a/patches/server/0141-Config-Enderman-aggressiveness-towards-Endermites.patch +++ b/patches/server/0140-Config-Enderman-aggressiveness-towards-Endermites.patch @@ -18,7 +18,7 @@ index a3652bebb72fa65c4360352e3424002d5b0438d2..34b2e9ec62b5a91db11a4782d5e8803f } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b7cf07d2abde017915d5204ab2f90ff6145e88c8..240e3a2a1f3ee697a20c2ed7586a5e4ffa205a50 100644 +index 878224a1a86e486d13010ef0bc1dd336c37ffa55..98f01e776f1b0124a332c7b90cb33685b1e0b850 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -999,6 +999,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0142-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0141-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 96% rename from patches/server/0142-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0141-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch index 676dc605d..4ba8a697e 100644 --- a/patches/server/0142-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch +++ b/patches/server/0141-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch @@ -20,7 +20,7 @@ index 34b2e9ec62b5a91db11a4782d5e8803f29f7a6cf..bfde674f2e5f88cfe9a4c760a9f8eb90 } else { Vec3 vec3d = player.getViewVector(1.0F).normalize(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 240e3a2a1f3ee697a20c2ed7586a5e4ffa205a50..b1cd3e79a47097f9c66bbab2af144278fe60f1e7 100644 +index 98f01e776f1b0124a332c7b90cb33685b1e0b850..94438bc7e8e0593d7b23cbe82293518535c36a56 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1001,6 +1001,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0143-Tick-fluids-config.patch b/patches/server/0142-Tick-fluids-config.patch similarity index 97% rename from patches/server/0143-Tick-fluids-config.patch rename to patches/server/0142-Tick-fluids-config.patch index 57f8d6fe1..02d75de8a 100644 --- a/patches/server/0143-Tick-fluids-config.patch +++ b/patches/server/0142-Tick-fluids-config.patch @@ -36,7 +36,7 @@ index 43e8ef1d6a65d4fd3fe53a587639ffb814368217..9c22a730772f71b34c63d1e43d48943f } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b1cd3e79a47097f9c66bbab2af144278fe60f1e7..a1c909b96bb7197506e2967d6d8fb7c0fff418bd 100644 +index 94438bc7e8e0593d7b23cbe82293518535c36a56..cd2eeb6a042a1192451d5dffa757d08ecaa09c55 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -131,6 +131,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0144-Config-to-disable-Llama-caravans.patch b/patches/server/0143-Config-to-disable-Llama-caravans.patch similarity index 97% rename from patches/server/0144-Config-to-disable-Llama-caravans.patch rename to patches/server/0143-Config-to-disable-Llama-caravans.patch index 8f43797b7..4a3e78d49 100644 --- a/patches/server/0144-Config-to-disable-Llama-caravans.patch +++ b/patches/server/0143-Config-to-disable-Llama-caravans.patch @@ -32,7 +32,7 @@ index de0e0b3d7b300f82717e9b69a5d6fe7dd70e1f1c..0a2adbda0f1c4c6e3695ee39af687f69 this.caravanHead.caravanTail = this; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a1c909b96bb7197506e2967d6d8fb7c0fff418bd..b20e2951666c3e87153e82aa85946b463d007a0c 100644 +index cd2eeb6a042a1192451d5dffa757d08ecaa09c55..7f28c5f855cc2c07dfb8dd57c69a8e12bc27fa6e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1333,6 +1333,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0145-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0144-Config-to-make-Creepers-explode-on-death.patch similarity index 97% rename from patches/server/0145-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0144-Config-to-make-Creepers-explode-on-death.patch index a119a8b7e..522cffe1d 100644 --- a/patches/server/0145-Config-to-make-Creepers-explode-on-death.patch +++ b/patches/server/0144-Config-to-make-Creepers-explode-on-death.patch @@ -50,7 +50,7 @@ index 514a71bfc0fb95631ce3931528aa5a0d82c1cdbf..82d1bd8b8ba0e4b72e2030f085ddc0db private void spawnLingeringCloud() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b20e2951666c3e87153e82aa85946b463d007a0c..58bf5088f80d40ab4ed9f7a46a6629bf1033e055 100644 +index 7f28c5f855cc2c07dfb8dd57c69a8e12bc27fa6e..c7752f41ea30ccac924adcd093f9a946c794f2dc 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -853,6 +853,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0146-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0145-Configurable-ravager-griefable-blocks-list.patch similarity index 98% rename from patches/server/0146-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0145-Configurable-ravager-griefable-blocks-list.patch index b44bdf477..dc46c7025 100644 --- a/patches/server/0146-Configurable-ravager-griefable-blocks-list.patch +++ b/patches/server/0145-Configurable-ravager-griefable-blocks-list.patch @@ -31,7 +31,7 @@ index f0fbd16c9b9c3772492c32b3924e99e147e412f0..c0c3bba1555e356c0af7e79e1ecb2aa0 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 58bf5088f80d40ab4ed9f7a46a6629bf1033e055..cc620403d92cd6978d9383591f9f196a99bdc35c 100644 +index c7752f41ea30ccac924adcd093f9a946c794f2dc..60f4c0e3d26e7ed73e67ff145b7603fded801705 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1705,6 +1705,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0147-Sneak-to-bulk-process-composter.patch b/patches/server/0146-Sneak-to-bulk-process-composter.patch similarity index 98% rename from patches/server/0147-Sneak-to-bulk-process-composter.patch rename to patches/server/0146-Sneak-to-bulk-process-composter.patch index c5e616943..c7560f539 100644 --- a/patches/server/0147-Sneak-to-bulk-process-composter.patch +++ b/patches/server/0146-Sneak-to-bulk-process-composter.patch @@ -102,7 +102,7 @@ index ae90e86327957bb784e2d81694ee7eea288bb455..c5e4bc4bbeacd4875996ba54e795689f int i = (Integer) state.getValue(ComposterBlock.LEVEL); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c62c1b914f46c3f04d63dedf0df2b9d1cf577941..b9e21b75d0899b636301afab90cb5ab8b5062423 100644 +index 60f4c0e3d26e7ed73e67ff145b7603fded801705..6a873660c2020c732672cf541a071ab3b5c04e9e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -485,6 +485,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0148-Config-for-skipping-night.patch b/patches/server/0147-Config-for-skipping-night.patch similarity index 92% rename from patches/server/0148-Config-for-skipping-night.patch rename to patches/server/0147-Config-for-skipping-night.patch index 37955ece2..7e4a49a99 100644 --- a/patches/server/0148-Config-for-skipping-night.patch +++ b/patches/server/0147-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/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 682faf5ae551b379bf51f01f616a76400eb21f3d..ab71f7e0ab1275f01c916e62e5bf50fb7b660b14 100644 +index e113e0e15ec88ac3b72f20ec2c88c3302e77ce20..43cc17bf7d93cdb5a171007e8341c583ec6eab53 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -664,7 +664,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -18,7 +18,7 @@ index 682faf5ae551b379bf51f01f616a76400eb21f3d..ab71f7e0ab1275f01c916e62e5bf50fb j = this.levelData.getDayTime() + 24000L; TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime()); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a089b2be3b92688822d22b2b1a49ea1f2184b308..a8223abddfc583a7cadea35e647da693fc81a6f0 100644 +index 6a873660c2020c732672cf541a071ab3b5c04e9e..1a75ade998f9e8dddcfe6a14a19d6eb67ee1f856 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -360,6 +360,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0149-Add-config-for-villager-trading.patch b/patches/server/0148-Add-config-for-villager-trading.patch similarity index 98% rename from patches/server/0149-Add-config-for-villager-trading.patch rename to patches/server/0148-Add-config-for-villager-trading.patch index b653d274d..107fcdbdf 100644 --- a/patches/server/0149-Add-config-for-villager-trading.patch +++ b/patches/server/0148-Add-config-for-villager-trading.patch @@ -31,7 +31,7 @@ index 4e321a9f08c8798cee04789a7356893dd2a660c3..6af1d1b3b40d91fd3e0ac269d0e4a60a this.openTradingScreen(player, this.getDisplayName(), 1); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a8223abddfc583a7cadea35e647da693fc81a6f0..f5ef0d6683218f85704825a04c3cac21b76632ad 100644 +index 1a75ade998f9e8dddcfe6a14a19d6eb67ee1f856..2a58a5be41bd57b0e2685a5a539771f6d9b33714 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2125,6 +2125,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0150-Allow-infinity-on-crossbows.patch b/patches/server/0149-Allow-infinity-on-crossbows.patch similarity index 100% rename from patches/server/0150-Allow-infinity-on-crossbows.patch rename to patches/server/0149-Allow-infinity-on-crossbows.patch diff --git a/patches/server/0151-Drowning-Settings.patch b/patches/server/0150-Drowning-Settings.patch similarity index 91% rename from patches/server/0151-Drowning-Settings.patch rename to patches/server/0150-Drowning-Settings.patch index 056b53e09..8fdef133e 100644 --- a/patches/server/0151-Drowning-Settings.patch +++ b/patches/server/0150-Drowning-Settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Drowning Settings diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ada853423c30e96257405b55d12afef60df9acfb..88ee27ba72be1180def7e0b48c74449189b7ea1e 100644 +index bfc65117bb9223799a8daee00f3c6833f10e4900..65ba54c6144612df47820d2c3a88ddb4bd4b3f0a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3178,7 +3178,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -18,7 +18,7 @@ index ada853423c30e96257405b55d12afef60df9acfb..88ee27ba72be1180def7e0b48c744491 public int getAirSupply() { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 7f0049324f816bf09b262c29260bd1b37fc0aa55..527694ebdce5f27b313d009dbf1874659f5e12d9 100644 +index e12f9a021097267147268b3b0ec2824cf9081058..2a857639e1c2a831dee1236e1796d97b7e9109f2 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -422,7 +422,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -40,7 +40,7 @@ index 7f0049324f816bf09b262c29260bd1b37fc0aa55..527694ebdce5f27b313d009dbf187465 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f5ef0d6683218f85704825a04c3cac21b76632ad..def330259864bb5d51bd843b512e2162c6b1cbed 100644 +index 2a58a5be41bd57b0e2685a5a539771f6d9b33714..ed020d4ea1fca11ddfb5427e3cb67622be0c9cd0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -166,6 +166,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0152-Break-individual-slabs-when-sneaking.patch b/patches/server/0151-Break-individual-slabs-when-sneaking.patch similarity index 97% rename from patches/server/0152-Break-individual-slabs-when-sneaking.patch rename to patches/server/0151-Break-individual-slabs-when-sneaking.patch index 8a676898a..5524abcea 100644 --- a/patches/server/0152-Break-individual-slabs-when-sneaking.patch +++ b/patches/server/0151-Break-individual-slabs-when-sneaking.patch @@ -47,7 +47,7 @@ index 18b603d646081926343dea108b55d641df1c2c34..03ad3e45fc6d48091ac0c0ba5dc3d014 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 90bea40165a45f06c71a1627ee812cc616df0a52..1687652d528e61ebcba35a2437a0ac5ece7e6ce8 100644 +index ed020d4ea1fca11ddfb5427e3cb67622be0c9cd0..9845dcc5e8d6e870d348e5a3d0293b3c23d8e2e7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -611,6 +611,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0153-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0152-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 96% rename from patches/server/0153-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0152-Config-to-disable-hostile-mob-spawn-on-ice.patch index 6886dfff2..a48ed2e96 100644 --- a/patches/server/0153-Config-to-disable-hostile-mob-spawn-on-ice.patch +++ b/patches/server/0152-Config-to-disable-hostile-mob-spawn-on-ice.patch @@ -24,7 +24,7 @@ index 55c245d0dfa369dc6de2197ae37335fba4fae4ae..c9b40515f4c2ff1eedfc9510930c3bae return false; } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 36fb15cb1e6e8a177a4006a901a0cb8048a9a242..b59c509778533c1e33ca7e5bcf5e0a6b7bc69e3d 100644 +index 9845dcc5e8d6e870d348e5a3d0293b3c23d8e2e7..2a4287232aebd734419dcf57e4e6458d8fbc73c6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -571,6 +571,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0154-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0153-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 96% rename from patches/server/0154-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0153-Config-to-show-Armor-Stand-arms-on-spawn.patch index e02a490df..484d52424 100644 --- a/patches/server/0154-Config-to-show-Armor-Stand-arms-on-spawn.patch +++ b/patches/server/0153-Config-to-show-Armor-Stand-arms-on-spawn.patch @@ -17,7 +17,7 @@ index 88949e8ca7e4a5e74a8a365bb1aa6d466d3f8ddd..0545a39af0f21210ff1f5e53f6d712ae public ArmorStand(Level world, double x, double y, double z) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b59c509778533c1e33ca7e5bcf5e0a6b7bc69e3d..8fb3c11d423ed85fd0e26ed3708f919dd00d4add 100644 +index 2a4287232aebd734419dcf57e4e6458d8fbc73c6..29c5c640466f96597d5f5e1f07daae4e8fbeb1e6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -104,6 +104,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0155-Option-to-make-doors-require-redstone.patch b/patches/server/0154-Option-to-make-doors-require-redstone.patch similarity index 98% rename from patches/server/0155-Option-to-make-doors-require-redstone.patch rename to patches/server/0154-Option-to-make-doors-require-redstone.patch index 10fc6202f..9ff9d84be 100644 --- a/patches/server/0155-Option-to-make-doors-require-redstone.patch +++ b/patches/server/0154-Option-to-make-doors-require-redstone.patch @@ -67,7 +67,7 @@ index 5ba56ee7d5dd210770e6703be559055d218028d5..b5e90dc00240bccf1a6eca342729a4f4 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8fb3c11d423ed85fd0e26ed3708f919dd00d4add..daaf49453c4612db7ca65ee1e5936f13fa5058e0 100644 +index 29c5c640466f96597d5f5e1f07daae4e8fbeb1e6..4c71694a1daea330af2713a493a7779cd630b02c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -510,6 +510,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0156-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0155-Config-to-allow-for-unsafe-enchants.patch similarity index 100% rename from patches/server/0156-Config-to-allow-for-unsafe-enchants.patch rename to patches/server/0155-Config-to-allow-for-unsafe-enchants.patch diff --git a/patches/server/0157-Configurable-sponge-absorption.patch b/patches/server/0156-Configurable-sponge-absorption.patch similarity index 97% rename from patches/server/0157-Configurable-sponge-absorption.patch rename to patches/server/0156-Configurable-sponge-absorption.patch index 2cd4cfcc3..175ae69e2 100644 --- a/patches/server/0157-Configurable-sponge-absorption.patch +++ b/patches/server/0156-Configurable-sponge-absorption.patch @@ -43,7 +43,7 @@ index 7304b2659eb45bc4bc9fa7c43e6ca07221d0fc73..d96e3fbc0fd4275c29e7e6154ef66e9e } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index daaf49453c4612db7ca65ee1e5936f13fa5058e0..0c5c28d209dbde8153e1dce9f002e6a04c3d6ec8 100644 +index 4c71694a1daea330af2713a493a7779cd630b02c..12b96c2fd28817023f41651e3aceafc086b24f4d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -640,6 +640,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0158-Projectile-offset-config.patch b/patches/server/0157-Projectile-offset-config.patch similarity index 99% rename from patches/server/0158-Projectile-offset-config.patch rename to patches/server/0157-Projectile-offset-config.patch index 6d99b4e22..0ce089ce5 100644 --- a/patches/server/0158-Projectile-offset-config.patch +++ b/patches/server/0157-Projectile-offset-config.patch @@ -96,7 +96,7 @@ index 41bd45c0720751f348b5cf6eaecac4397a439857..60512d08a45670a164a9b93191aafa40 entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0c5c28d209dbde8153e1dce9f002e6a04c3d6ec8..cfc7eb48f297133b84c2b982483c6981428a008b 100644 +index 12b96c2fd28817023f41651e3aceafc086b24f4d..03c2a36068ca1c98f9cd9fae87cbbab216c71c60 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -428,6 +428,23 @@ public class PurpurWorldConfig { diff --git a/patches/server/0159-Config-for-powered-rail-activation-distance.patch b/patches/server/0158-Config-for-powered-rail-activation-distance.patch similarity index 94% rename from patches/server/0159-Config-for-powered-rail-activation-distance.patch rename to patches/server/0158-Config-for-powered-rail-activation-distance.patch index f7e14053e..b2ed025eb 100644 --- a/patches/server/0159-Config-for-powered-rail-activation-distance.patch +++ b/patches/server/0158-Config-for-powered-rail-activation-distance.patch @@ -18,7 +18,7 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b } else { int j = pos.getX(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cfc7eb48f297133b84c2b982483c6981428a008b..b14873a724b49251d676521af756e07dce620951 100644 +index 03c2a36068ca1c98f9cd9fae87cbbab216c71c60..791dfd2d88ff1765a19feb5248ee2e1a1c6d3c85 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -621,6 +621,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0160-Piglin-portal-spawn-modifier.patch b/patches/server/0159-Piglin-portal-spawn-modifier.patch similarity index 96% rename from patches/server/0160-Piglin-portal-spawn-modifier.patch rename to patches/server/0159-Piglin-portal-spawn-modifier.patch index 2a3c24d6c..566ee4770 100644 --- a/patches/server/0160-Piglin-portal-spawn-modifier.patch +++ b/patches/server/0159-Piglin-portal-spawn-modifier.patch @@ -31,7 +31,7 @@ index 2c085c4a154cb0f8a1d38453f43474a764398784..589b437e7c97c846410f293e2f014bdc pos = pos.below(); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b14873a724b49251d676521af756e07dce620951..b53d78e4569770a80ffb9a30e0c57aa8603fe746 100644 +index 791dfd2d88ff1765a19feb5248ee2e1a1c6d3c85..55f80ce99d62b93d4d06883031c0922f4a8ac868 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1649,6 +1649,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0161-Config-to-change-max-number-of-bees.patch b/patches/server/0160-Config-to-change-max-number-of-bees.patch similarity index 100% rename from patches/server/0161-Config-to-change-max-number-of-bees.patch rename to patches/server/0160-Config-to-change-max-number-of-bees.patch diff --git a/patches/server/0162-Config-for-wither-explosion-radius.patch b/patches/server/0161-Config-for-wither-explosion-radius.patch similarity index 96% rename from patches/server/0162-Config-for-wither-explosion-radius.patch rename to patches/server/0161-Config-for-wither-explosion-radius.patch index 46ed61ed0..3602a43b2 100644 --- a/patches/server/0162-Config-for-wither-explosion-radius.patch +++ b/patches/server/0161-Config-for-wither-explosion-radius.patch @@ -18,7 +18,7 @@ index 093a00e52062868b4fbf358b307513d0f599f69d..ba753735f3cbb2cb3d0a491d1bd94a04 if (!event.isCancelled()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b53d78e4569770a80ffb9a30e0c57aa8603fe746..3b7c80907b15a858b4b9fe4790822213b668f338 100644 +index 55f80ce99d62b93d4d06883031c0922f4a8ac868..baf89f40d6dae85c84298c402896b10a2a84fa2f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2292,6 +2292,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0163-Gamemode-extra-permissions.patch b/patches/server/0162-Gamemode-extra-permissions.patch similarity index 100% rename from patches/server/0163-Gamemode-extra-permissions.patch rename to patches/server/0162-Gamemode-extra-permissions.patch diff --git a/patches/server/0164-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0163-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch similarity index 96% rename from patches/server/0164-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch rename to patches/server/0163-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch index 022e8533c..49c00b87f 100644 --- a/patches/server/0164-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch +++ b/patches/server/0163-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch @@ -18,7 +18,7 @@ index c7195f2e12bbd6545f7bffcc2b4ba5cc3d48df20..5e730bc9c8ff94b16ac2bf8567dda8ae Runnable afterAction = null; // Paper if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3b7c80907b15a858b4b9fe4790822213b668f338..59b07bb156b81b107124d8f4f46973d21992d6ba 100644 +index baf89f40d6dae85c84298c402896b10a2a84fa2f..4c6a75d0d6068355afe27768c08af9708c4a7b1d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -450,6 +450,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0165-Configurable-piston-push-limit.patch b/patches/server/0164-Configurable-piston-push-limit.patch similarity index 96% rename from patches/server/0165-Configurable-piston-push-limit.patch rename to patches/server/0164-Configurable-piston-push-limit.patch index 518f0da58..0fb396bdd 100644 --- a/patches/server/0165-Configurable-piston-push-limit.patch +++ b/patches/server/0164-Configurable-piston-push-limit.patch @@ -36,7 +36,7 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 59b07bb156b81b107124d8f4f46973d21992d6ba..298c181263778e55cee797eccfd519335c481fb5 100644 +index 4c6a75d0d6068355afe27768c08af9708c4a7b1d..a9501ad076fadbad81d7b70d1ba9d8423d91711d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -631,6 +631,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0166-Configurable-broadcast-settings.patch b/patches/server/0165-Configurable-broadcast-settings.patch similarity index 97% rename from patches/server/0166-Configurable-broadcast-settings.patch rename to patches/server/0165-Configurable-broadcast-settings.patch index 9560440df..91ce794fa 100644 --- a/patches/server/0166-Configurable-broadcast-settings.patch +++ b/patches/server/0165-Configurable-broadcast-settings.patch @@ -17,7 +17,7 @@ index 25b832fe30c3837d02b10017e58ad0fa9d097092..3919d9c193abcfd8b97dfb0ceb386384 // Paper end } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8e537c5b3926b6196f6cfd36cead4cb75ea9534a..daf1339f2334729adea28d47730a124a92a70f0a 100644 +index f94f50541210f5b13dca3b546d84983ba246e399..02e196377924a000d42db855c77c74c7c1220595 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -960,6 +960,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0167-Configurable-mob-blindness.patch b/patches/server/0166-Configurable-mob-blindness.patch similarity index 94% rename from patches/server/0167-Configurable-mob-blindness.patch rename to patches/server/0166-Configurable-mob-blindness.patch index 71fb8fab5..25c0da50a 100644 --- a/patches/server/0167-Configurable-mob-blindness.patch +++ b/patches/server/0166-Configurable-mob-blindness.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable mob blindness Ported from https://github.com/raltsmc/mobblindness diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 527694ebdce5f27b313d009dbf1874659f5e12d9..d07e2077756d322823ddb11ad1adc1ca610a8ad2 100644 +index 2a857639e1c2a831dee1236e1796d97b7e9109f2..cc95e5bdc2bfa9d53da329a0ec4dd5373e4b150e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1019,6 +1019,17 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -28,7 +28,7 @@ index 527694ebdce5f27b313d009dbf1874659f5e12d9..d07e2077756d322823ddb11ad1adc1ca return d0; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 298c181263778e55cee797eccfd519335c481fb5..e0e82ae7d9b00fa8d322416c58fec7a5814fb133 100644 +index a9501ad076fadbad81d7b70d1ba9d8423d91711d..f172a14be15f9d9f842d85f710d5f98534c86c95 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -134,6 +134,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0168-Hide-hidden-players-from-entity-selector.patch b/patches/server/0167-Hide-hidden-players-from-entity-selector.patch similarity index 100% rename from patches/server/0168-Hide-hidden-players-from-entity-selector.patch rename to patches/server/0167-Hide-hidden-players-from-entity-selector.patch diff --git a/patches/server/0169-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0168-Config-for-health-to-impact-Creeper-explosion-radius.patch similarity index 96% rename from patches/server/0169-Config-for-health-to-impact-Creeper-explosion-radius.patch rename to patches/server/0168-Config-for-health-to-impact-Creeper-explosion-radius.patch index 3c1e447d5..f8986cb23 100644 --- a/patches/server/0169-Config-for-health-to-impact-Creeper-explosion-radius.patch +++ b/patches/server/0168-Config-for-health-to-impact-Creeper-explosion-radius.patch @@ -21,7 +21,7 @@ index 82d1bd8b8ba0e4b72e2030f085ddc0db0432d083..095b46134c8f8f686edd9c343d9ce1a4 if (!event.isCancelled()) { this.dead = true; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e0e82ae7d9b00fa8d322416c58fec7a5814fb133..aad381a8c1f392ff725edf80bac3ce217ff3d296 100644 +index f172a14be15f9d9f842d85f710d5f98534c86c95..47435e31e4301634df65eda9a9a25e718872a868 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -945,6 +945,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0170-Iron-golem-calm-anger-options.patch b/patches/server/0169-Iron-golem-calm-anger-options.patch similarity index 98% rename from patches/server/0170-Iron-golem-calm-anger-options.patch rename to patches/server/0169-Iron-golem-calm-anger-options.patch index 23a8dcbf6..c6f0b46a5 100644 --- a/patches/server/0170-Iron-golem-calm-anger-options.patch +++ b/patches/server/0169-Iron-golem-calm-anger-options.patch @@ -26,7 +26,7 @@ index a123c02dfa554f58897b44f8d01f5f56b5a2d5b7..41b4002ad5c81db05a62e9bc977d5ad5 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index aad381a8c1f392ff725edf80bac3ce217ff3d296..e485beaffee4378041b30ecff90a91df495ae9f6 100644 +index 47435e31e4301634df65eda9a9a25e718872a868..95ec7a6441f266e3733438f9e20865ecb35033ca 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1403,6 +1403,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0171-Breedable-parrots.patch b/patches/server/0170-Breedable-parrots.patch similarity index 97% rename from patches/server/0171-Breedable-parrots.patch rename to patches/server/0170-Breedable-parrots.patch index acf242c84..2bae19396 100644 --- a/patches/server/0171-Breedable-parrots.patch +++ b/patches/server/0170-Breedable-parrots.patch @@ -50,7 +50,7 @@ index c4114ec129b1acacfae920d67423b8ef6836a8d6..09beb422127c563be0609a675d27caa8 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e485beaffee4378041b30ecff90a91df495ae9f6..ea745515ffed6f727e268216b445a9f497bee6f6 100644 +index 95ec7a6441f266e3733438f9e20865ecb35033ca..6127e91aebef3f5467d13edcc1362881853996c8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1573,6 +1573,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0172-Configurable-powered-rail-boost-modifier.patch b/patches/server/0171-Configurable-powered-rail-boost-modifier.patch similarity index 96% rename from patches/server/0172-Configurable-powered-rail-boost-modifier.patch rename to patches/server/0171-Configurable-powered-rail-boost-modifier.patch index 6df81eaa0..73291d050 100644 --- a/patches/server/0172-Configurable-powered-rail-boost-modifier.patch +++ b/patches/server/0171-Configurable-powered-rail-boost-modifier.patch @@ -18,7 +18,7 @@ index 14083c591edb9a7b1eae7bd21705a7f5f0c3cbfa..cd8239423d964ef9b708d283a329986c Vec3 vec3d5 = this.getDeltaMovement(); double d21 = vec3d5.x; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ea745515ffed6f727e268216b445a9f497bee6f6..4cd6f25cd2d2ecf7497eadc0e0c087502b6f7ae7 100644 +index 6127e91aebef3f5467d13edcc1362881853996c8..f40e037970652061103dd517f74e5a7b8cdbba4d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -277,6 +277,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0173-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0172-Add-config-change-multiplier-critical-damage-value.patch similarity index 96% rename from patches/server/0173-Add-config-change-multiplier-critical-damage-value.patch rename to patches/server/0172-Add-config-change-multiplier-critical-damage-value.patch index b8e8ef61e..4d9fcb31b 100644 --- a/patches/server/0173-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0172-Add-config-change-multiplier-critical-damage-value.patch @@ -18,7 +18,7 @@ index 6e6fbcaab227b83144640e3e1024a0382984fdae..9831340303d60f11dcaed1d444449742 f += f1; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 031ea894e61c01af2597d68473a8aea407827f04..bed36d5367e1d9fda9773ae346b9b17f964d50b7 100644 +index f40e037970652061103dd517f74e5a7b8cdbba4d..05c401599a3a1ebb2853f029733ca3bacf460d03 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -376,6 +376,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0174-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0173-Option-to-disable-dragon-egg-teleporting.patch similarity index 95% rename from patches/server/0174-Option-to-disable-dragon-egg-teleporting.patch rename to patches/server/0173-Option-to-disable-dragon-egg-teleporting.patch index 6922c1d59..2571a50ae 100644 --- a/patches/server/0174-Option-to-disable-dragon-egg-teleporting.patch +++ b/patches/server/0173-Option-to-disable-dragon-egg-teleporting.patch @@ -19,7 +19,7 @@ index 7e1edcc7b9f170b7c649437c2f0dd78c0bab9be4..5f8ac1fdac2c334951261f2b9702f5e7 BlockPos blockposition1 = pos.offset(world.random.nextInt(16) - world.random.nextInt(16), world.random.nextInt(8) - world.random.nextInt(8), world.random.nextInt(16) - world.random.nextInt(16)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b40a2b2713175fd2e7a9bab0615cece1fc8518ac..5ca1f9923ecd232c14a8843963cd20166b10d6b1 100644 +index 05c401599a3a1ebb2853f029733ca3bacf460d03..b5c6c6b3ce02fb500a333a9363c2a6a4e10e38f9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -558,6 +558,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0175-Config-for-unverified-username-message.patch b/patches/server/0174-Config-for-unverified-username-message.patch similarity index 100% rename from patches/server/0175-Config-for-unverified-username-message.patch rename to patches/server/0174-Config-for-unverified-username-message.patch diff --git a/patches/server/0176-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0175-Make-anvil-cumulative-cost-configurable.patch similarity index 100% rename from patches/server/0176-Make-anvil-cumulative-cost-configurable.patch rename to patches/server/0175-Make-anvil-cumulative-cost-configurable.patch diff --git a/patches/server/0177-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0176-ShulkerBox-allow-oversized-stacks.patch similarity index 97% rename from patches/server/0177-ShulkerBox-allow-oversized-stacks.patch rename to patches/server/0176-ShulkerBox-allow-oversized-stacks.patch index 2041dccd5..dc814ef6c 100644 --- a/patches/server/0177-ShulkerBox-allow-oversized-stacks.patch +++ b/patches/server/0176-ShulkerBox-allow-oversized-stacks.patch @@ -35,7 +35,7 @@ index c89978ecbc5a13dda6f76ea6d1cc3056efc9a174..39868ad3ee4bb573a4dd562894d93f64 blockEntity.saveToItem(itemStack); if (shulkerBoxBlockEntity.hasCustomName()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ce662f1c7ca96586f3470397392576debefa8dcb..2c3c4df0928ee80fe4e6b8152eee46a18231000c 100644 +index b5c6c6b3ce02fb500a333a9363c2a6a4e10e38f9..8d764953f0718c0bfe125ef51336efbf0551bcd4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -678,6 +678,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0178-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0177-Bee-can-work-when-raining-or-at-night.patch similarity index 97% rename from patches/server/0178-Bee-can-work-when-raining-or-at-night.patch rename to patches/server/0177-Bee-can-work-when-raining-or-at-night.patch index b82c97e38..463d5f50a 100644 --- a/patches/server/0178-Bee-can-work-when-raining-or-at-night.patch +++ b/patches/server/0177-Bee-can-work-when-raining-or-at-night.patch @@ -31,7 +31,7 @@ index a16a1df28258d605cf5908dbe19bda5d71ad4f45..7b82842b97ce795745cf6ee6399f618c return false; } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 13a1373355d613bb6a1aa29a7b4cd3e1fe124dd2..a334273dde8c301f88bf2ba35a895d96b470d55a 100644 +index 8d764953f0718c0bfe125ef51336efbf0551bcd4..b9adc841d9814b945e163a8ee78fcd499245f838 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -788,6 +788,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0179-API-for-any-mob-to-burn-daylight.patch b/patches/server/0178-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from patches/server/0179-API-for-any-mob-to-burn-daylight.patch rename to patches/server/0178-API-for-any-mob-to-burn-daylight.patch diff --git a/patches/server/0180-Config-MobEffect-by-world.patch b/patches/server/0179-Config-MobEffect-by-world.patch similarity index 98% rename from patches/server/0180-Config-MobEffect-by-world.patch rename to patches/server/0179-Config-MobEffect-by-world.patch index 1a70fdadd..a17890758 100644 --- a/patches/server/0180-Config-MobEffect-by-world.patch +++ b/patches/server/0179-Config-MobEffect-by-world.patch @@ -40,7 +40,7 @@ index 2cc714585fc3790b70a7ad1ab8034543462e2b3b..22d7f04cefafa0115a4504e373807877 ((ServerPlayer) entityhuman).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a334273dde8c301f88bf2ba35a895d96b470d55a..13e2d7c7e5528c26e83f0f9b6d61ad9f5b7d7ab3 100644 +index b9adc841d9814b945e163a8ee78fcd499245f838..fef8e9d314e2078d08cb326e1cb4a593c3161193 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -333,6 +333,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0181-Beacon-Activation-Range-Configurable.patch b/patches/server/0180-Beacon-Activation-Range-Configurable.patch similarity index 96% rename from patches/server/0181-Beacon-Activation-Range-Configurable.patch rename to patches/server/0180-Beacon-Activation-Range-Configurable.patch index fd13d0248..42eda56fd 100644 --- a/patches/server/0181-Beacon-Activation-Range-Configurable.patch +++ b/patches/server/0180-Beacon-Activation-Range-Configurable.patch @@ -26,7 +26,7 @@ index ef740d1ad6352ca4af299001a081b720bc472d2e..c787019b5cbadec81dd33ef4021708b9 } else { return effectRange; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 13e2d7c7e5528c26e83f0f9b6d61ad9f5b7d7ab3..75640d2a794319d9900725dc50f05629c5f73c23 100644 +index fef8e9d314e2078d08cb326e1cb4a593c3161193..52fe09a63496d1c707d9406e1f2d102c9ecdf018 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -525,6 +525,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0182-Add-toggle-for-sand-duping-fix.patch b/patches/server/0181-Add-toggle-for-sand-duping-fix.patch similarity index 91% rename from patches/server/0182-Add-toggle-for-sand-duping-fix.patch rename to patches/server/0181-Add-toggle-for-sand-duping-fix.patch index 7a9c8174f..b767f8ff5 100644 --- a/patches/server/0182-Add-toggle-for-sand-duping-fix.patch +++ b/patches/server/0181-Add-toggle-for-sand-duping-fix.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for sand duping fix diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -index ce2c3c146ef64400e00084bd2245d2b87a67fbc2..b0dd274fde1ce23a984de9492d7605ffcca4a86b 100644 +index 536856300da929c101f50da5827677bada5feb50..98844ccc6200ba060022525b3a00bcb1de1d0a7a 100644 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java @@ -131,7 +131,7 @@ public class FallingBlockEntity extends Entity { @@ -27,7 +27,7 @@ index ce2c3c146ef64400e00084bd2245d2b87a67fbc2..b0dd274fde1ce23a984de9492d7605ff } // Paper end - fix sand duping diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 75640d2a794319d9900725dc50f05629c5f73c23..14fed3d54bce458cfc36c77f8d77648532f86f90 100644 +index 52fe09a63496d1c707d9406e1f2d102c9ecdf018..cec4bd68c9b166045f0e868fcbc33b9e4d3bdb0b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -704,6 +704,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0183-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0182-Add-toggle-for-end-portal-safe-teleporting.patch similarity index 94% rename from patches/server/0183-Add-toggle-for-end-portal-safe-teleporting.patch rename to patches/server/0182-Add-toggle-for-end-portal-safe-teleporting.patch index bc3a5aaad..cd656b101 100644 --- a/patches/server/0183-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0182-Add-toggle-for-end-portal-safe-teleporting.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for end portal safe teleporting diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index fd382ff7ee45bfc6a9bfd83d960390f94299b295..05e23fd43cca166f8a058debd9dc3fd1e1c2a595 100644 +index 5b0377d9731936953b977a113e2bfe27ed1f74fa..dc327fb4cfc9fb0ad058dff0f2481e4678619473 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2996,7 +2996,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -45,7 +45,7 @@ index f80f6da484f4144e743079e5104bf503419074b2..2deddc746e43896584bd65ba8e7971a8 entity.portalWorld = ((ServerLevel)world); entity.portalBlock = pos.immutable(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 14fed3d54bce458cfc36c77f8d77648532f86f90..2e3827a40a2cba69a2fd7c099941be8f23637b6b 100644 +index cec4bd68c9b166045f0e868fcbc33b9e4d3bdb0b..6d9d002e53319b82426e79c4772163a13b0efa52 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -652,6 +652,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0184-Make-lightning-rod-range-configurable.patch b/patches/server/0183-Make-lightning-rod-range-configurable.patch similarity index 96% rename from patches/server/0184-Make-lightning-rod-range-configurable.patch rename to patches/server/0183-Make-lightning-rod-range-configurable.patch index b80ac5e1e..69b63e3ea 100644 --- a/patches/server/0184-Make-lightning-rod-range-configurable.patch +++ b/patches/server/0183-Make-lightning-rod-range-configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make lightning rod range configurable diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ab71f7e0ab1275f01c916e62e5bf50fb7b660b14..cb8870189396b30fcd89b64f909e60f0674fda2c 100644 +index 43cc17bf7d93cdb5a171007e8341c583ec6eab53..2625f92d3bb61f89207941adbba59cb99d99eeb6 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -994,7 +994,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0185-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch b/patches/server/0184-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch similarity index 97% rename from patches/server/0185-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch rename to patches/server/0184-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch index 2d253ad59..05e72a75b 100644 --- a/patches/server/0185-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch +++ b/patches/server/0184-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch @@ -56,7 +56,7 @@ index 4a2dcf9bd83dd3fdff43483f887f4f58dc4715cd..87f9e03fb5e095396e054a84be60ec45 public void eat(Item item, ItemStack stack) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 626112af4b44ecdb281b6f48a3226a4747043666..3145ce1f6cda2e31a054a797dc604b023602726a 100644 +index 6d9d002e53319b82426e79c4772163a13b0efa52..62f984a5bbfd50a2ad66bfcde4c1b461cb9c1e6a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -392,6 +392,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0186-Allow-player-join-full-server-by-permission.patch b/patches/server/0185-Allow-player-join-full-server-by-permission.patch similarity index 100% rename from patches/server/0186-Allow-player-join-full-server-by-permission.patch rename to patches/server/0185-Allow-player-join-full-server-by-permission.patch diff --git a/patches/server/0187-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0186-Add-permission-bypass-for-portal-waiting.patch similarity index 95% rename from patches/server/0187-Add-permission-bypass-for-portal-waiting.patch rename to patches/server/0186-Add-permission-bypass-for-portal-waiting.patch index dc59801a2..f7e37678a 100644 --- a/patches/server/0187-Add-permission-bypass-for-portal-waiting.patch +++ b/patches/server/0186-Add-permission-bypass-for-portal-waiting.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add permission bypass for portal waiting diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 53769c1781a3ea5e3c0330684d6b998adbe15a4e..af882016364257f01a154b99783e96f5e932364f 100644 +index 75250719f8d10dd06471758b2848d132e5b1aa70..48d8198277720f17bd06e774746a96298ef3b164 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -187,6 +187,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0188-Shulker-spawn-from-bullet-options.patch b/patches/server/0187-Shulker-spawn-from-bullet-options.patch similarity index 98% rename from patches/server/0188-Shulker-spawn-from-bullet-options.patch rename to patches/server/0187-Shulker-spawn-from-bullet-options.patch index 89c015873..f6675e215 100644 --- a/patches/server/0188-Shulker-spawn-from-bullet-options.patch +++ b/patches/server/0187-Shulker-spawn-from-bullet-options.patch @@ -67,7 +67,7 @@ index 2170715ed0e81a3055e4ab546c8b294c5ef7f142..beae4e2b9f61df83215de860d64c4ce2 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 08befb60564bb8e06f576b2762dac11ecf09d720..cf0bc79ffdf63b16c495896c5d5204d752c8e19e 100644 +index 62f984a5bbfd50a2ad66bfcde4c1b461cb9c1e6a..80aa54f4e04009a044db29f0aa523777904bf6c3 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1939,6 +1939,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0189-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0188-Eating-glow-berries-adds-glow-effect.patch similarity index 97% rename from patches/server/0189-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0188-Eating-glow-berries-adds-glow-effect.patch index 59bd6be67..238ab98ad 100644 --- a/patches/server/0189-Eating-glow-berries-adds-glow-effect.patch +++ b/patches/server/0188-Eating-glow-berries-adds-glow-effect.patch @@ -18,7 +18,7 @@ index 42e6aeea8d2e076aea7fa2c1ccf5edcc5efba46f..1f2e467272dddf3e91b7ab7037a0367b public static final Item SOUL_CAMPFIRE = registerBlock(Blocks.SOUL_CAMPFIRE); public static final Item SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cf0bc79ffdf63b16c495896c5d5204d752c8e19e..96fe670ad1759e10e07e2ebe12af349259396f2e 100644 +index 80aa54f4e04009a044db29f0aa523777904bf6c3..2ddb58e7703cc936f0b6b8765e82bc1be40044d3 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -222,6 +222,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0190-Option-to-make-drowned-break-doors.patch b/patches/server/0189-Option-to-make-drowned-break-doors.patch similarity index 97% rename from patches/server/0190-Option-to-make-drowned-break-doors.patch rename to patches/server/0189-Option-to-make-drowned-break-doors.patch index df68d415c..015b398a7 100644 --- a/patches/server/0190-Option-to-make-drowned-break-doors.patch +++ b/patches/server/0189-Option-to-make-drowned-break-doors.patch @@ -34,7 +34,7 @@ index 81646291540b07d6e1fa4ca06eda35f048a7a4fe..7a348d243f2a39c4e3faa1995eaf3f0c @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 96fe670ad1759e10e07e2ebe12af349259396f2e..013374a96617c162059261d69826dc0f220912fe 100644 +index 2ddb58e7703cc936f0b6b8765e82bc1be40044d3..0fd50512402abcae8be322491f853da68843dabb 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1085,6 +1085,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0191-Configurable-hunger-starvation-damage.patch b/patches/server/0190-Configurable-hunger-starvation-damage.patch similarity index 95% rename from patches/server/0191-Configurable-hunger-starvation-damage.patch rename to patches/server/0190-Configurable-hunger-starvation-damage.patch index 1fb53523e..ad0dd863d 100644 --- a/patches/server/0191-Configurable-hunger-starvation-damage.patch +++ b/patches/server/0190-Configurable-hunger-starvation-damage.patch @@ -18,7 +18,7 @@ index 87f9e03fb5e095396e054a84be60ec455d3fbd35..3d2e3c7dd3bf5c8f483a933e9f686858 this.tickTimer = 0; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 013374a96617c162059261d69826dc0f220912fe..336a1ce77cb4725f3c739409901d675a2b7f5c8d 100644 +index 0fd50512402abcae8be322491f853da68843dabb..6c912eed4ba23d06152d27c6f5e51780a6b525b2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2596,4 +2596,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0192-Enhance-SysoutCatcher.patch b/patches/server/0191-Enhance-SysoutCatcher.patch similarity index 100% rename from patches/server/0192-Enhance-SysoutCatcher.patch rename to patches/server/0191-Enhance-SysoutCatcher.patch diff --git a/patches/server/0193-Add-uptime-command.patch b/patches/server/0192-Add-uptime-command.patch similarity index 97% rename from patches/server/0193-Add-uptime-command.patch rename to patches/server/0192-Add-uptime-command.patch index 8723dbe70..1d32b3a66 100644 --- a/patches/server/0193-Add-uptime-command.patch +++ b/patches/server/0192-Add-uptime-command.patch @@ -17,7 +17,7 @@ index 144e83bac0d8885c48d97d7fbb4b712d4c0fc4b3..23e19bfbc41c5982a746ad0b5ba8c583 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 40a52c16e4e9da8c846ff69e9d22066ff134caea..ca1d7de70edeafe1eb6a0b47d622fd6c8ff03841 100644 +index de9e19d9979ad6981fcda881d22b18a613c4138d..83cfdbd54d5eb9fb614ab0828b052735868d98b9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -296,6 +296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop dispatcher) { + dispatcher.register(Commands.literal("uptime") -+ .requires((listener) -> listener.hasPermission(2)) ++ .requires((listener) -> listener.hasPermission(2, "bukkit.command.uptime")) + .executes((context) -> execute(context.getSource())) -+ ).setPermission("bukkit.command.uptime"); ++ ); + } + + private static int execute(CommandSourceStack sender) { diff --git a/patches/server/0194-Tool-actionable-options.patch b/patches/server/0193-Tool-actionable-options.patch similarity index 99% rename from patches/server/0194-Tool-actionable-options.patch rename to patches/server/0193-Tool-actionable-options.patch index 46fc26107..7d7aef3a6 100644 --- a/patches/server/0194-Tool-actionable-options.patch +++ b/patches/server/0193-Tool-actionable-options.patch @@ -122,7 +122,7 @@ index 180aec596110309aade13d2080f8824d152b07cb..c4aec1e5135a79837918b692e75a7b55 return InteractionResult.PASS; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 336a1ce77cb4725f3c739409901d675a2b7f5c8d..170aef2112ff5b467f515187c3b184aece59f218 100644 +index 6c912eed4ba23d06152d27c6f5e51780a6b525b2..527a1c3205b2a284096ed308fe7947c4cdde2831 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -524,6 +524,159 @@ public class PurpurWorldConfig { diff --git a/patches/server/0195-Store-placer-on-Block-when-placed.patch b/patches/server/0194-Store-placer-on-Block-when-placed.patch similarity index 100% rename from patches/server/0195-Store-placer-on-Block-when-placed.patch rename to patches/server/0194-Store-placer-on-Block-when-placed.patch diff --git a/patches/server/0196-Summoner-API.patch b/patches/server/0195-Summoner-API.patch similarity index 100% rename from patches/server/0196-Summoner-API.patch rename to patches/server/0195-Summoner-API.patch diff --git a/patches/server/0197-Customizable-sleeping-actionbar-messages.patch b/patches/server/0196-Customizable-sleeping-actionbar-messages.patch similarity index 97% rename from patches/server/0197-Customizable-sleeping-actionbar-messages.patch rename to patches/server/0196-Customizable-sleeping-actionbar-messages.patch index e483c58f6..a937abaf7 100644 --- a/patches/server/0197-Customizable-sleeping-actionbar-messages.patch +++ b/patches/server/0196-Customizable-sleeping-actionbar-messages.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Customizable sleeping actionbar messages diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index cb8870189396b30fcd89b64f909e60f0674fda2c..346a006b2dd10b1e4fb29662661abfeffd07013f 100644 +index 2625f92d3bb61f89207941adbba59cb99d99eeb6..63deec6d22c18ca43c34b7f2dc961ce84a10bdaa 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1043,11 +1043,27 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0198-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0197-option-to-disable-shulker-box-items-from-dropping-co.patch similarity index 92% rename from patches/server/0198-option-to-disable-shulker-box-items-from-dropping-co.patch rename to patches/server/0197-option-to-disable-shulker-box-items-from-dropping-co.patch index b327e0cf7..0b72aa1b8 100644 --- a/patches/server/0198-option-to-disable-shulker-box-items-from-dropping-co.patch +++ b/patches/server/0197-option-to-disable-shulker-box-items-from-dropping-co.patch @@ -6,7 +6,7 @@ Subject: [PATCH] option to disable shulker box items from dropping contents diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java -index b0204af850ee182773ad458208cccd946ad148d5..81eb7092e6172bf9685d4feb52dabb012979be70 100644 +index ebee8de2ed831755b6fd154f6cc77ac993839bb9..ff236d3ad8838b14e5a20c70b2a2ce56d441dc7f 100644 --- a/src/main/java/net/minecraft/world/item/BlockItem.java +++ b/src/main/java/net/minecraft/world/item/BlockItem.java @@ -288,7 +288,7 @@ public class BlockItem extends Item { @@ -19,7 +19,7 @@ index b0204af850ee182773ad458208cccd946ad148d5..81eb7092e6172bf9685d4feb52dabb01 CompoundTag nbttagcompound = BlockItem.getBlockEntityData(itemstack); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 170aef2112ff5b467f515187c3b184aece59f218..87cb82b4aefa58dec55c719bcd51df5295b4733f 100644 +index 527a1c3205b2a284096ed308fe7947c4cdde2831..403420313834bd9f025a8f069291cfea71348804 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -223,6 +223,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0199-Silk-touchable-budding-amethyst.patch b/patches/server/0198-Silk-touchable-budding-amethyst.patch similarity index 96% rename from patches/server/0199-Silk-touchable-budding-amethyst.patch rename to patches/server/0198-Silk-touchable-budding-amethyst.patch index 619d11506..188f24a55 100644 --- a/patches/server/0199-Silk-touchable-budding-amethyst.patch +++ b/patches/server/0198-Silk-touchable-budding-amethyst.patch @@ -24,7 +24,7 @@ index bedccb8717d08d5a60058445b04ddff149e7d36c..5293ffca3da94c9c485a87d1232b6a90 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 87cb82b4aefa58dec55c719bcd51df5295b4733f..a3a009fdeb0d0dfd0b03187c5f34490e90e25cfd 100644 +index 403420313834bd9f025a8f069291cfea71348804..5e120ed76f0531ee24bd285a1ad16114a571978e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -718,6 +718,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0200-Big-dripleaf-tilt-delay.patch b/patches/server/0199-Big-dripleaf-tilt-delay.patch similarity index 96% rename from patches/server/0200-Big-dripleaf-tilt-delay.patch rename to patches/server/0199-Big-dripleaf-tilt-delay.patch index 1ce9d4e87..3cc8c675e 100644 --- a/patches/server/0200-Big-dripleaf-tilt-delay.patch +++ b/patches/server/0199-Big-dripleaf-tilt-delay.patch @@ -24,7 +24,7 @@ index 8537581e7ca1f4efb492a2e734f46f947f36cffa..5f89229ff68d923c5cdee40e72e379ba if (i != -1) { world.scheduleTick(blockposition, (Block) this, i); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a3a009fdeb0d0dfd0b03187c5f34490e90e25cfd..0a1b894dad87b73f28fe9b37e08abb7b95d3b040 100644 +index 5e120ed76f0531ee24bd285a1ad16114a571978e..312f1a7cc9f15d0cd7627f32cfa9f86ae12eae7a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -718,6 +718,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0201-Player-ridable-in-water-option.patch b/patches/server/0200-Player-ridable-in-water-option.patch similarity index 96% rename from patches/server/0201-Player-ridable-in-water-option.patch rename to patches/server/0200-Player-ridable-in-water-option.patch index 51139fa5e..71505a22a 100644 --- a/patches/server/0201-Player-ridable-in-water-option.patch +++ b/patches/server/0200-Player-ridable-in-water-option.patch @@ -21,7 +21,7 @@ index 48d8198277720f17bd06e774746a96298ef3b164..74c660bcc77c18241c6ccc0450174a15 if (!this.isPassenger() && this.onGround && !this.isInWater() && !this.isInPowderSnow) { if (this.getShoulderEntityLeft().isEmpty()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index bd881397324b2c1165694109682ebed975d02824..49ec44524ab181425848c546231779d6e4261c81 100644 +index 312f1a7cc9f15d0cd7627f32cfa9f86ae12eae7a..b368159f9e7cb5c048673d3330693f8b02c2a7c1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -398,6 +398,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0202-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0201-Config-to-disable-Enderman-teleport-on-projectile-hi.patch similarity index 96% rename from patches/server/0202-Config-to-disable-Enderman-teleport-on-projectile-hi.patch rename to patches/server/0201-Config-to-disable-Enderman-teleport-on-projectile-hi.patch index 7647cc1ba..2b053f544 100644 --- a/patches/server/0202-Config-to-disable-Enderman-teleport-on-projectile-hi.patch +++ b/patches/server/0201-Config-to-disable-Enderman-teleport-on-projectile-hi.patch @@ -17,7 +17,7 @@ index bfde674f2e5f88cfe9a4c760a9f8eb9038eaef21..0cb3a52990eb17339fbd61e1649a2774 for (int i = 0; i < 64; ++i) { if (this.teleport()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cbf4c40bf7c7e6547554f8d9086be0d7d99b522f..6b69f61d635c3803e21ffb3ffd5c0f3af0476502 100644 +index b368159f9e7cb5c048673d3330693f8b02c2a7c1..572e4c14f2dfa3b0ff50c7322932e3083d37fe70 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1340,6 +1340,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0203-Add-compass-command.patch b/patches/server/0202-Add-compass-command.patch similarity index 96% rename from patches/server/0203-Add-compass-command.patch rename to patches/server/0202-Add-compass-command.patch index 861ccf3d7..f6c86cf9d 100644 --- a/patches/server/0203-Add-compass-command.patch +++ b/patches/server/0202-Add-compass-command.patch @@ -17,7 +17,7 @@ index 23e19bfbc41c5982a746ad0b5ba8c5834c2494a5..314ab6183e31b4bac6a40c1f8007d48e if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index daf1339f2334729adea28d47730a124a92a70f0a..44562c3ae8d0776b8834587b1d3fb628c97a7138 100644 +index 02e196377924a000d42db855c77c74c7c1220595..e79f0c9832927ba9b03c68669c5bb0fb5586d37a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -278,6 +278,7 @@ public class ServerPlayer extends Player { @@ -89,7 +89,7 @@ index 31f5d9bcc11dc78b0d04c55560d5a2fa18bf3896..42532975d8c5558a7598e759838e75f2 hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector); uptimeFormat = getString("settings.command.uptime.format", uptimeFormat); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3d0da6275827a2f0cb1aea72dac5412df8c6eb62..db1fa62541589981a45ef9be382b87ed5995e5cf 100644 +index 572e4c14f2dfa3b0ff50c7322932e3083d37fe70..a066968f61c55c569a922137e5b837690f2f8ebd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -224,6 +224,7 @@ public class PurpurWorldConfig { @@ -110,7 +110,7 @@ index 3d0da6275827a2f0cb1aea72dac5412df8c6eb62..db1fa62541589981a45ef9be382b87ed public double minecartMaxSpeed = 0.4D; diff --git a/src/main/java/org/purpurmc/purpur/command/CompassCommand.java b/src/main/java/org/purpurmc/purpur/command/CompassCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..34b6b1db6ef85d40cb84a5e19453ef5c5110d539 +index 0000000000000000000000000000000000000000..79b8490832d2a0cc7846ddcb091cb6bcac74ea45 --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/command/CompassCommand.java @@ -0,0 +1,27 @@ @@ -125,7 +125,7 @@ index 0000000000000000000000000000000000000000..34b6b1db6ef85d40cb84a5e19453ef5c +public class CompassCommand { + public static void register(CommandDispatcher dispatcher) { + dispatcher.register(Commands.literal("compass") -+ .requires(listener -> listener.hasPermission(2)) ++ .requires(listener -> listener.hasPermission(2, "bukkit.command.compass")) + .executes(context -> { + ServerPlayer player = context.getSource().getPlayerOrException(); + CompassTask task = CompassTask.instance(); @@ -138,7 +138,7 @@ index 0000000000000000000000000000000000000000..34b6b1db6ef85d40cb84a5e19453ef5c + } + return 1; + }) -+ ).setPermission("bukkit.command.compass"); ++ ); + } +} diff --git a/src/main/java/org/purpurmc/purpur/task/BossBarTask.java b/src/main/java/org/purpurmc/purpur/task/BossBarTask.java diff --git a/patches/server/0204-Toggle-for-kinetic-damage.patch b/patches/server/0203-Toggle-for-kinetic-damage.patch similarity index 91% rename from patches/server/0204-Toggle-for-kinetic-damage.patch rename to patches/server/0203-Toggle-for-kinetic-damage.patch index 0a89616c9..312a4d291 100644 --- a/patches/server/0204-Toggle-for-kinetic-damage.patch +++ b/patches/server/0203-Toggle-for-kinetic-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for kinetic damage diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e3055bba8b8bed8044e9a8b2b5c83f02d3f2fbc2..0404df6ed903832f443fe9475ad7a5590bf1c845 100644 +index c6e08bdfe1123ce5080c2cd91320702dab6bf84c..db6ee0ef067c42dd7f3a69cc796e2dd2c8fc059d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2858,6 +2858,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -17,7 +17,7 @@ index e3055bba8b8bed8044e9a8b2b5c83f02d3f2fbc2..0404df6ed903832f443fe9475ad7a559 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e6696e1f5d4a38a6972102f1ff2b8b3f8b66d732..ae3dfebfc8c5e0ae0669cda3479103a1d2046b1e 100644 +index a066968f61c55c569a922137e5b837690f2f8ebd..fa417b9103c97d350d1fc74f7612ac7928641b75 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -184,12 +184,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0205-Add-Option-for-disable-observer-clocks.patch b/patches/server/0204-Add-Option-for-disable-observer-clocks.patch similarity index 95% rename from patches/server/0205-Add-Option-for-disable-observer-clocks.patch rename to patches/server/0204-Add-Option-for-disable-observer-clocks.patch index 740af7125..e58730eb7 100644 --- a/patches/server/0205-Add-Option-for-disable-observer-clocks.patch +++ b/patches/server/0204-Add-Option-for-disable-observer-clocks.patch @@ -18,7 +18,7 @@ index 7b45d6b9a005036ca5051d089a7be792eb87012f..8806c97ecc6bdd8a64c2d82bb2f58f46 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ae3dfebfc8c5e0ae0669cda3479103a1d2046b1e..2f69f6080951acfd41e31b70fdd269d8cead2bf0 100644 +index fa417b9103c97d350d1fc74f7612ac7928641b75..79d08b70a28c407be3cbdea7a80c38651a068441 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -371,6 +371,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0206-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0205-Customizeable-Zombie-Villager-curing-times.patch similarity index 96% rename from patches/server/0206-Customizeable-Zombie-Villager-curing-times.patch rename to patches/server/0205-Customizeable-Zombie-Villager-curing-times.patch index 5391096ec..cc841f959 100644 --- a/patches/server/0206-Customizeable-Zombie-Villager-curing-times.patch +++ b/patches/server/0205-Customizeable-Zombie-Villager-curing-times.patch @@ -18,7 +18,7 @@ index 6e1caf05b5577fec82354b4c59e3f86b3c1c1dbc..a6d9354d8ddac808cc89c5fe70842fc2 return InteractionResult.SUCCESS; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2f69f6080951acfd41e31b70fdd269d8cead2bf0..3e6c97169688d462b00a1437449473b5aef59623 100644 +index 79d08b70a28c407be3cbdea7a80c38651a068441..08dee270faec81a9b99d8d7ca8fed6ed3eb00cc7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2741,6 +2741,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0207-Option-for-sponges-to-work-on-lava.patch b/patches/server/0206-Option-for-sponges-to-work-on-lava.patch similarity index 95% rename from patches/server/0207-Option-for-sponges-to-work-on-lava.patch rename to patches/server/0206-Option-for-sponges-to-work-on-lava.patch index 0230d1624..433773598 100644 --- a/patches/server/0207-Option-for-sponges-to-work-on-lava.patch +++ b/patches/server/0206-Option-for-sponges-to-work-on-lava.patch @@ -18,7 +18,7 @@ index d96e3fbc0fd4275c29e7e6154ef66e9ed1a5d829..df04a571ebd3c04bc7b58c1ee5661a1f ++i; if (j < world.purpurConfig.spongeAbsorptionRadius) { // Purpur diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3e6c97169688d462b00a1437449473b5aef59623..d413cb0e6a5806a70ca697f8e842b8b0285e479b 100644 +index 08dee270faec81a9b99d8d7ca8fed6ed3eb00cc7..7e161a793c13f53104ec7178320ce36c5aa1320c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -929,9 +929,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0208-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0207-Toggle-for-Wither-s-spawn-sound.patch similarity index 96% rename from patches/server/0208-Toggle-for-Wither-s-spawn-sound.patch rename to patches/server/0207-Toggle-for-Wither-s-spawn-sound.patch index 665aa40ee..35ee84a8c 100644 --- a/patches/server/0208-Toggle-for-Wither-s-spawn-sound.patch +++ b/patches/server/0207-Toggle-for-Wither-s-spawn-sound.patch @@ -18,7 +18,7 @@ index eeab4bb9727be75a4167aeb8ed1c80a2a2145be9..b746f793228560275e2a50bd2342f20d // this.world.globalLevelEvent(1023, new BlockPosition(this), 0); int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d413cb0e6a5806a70ca697f8e842b8b0285e479b..e719863a96e888dc67cbb6ffeb40c53e9db2fec8 100644 +index 7e161a793c13f53104ec7178320ce36c5aa1320c..928b2e580ab629de5f0ad072f9fb62f5df4399cf 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2586,6 +2586,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0209-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0208-Cactus-breaks-from-solid-neighbors-config.patch similarity index 95% rename from patches/server/0209-Cactus-breaks-from-solid-neighbors-config.patch rename to patches/server/0208-Cactus-breaks-from-solid-neighbors-config.patch index c5c02c51d..d8aa64788 100644 --- a/patches/server/0209-Cactus-breaks-from-solid-neighbors-config.patch +++ b/patches/server/0208-Cactus-breaks-from-solid-neighbors-config.patch @@ -18,7 +18,7 @@ index 7579946ce222b6ab3685a7fd9821bcd5a4babe33..2fffe4452d8f3fa5b9365dff1cfe5b5d return false; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e719863a96e888dc67cbb6ffeb40c53e9db2fec8..009d34916d454bed127c37e238af4183e09b69da 100644 +index 928b2e580ab629de5f0ad072f9fb62f5df4399cf..6b0ed4fc2138f2a8f91cc90af334e4a502929d88 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -750,6 +750,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0210-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0209-Config-to-remove-curse-of-binding-with-weakness.patch similarity index 96% rename from patches/server/0210-Config-to-remove-curse-of-binding-with-weakness.patch rename to patches/server/0209-Config-to-remove-curse-of-binding-with-weakness.patch index d18118862..1f2cf29f9 100644 --- a/patches/server/0210-Config-to-remove-curse-of-binding-with-weakness.patch +++ b/patches/server/0209-Config-to-remove-curse-of-binding-with-weakness.patch @@ -26,7 +26,7 @@ index da0f5c5e6ca7ce7b38792e6da52c5cdcdbae3b78..4136bcd49fe05d916ab65de0e8661451 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 009d34916d454bed127c37e238af4183e09b69da..22eb44e4b9f5ee5485de35ab28766bcc5546c264 100644 +index 6b0ed4fc2138f2a8f91cc90af334e4a502929d88..daf3c30dc7f8d40e6e71184b6e0a2f5305027849 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -408,6 +408,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0211-Conduit-behavior-configuration.patch b/patches/server/0210-Conduit-behavior-configuration.patch similarity index 98% rename from patches/server/0211-Conduit-behavior-configuration.patch rename to patches/server/0210-Conduit-behavior-configuration.patch index 74cae76c1..064312ead 100644 --- a/patches/server/0211-Conduit-behavior-configuration.patch +++ b/patches/server/0210-Conduit-behavior-configuration.patch @@ -77,7 +77,7 @@ index 963a596154091b79ca139af6274aa323518ad1ad..4dcac3899a500d8586580bcfd5b4516e }); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 22eb44e4b9f5ee5485de35ab28766bcc5546c264..c0f1abdbffe839b211c402bda6996a265aee2e06 100644 +index daf3c30dc7f8d40e6e71184b6e0a2f5305027849..b4488467a30e40d9b89a979819142d8863444778 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2805,5 +2805,28 @@ public class PurpurWorldConfig { diff --git a/patches/server/0212-Cauldron-fill-chances.patch b/patches/server/0211-Cauldron-fill-chances.patch similarity index 97% rename from patches/server/0212-Cauldron-fill-chances.patch rename to patches/server/0211-Cauldron-fill-chances.patch index 3f634d8e5..fc56540ee 100644 --- a/patches/server/0212-Cauldron-fill-chances.patch +++ b/patches/server/0211-Cauldron-fill-chances.patch @@ -47,7 +47,7 @@ index 6b909d41ccdf6c1ac3ac0c4e673ff52f0d14a238..b8f69063cec4d31c9d9525a04c46ed89 if (dripChance < f1) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c0f1abdbffe839b211c402bda6996a265aee2e06..f7851eb0d2e328b8c31f7fe71e974812a53d163f 100644 +index b4488467a30e40d9b89a979819142d8863444778..7265366cf680f8587b49995705a3f5a1083c67fe 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2828,5 +2828,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0213-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0212-Config-to-allow-mobs-to-pathfind-over-rails.patch similarity index 97% rename from patches/server/0213-Config-to-allow-mobs-to-pathfind-over-rails.patch rename to patches/server/0212-Config-to-allow-mobs-to-pathfind-over-rails.patch index 545d2c7a9..4f89f10cd 100644 --- a/patches/server/0213-Config-to-allow-mobs-to-pathfind-over-rails.patch +++ b/patches/server/0212-Config-to-allow-mobs-to-pathfind-over-rails.patch @@ -18,7 +18,7 @@ index 94a0fde36dda9404e5eb62d323c71dac1929a46b..17a7fab20b4174273354fdc2fc700b7f if (node != null && (node.type == BlockPathTypes.OPEN || node.type == BlockPathTypes.WALKABLE) && this.mob.getBbWidth() < 1.0F) { double g = (double)(x - direction.getStepX()) + 0.5D; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f7851eb0d2e328b8c31f7fe71e974812a53d163f..a8fe10ba0f275b57d587fb99bf6a5120e52bd7d4 100644 +index 7265366cf680f8587b49995705a3f5a1083c67fe..ec5adf9fafbfa451ba610f132c8dc249c7bf4812 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -140,6 +140,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0214-Shulker-change-color-with-dye.patch b/patches/server/0213-Shulker-change-color-with-dye.patch similarity index 97% rename from patches/server/0214-Shulker-change-color-with-dye.patch rename to patches/server/0213-Shulker-change-color-with-dye.patch index 5315226bb..9c1726db8 100644 --- a/patches/server/0214-Shulker-change-color-with-dye.patch +++ b/patches/server/0213-Shulker-change-color-with-dye.patch @@ -47,7 +47,7 @@ index 144a872afd4585767d1e96c3e51d4b9fd87dbf89..ec90f23f64ce4fefa0960ae9ddf72b77 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a8fe10ba0f275b57d587fb99bf6a5120e52bd7d4..dd79e857ec11812a58dbf79cf746d88f39f51a64 100644 +index ec5adf9fafbfa451ba610f132c8dc249c7bf4812..2c6e4905e691338de60d60cfe27fefce1854e102 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2148,6 +2148,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0215-Extended-OfflinePlayer-API.patch b/patches/server/0214-Extended-OfflinePlayer-API.patch similarity index 100% rename from patches/server/0215-Extended-OfflinePlayer-API.patch rename to patches/server/0214-Extended-OfflinePlayer-API.patch diff --git a/patches/server/0216-Added-the-ability-to-add-combustible-items.patch b/patches/server/0215-Added-the-ability-to-add-combustible-items.patch similarity index 95% rename from patches/server/0216-Added-the-ability-to-add-combustible-items.patch rename to patches/server/0215-Added-the-ability-to-add-combustible-items.patch index 16f06de6f..77104b82e 100644 --- a/patches/server/0216-Added-the-ability-to-add-combustible-items.patch +++ b/patches/server/0215-Added-the-ability-to-add-combustible-items.patch @@ -24,7 +24,7 @@ index 8ae78ae54d87ea7789df754311fa0e8aade0ce91..35479019fb846573f4e2eb5902f3ebe8 } else if (this.isFuel(itemstack1)) { if (!this.moveItemStackTo(itemstack1, 1, 2, false)) { diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -index ffc05b20105227799904b66a7d208ccef04cb876..507b3756238ec3054232b805a9b689be6ea12e25 100644 +index 4ff472f454b60c3608286b7553926acf74069b73..5cd7b4e7065070bf9fcc34b621dba2ccba99a573 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java @@ -208,6 +208,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit @@ -51,7 +51,7 @@ index ffc05b20105227799904b66a7d208ccef04cb876..507b3756238ec3054232b805a9b689be private int maxStack = MAX_STACK; public List transaction = new java.util.ArrayList(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6f4cb22b477042cb895572596797556e0f21a100..86e40bf7cf90c33f914c38f2edb3bd8c5bb00f1c 100644 +index 471a867b9734e6fb9735c17b06c1daf844657c50..09c827d21581318f282a9a17a8f8f95d26d4d1d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1435,6 +1435,19 @@ public final class CraftServer implements Server { diff --git a/patches/server/0217-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0216-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch similarity index 94% rename from patches/server/0217-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch rename to patches/server/0216-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch index a6f35811c..4ceec341c 100644 --- a/patches/server/0217-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch +++ b/patches/server/0216-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 346a006b2dd10b1e4fb29662661abfeffd07013f..34761f14354ce29db48859ebb142740ea6b53ff9 100644 +index 63deec6d22c18ca43c34b7f2dc961ce84a10bdaa..169eb774eea589cab7daec9fe5764a639ecd8ed4 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1202,6 +1202,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -25,7 +25,7 @@ index 346a006b2dd10b1e4fb29662661abfeffd07013f..34761f14354ce29db48859ebb142740e // CraftBukkit start // If we stop due to everyone sleeping we should reset the weather duration to some other random value. diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index dd79e857ec11812a58dbf79cf746d88f39f51a64..e7b884b465dbe47550134277f528fb23601f70bc 100644 +index 2c6e4905e691338de60d60cfe27fefce1854e102..2faddfef9b38d35cfcd6ffdb8a93b0c831f59bf2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -141,6 +141,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0218-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0217-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch similarity index 98% rename from patches/server/0218-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch rename to patches/server/0217-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch index db1c9ca10..c4feebd5f 100644 --- a/patches/server/0218-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch +++ b/patches/server/0217-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch @@ -45,7 +45,7 @@ index 8584a65433555133cdcfc24a078fb0b53b9f83bc..4afc4670f9b00a4087410ec366fe45fe public static final Block PINK_PETALS = register("pink_petals", new PinkPetalsBlock(BlockBehaviour.Properties.of(Material.PLANT).noCollission().sound(SoundType.PINK_PETALS).requiredFeatures(FeatureFlags.UPDATE_1_20))); public static final Block MOSS_BLOCK = register("moss_block", new MossBlock(BlockBehaviour.Properties.of(Material.MOSS, MaterialColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS))); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e7b884b465dbe47550134277f528fb23601f70bc..85f40c9255fe6ceb75b526b128ec7772d1fe4928 100644 +index 2faddfef9b38d35cfcd6ffdb8a93b0c831f59bf2..983ce2c38f27be08cb9a95305ff465222c8d307a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -705,6 +705,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0219-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0218-Shift-right-click-to-use-exp-for-mending.patch similarity index 98% rename from patches/server/0219-Shift-right-click-to-use-exp-for-mending.patch rename to patches/server/0218-Shift-right-click-to-use-exp-for-mending.patch index 4b0f2d5c5..585ae4d48 100644 --- a/patches/server/0219-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0218-Shift-right-click-to-use-exp-for-mending.patch @@ -36,7 +36,7 @@ index 6b186a49957e97a60bb245912211d58eb7b84c0d..75f29f6dddf50ccf7ef43ecfa602ccad + // Purpur end } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d97b35d9ca448c8ef0b20a31b873022dd08085f5..b78a64b8086559cfb0da6de1640b59a1e5c50345 100644 +index 0ace3d20fb71359a58659bb9ddf938d547f3750f..08453b8a4dc80deb0e3f878b0557af85f2859179 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2086,6 +2086,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0220-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0219-Dolphins-naturally-aggressive-to-players-chance.patch similarity index 98% rename from patches/server/0220-Dolphins-naturally-aggressive-to-players-chance.patch rename to patches/server/0219-Dolphins-naturally-aggressive-to-players-chance.patch index 5bd99e57e..3381222f9 100644 --- a/patches/server/0220-Dolphins-naturally-aggressive-to-players-chance.patch +++ b/patches/server/0219-Dolphins-naturally-aggressive-to-players-chance.patch @@ -47,7 +47,7 @@ index f8d3a5d2dc254501c7e4405444ed4439f9af915e..c038a23c4e19c5bf160792cf599acc8f public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4e136afc1d1eb052a0c87cde7bb81a50824b3e63..654a51648172fc8186d4795d751fc4f777a74758 100644 +index 19108c36e9ceeb28c74f7b87547d5ad6ea267f2e..16954ae2a65b54b77807b5fcb6b07da3b4aa4056 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1246,6 +1246,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0221-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0220-Cows-naturally-aggressive-to-players-chance.patch similarity index 98% rename from patches/server/0221-Cows-naturally-aggressive-to-players-chance.patch rename to patches/server/0220-Cows-naturally-aggressive-to-players-chance.patch index 6952fa4f7..adb568664 100644 --- a/patches/server/0221-Cows-naturally-aggressive-to-players-chance.patch +++ b/patches/server/0220-Cows-naturally-aggressive-to-players-chance.patch @@ -59,7 +59,7 @@ index d1966126950d086649c1e3c7cd140669c36d7e76..f6dc68ddea67e9573d2420c8f852b092 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 654a51648172fc8186d4795d751fc4f777a74758..2a333fa507ef6d1076ce85b47e0eded7b06c4c12 100644 +index 16954ae2a65b54b77807b5fcb6b07da3b4aa4056..ae9da2623c3018df84eda987984ec518b9d73324 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1195,7 +1195,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0222-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0221-Option-for-beds-to-explode-on-villager-sleep.patch similarity index 96% rename from patches/server/0222-Option-for-beds-to-explode-on-villager-sleep.patch rename to patches/server/0221-Option-for-beds-to-explode-on-villager-sleep.patch index fd672ab48..cb8552170 100644 --- a/patches/server/0222-Option-for-beds-to-explode-on-villager-sleep.patch +++ b/patches/server/0221-Option-for-beds-to-explode-on-villager-sleep.patch @@ -22,7 +22,7 @@ index 401d0885852edbb30b12cfb58c86479d722143ff..2e759f0b3766377c65608deb3d1859c7 this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime()); // CraftBukkit - decompile error this.brain.eraseMemory(MemoryModuleType.WALK_TARGET); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2a333fa507ef6d1076ce85b47e0eded7b06c4c12..c8e15efc4acc34d77a338467f91032cd3a843cd5 100644 +index ae9da2623c3018df84eda987984ec518b9d73324..a2f76543ad4ecf72da6414005b9621b633241023 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -724,6 +724,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0223-Halloween-options-and-optimizations.patch b/patches/server/0222-Halloween-options-and-optimizations.patch similarity index 98% rename from patches/server/0223-Halloween-options-and-optimizations.patch rename to patches/server/0222-Halloween-options-and-optimizations.patch index 18304977c..77fc23614 100644 --- a/patches/server/0223-Halloween-options-and-optimizations.patch +++ b/patches/server/0222-Halloween-options-and-optimizations.patch @@ -60,7 +60,7 @@ index 114093185454a428e0ef9f0877ea4efd9532c2f8..d2ab6c240bc45f1c19ade78a7c050930 this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c8e15efc4acc34d77a338467f91032cd3a843cd5..a7da799ed5295928ec75d1646bbad6980aa27555 100644 +index a2f76543ad4ecf72da6414005b9621b633241023..1284ca0c89647e22a13734540e1dbe82f841f922 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1588,6 +1588,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0224-Config-for-grindstones.patch b/patches/server/0223-Config-for-grindstones.patch similarity index 100% rename from patches/server/0224-Config-for-grindstones.patch rename to patches/server/0223-Config-for-grindstones.patch diff --git a/patches/server/0225-UPnP-Port-Forwarding.patch b/patches/server/0224-UPnP-Port-Forwarding.patch similarity index 97% rename from patches/server/0225-UPnP-Port-Forwarding.patch rename to patches/server/0224-UPnP-Port-Forwarding.patch index 7f3f5d473..169dc76b1 100644 --- a/patches/server/0225-UPnP-Port-Forwarding.patch +++ b/patches/server/0224-UPnP-Port-Forwarding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ca1d7de70edeafe1eb6a0b47d622fd6c8ff03841..7bb6b71d258cf85c1f86566ea7bd869b6186bbdf 100644 +index 83cfdbd54d5eb9fb614ab0828b052735868d98b9..ac616adc23ef5a404858e341ef01a4d5141d093e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -311,6 +311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop list = world.getEntitiesOfClass(Villager.class, axisalignedbb); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ab17cf6c92083bf0ca0b1566b2c20288f85135a6..607106eed6cd801885fb8073f2f74b21dfc2e593 100644 +index d7702b8e10f540182e1a92eabe2c107c00260bd1..9af718dc9e719ba1e2cdae1ea8f1e36437ab689c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2711,6 +2711,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0261-Stonecutter-damage.patch b/patches/server/0260-Stonecutter-damage.patch similarity index 98% rename from patches/server/0261-Stonecutter-damage.patch rename to patches/server/0260-Stonecutter-damage.patch index 7991b8b4b..64009290a 100644 --- a/patches/server/0261-Stonecutter-damage.patch +++ b/patches/server/0260-Stonecutter-damage.patch @@ -63,7 +63,7 @@ index 636c032127c2026509764745f805ae0693e4a983..3734f6279005872eac6697e6e22c3a2e public static boolean advancementOnlyBroadcastToAffectedPlayer = false; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 607106eed6cd801885fb8073f2f74b21dfc2e593..0d31953521cd16255b8f314a0ee7fce3556548f1 100644 +index 9af718dc9e719ba1e2cdae1ea8f1e36437ab689c..5336f9a6aa724ccaed19b3dc7faa5fb8d38cdab4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -996,6 +996,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0262-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0261-Configurable-damage-settings-for-magma-blocks.patch similarity index 96% rename from patches/server/0262-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0261-Configurable-damage-settings-for-magma-blocks.patch index 7d3174136..81f3f9777 100644 --- a/patches/server/0262-Configurable-damage-settings-for-magma-blocks.patch +++ b/patches/server/0261-Configurable-damage-settings-for-magma-blocks.patch @@ -18,7 +18,7 @@ index 12ffb5714f088f4aeafa1ad6a36f5b64a86c4c96..293aa5c8f91a997045f8d9f2951fe3a7 entity.hurt(world.damageSources().hotFloor(), 1.0F); org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0d31953521cd16255b8f314a0ee7fce3556548f1..44e76c5b3070727299340109e7950a788ae970de 100644 +index 5336f9a6aa724ccaed19b3dc7faa5fb8d38cdab4..b55445defb3a71e93845fb387757eabeff8150bf 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -927,6 +927,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0263-Add-config-for-snow-on-blue-ice.patch b/patches/server/0262-Add-config-for-snow-on-blue-ice.patch similarity index 95% rename from patches/server/0263-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0262-Add-config-for-snow-on-blue-ice.patch index 187e46d83..0021d19e3 100644 --- a/patches/server/0263-Add-config-for-snow-on-blue-ice.patch +++ b/patches/server/0262-Add-config-for-snow-on-blue-ice.patch @@ -22,7 +22,7 @@ index 14e00c7feb1c051d56a3d27cd00dcef072dd771a..4952fb1aaaafb55baa0fddb389f966a1 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 44e76c5b3070727299340109e7950a788ae970de..00156cc02bb7cf0e66eb1bc48c014971e284304b 100644 +index b55445defb3a71e93845fb387757eabeff8150bf..4060df8e886ddc2f9cb175c8f1bb05ffb5d733e5 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -908,9 +908,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0264-Skeletons-eat-wither-roses.patch b/patches/server/0263-Skeletons-eat-wither-roses.patch similarity index 98% rename from patches/server/0264-Skeletons-eat-wither-roses.patch rename to patches/server/0263-Skeletons-eat-wither-roses.patch index 88c3f09cd..c8312ad2b 100644 --- a/patches/server/0264-Skeletons-eat-wither-roses.patch +++ b/patches/server/0263-Skeletons-eat-wither-roses.patch @@ -94,7 +94,7 @@ index 78fc17c45e566e0844ffbebb85044b9bfe64c6db..64a5e000adbfa5de2abc32ea9182847d + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 00156cc02bb7cf0e66eb1bc48c014971e284304b..e0a5254fbcb454c5cad43770d5c32d1553de9e21 100644 +index 4060df8e886ddc2f9cb175c8f1bb05ffb5d733e5..4c0732cb9dad6f23f89f3a2a0f2d52be3b4c5365 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -2395,6 +2395,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0265-Enchantment-Table-Persists-Lapis.patch b/patches/server/0264-Enchantment-Table-Persists-Lapis.patch similarity index 98% rename from patches/server/0265-Enchantment-Table-Persists-Lapis.patch rename to patches/server/0264-Enchantment-Table-Persists-Lapis.patch index bc0b02ef6..faee271f8 100644 --- a/patches/server/0265-Enchantment-Table-Persists-Lapis.patch +++ b/patches/server/0264-Enchantment-Table-Persists-Lapis.patch @@ -146,7 +146,7 @@ index 65e1381bb2d10bd212463feb602c60f8fdb9ade1..b7370e64fd0d50e8725d7d5afc30af2e + // Purpur } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e0a5254fbcb454c5cad43770d5c32d1553de9e21..555e550f82c493f44711cacf5a193e6367c0ac04 100644 +index 4c0732cb9dad6f23f89f3a2a0f2d52be3b4c5365..abef6f066ca7d6a8ddb7e9c0b4938d85232f87f1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1430,6 +1430,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0266-Spark-Profiler.patch b/patches/server/0265-Spark-Profiler.patch similarity index 100% rename from patches/server/0266-Spark-Profiler.patch rename to patches/server/0265-Spark-Profiler.patch diff --git a/patches/server/0267-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0266-Option-to-disable-kick-for-out-of-order-chat.patch similarity index 95% rename from patches/server/0267-Option-to-disable-kick-for-out-of-order-chat.patch rename to patches/server/0266-Option-to-disable-kick-for-out-of-order-chat.patch index 3d8a79280..d9b91abcc 100644 --- a/patches/server/0267-Option-to-disable-kick-for-out-of-order-chat.patch +++ b/patches/server/0266-Option-to-disable-kick-for-out-of-order-chat.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable kick for out of order chat diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3f648eae9049c69a0f58d3adb5a85b03bf94ba8d..9d6f74d52acaebe79244c9c12e991139eb43427d 100644 +index 29e8c220c2034a7b4780ac08ee8a106c1359439a..81492eb04dd77f0ff8c29cb27663ffff01f40bb5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2445,7 +2445,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0268-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0267-Config-for-sculk-shrieker-can_summon-state.patch similarity index 95% rename from patches/server/0268-Config-for-sculk-shrieker-can_summon-state.patch rename to patches/server/0267-Config-for-sculk-shrieker-can_summon-state.patch index 69e70732c..c9dcee8d3 100644 --- a/patches/server/0268-Config-for-sculk-shrieker-can_summon-state.patch +++ b/patches/server/0267-Config-for-sculk-shrieker-can_summon-state.patch @@ -18,7 +18,7 @@ index 437b44fb68bcbe81d1c431689431225b6a17a1a6..06d091b7c4df949c4abda16c4f73c194 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 555e550f82c493f44711cacf5a193e6367c0ac04..3923879b14654ae591c785ce41a71dd85db6043e 100644 +index abef6f066ca7d6a8ddb7e9c0b4938d85232f87f1..f96f1cd17d7a9a3f40eee94da890bf8dd1544e52 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -972,6 +972,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0269-Config-to-not-let-coral-die.patch b/patches/server/0268-Config-to-not-let-coral-die.patch similarity index 96% rename from patches/server/0269-Config-to-not-let-coral-die.patch rename to patches/server/0268-Config-to-not-let-coral-die.patch index 3b50461f0..2eba46b75 100644 --- a/patches/server/0269-Config-to-not-let-coral-die.patch +++ b/patches/server/0268-Config-to-not-let-coral-die.patch @@ -29,7 +29,7 @@ index 88faea00be60a519f56f975a5311df5e1eb3e6b8..cbb726ac367be81e27d3a86643baf7c4 int i = aenumdirection.length; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3923879b14654ae591c785ce41a71dd85db6043e..80f400e6abfc3f04dddee921f020b660509b226c 100644 +index f96f1cd17d7a9a3f40eee94da890bf8dd1544e52..73a0276a28367dea8974f7048a63997889c4495f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -809,6 +809,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0270-Add-local-difficulty-api.patch b/patches/server/0269-Add-local-difficulty-api.patch similarity index 100% rename from patches/server/0270-Add-local-difficulty-api.patch rename to patches/server/0269-Add-local-difficulty-api.patch diff --git a/patches/server/0271-Add-toggle-for-RNG-manipulation.patch b/patches/server/0270-Add-toggle-for-RNG-manipulation.patch similarity index 93% rename from patches/server/0271-Add-toggle-for-RNG-manipulation.patch rename to patches/server/0270-Add-toggle-for-RNG-manipulation.patch index 93002559a..9e9b045bf 100644 --- a/patches/server/0271-Add-toggle-for-RNG-manipulation.patch +++ b/patches/server/0270-Add-toggle-for-RNG-manipulation.patch @@ -7,7 +7,7 @@ Paper patches RNG maniplulation by using a shared (and locked) random source. This comes with a performance gain, but technical players may prefer the ability to manipulate RNG. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 05e23fd43cca166f8a058debd9dc3fd1e1c2a595..1a918da8b04a463bcce9359c8053b8fb4eeaacb8 100644 +index dc327fb4cfc9fb0ad058dff0f2481e4678619473..20221ab20b5589f663b8d26c504578af33adc8f2 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -578,7 +578,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -33,7 +33,7 @@ index 2a2b56940cd39ca0f14dc8246b41cf6640caa3bd..31c89a6b8f766e1fd03608723c2d03f7 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 80f400e6abfc3f04dddee921f020b660509b226c..f1956454d745902053e6583f0321c319d5266222 100644 +index 73a0276a28367dea8974f7048a63997889c4495f..c5b5bbd4856f4c3da4cc79c13d4f547c5a5d50c7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -206,9 +206,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0272-Send-client-custom-name-of-BE.patch b/patches/server/0271-Send-client-custom-name-of-BE.patch similarity index 100% rename from patches/server/0272-Send-client-custom-name-of-BE.patch rename to patches/server/0271-Send-client-custom-name-of-BE.patch diff --git a/patches/server/0273-PaperPR-Fix-exact-choice-recipe-book-clicks.patch b/patches/server/0272-PaperPR-Fix-exact-choice-recipe-book-clicks.patch similarity index 100% rename from patches/server/0273-PaperPR-Fix-exact-choice-recipe-book-clicks.patch rename to patches/server/0272-PaperPR-Fix-exact-choice-recipe-book-clicks.patch diff --git a/patches/server/0274-Allow-custom-ChatDecorators.patch b/patches/server/0273-Allow-custom-ChatDecorators.patch similarity index 94% rename from patches/server/0274-Allow-custom-ChatDecorators.patch rename to patches/server/0273-Allow-custom-ChatDecorators.patch index 8e6ab1fe2..cc7ca5284 100644 --- a/patches/server/0274-Allow-custom-ChatDecorators.patch +++ b/patches/server/0273-Allow-custom-ChatDecorators.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow custom ChatDecorators Requires NMS to utilize. I'll write an API for this once our upstreams calm down with the changes. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f127a48bf1909f55b68fbfefde82f4a797035871..36b4ae46e0175b31db55b5a4192fee9746a711a3 100644 +index 6349ef5221109b7c46a437ca069e802a7895a229..b710474e2a714a6502e0256c12fcfcba7af8e142 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2667,6 +2667,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop dispatcher) { + dispatcher.register(Commands.literal("rambar") -+ .requires(listener -> listener.hasPermission(2)) ++ .requires(listener -> listener.hasPermission(2, "bukkit.command.rambar")) + .executes(context -> execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException()))) + .then(Commands.argument("targets", EntityArgument.players()) + .executes((context) -> execute(context.getSource(), EntityArgument.getPlayers(context, "targets"))) + ) -+ ).setPermission("bukkit.command.rambar"); ++ ); + } + + private static int execute(CommandSourceStack sender, Collection targets) { @@ -166,7 +166,7 @@ index 0000000000000000000000000000000000000000..9d3f7b4acab1e4502e6ab5d5b2cc400d +} diff --git a/src/main/java/org/purpurmc/purpur/command/RamCommand.java b/src/main/java/org/purpurmc/purpur/command/RamCommand.java new file mode 100644 -index 0000000000000000000000000000000000000000..d16263d4ddf6e28fb99a5cd32a28be262f4c36a7 +index 0000000000000000000000000000000000000000..4ea0877f92b6733035d83a186c3d02c101c9b6cd --- /dev/null +++ b/src/main/java/org/purpurmc/purpur/command/RamCommand.java @@ -0,0 +1,30 @@ @@ -184,7 +184,7 @@ index 0000000000000000000000000000000000000000..d16263d4ddf6e28fb99a5cd32a28be26 +public class RamCommand { + public static void register(CommandDispatcher dispatcher) { + dispatcher.register(Commands.literal("ram") -+ .requires(listener -> listener.hasPermission(2)) ++ .requires(listener -> listener.hasPermission(2, "bukkit.command.ram")) + .executes(context -> { + CommandSourceStack sender = context.getSource(); + RamBarTask ramBar = RamBarTask.instance(); @@ -197,7 +197,7 @@ index 0000000000000000000000000000000000000000..d16263d4ddf6e28fb99a5cd32a28be26 + )), false); + return 1; + }) -+ ).setPermission("bukkit.command.ram"); ++ ); + } +} diff --git a/src/main/java/org/purpurmc/purpur/task/BossBarTask.java b/src/main/java/org/purpurmc/purpur/task/BossBarTask.java diff --git a/patches/server/0287-Add-item-packet-serialize-event.patch b/patches/server/0286-Add-item-packet-serialize-event.patch similarity index 97% rename from patches/server/0287-Add-item-packet-serialize-event.patch rename to patches/server/0286-Add-item-packet-serialize-event.patch index a1c27d527..16fe725ba 100644 --- a/patches/server/0287-Add-item-packet-serialize-event.patch +++ b/patches/server/0286-Add-item-packet-serialize-event.patch @@ -48,7 +48,7 @@ index 2bd58d13d4c48fdddee56e2b417b68fe15072386..beb05039926e1fb7a656dfcd0c503f82 while (iterator.hasNext()) { ServerLevel worldserver = (ServerLevel) iterator.next(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 3d4401ab0cbd711555ad91fae5ab9d1b2cfd0886..177090697e42fcca84dbfdf04ca5118a2c5e7be2 100644 +index 297bc331795c0b53b4662549fe4a2b7b11979bfe..7254d62f3713113027eba29853e9d975eab15f7f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3447,6 +3447,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0288-Fix-MC-123848.patch b/patches/server/0287-Fix-MC-123848.patch similarity index 100% rename from patches/server/0288-Fix-MC-123848.patch rename to patches/server/0287-Fix-MC-123848.patch diff --git a/patches/server/0289-Implement-squid-colors-for-rainglow-fabric-mod.patch b/patches/server/0288-Implement-squid-colors-for-rainglow-fabric-mod.patch similarity index 98% rename from patches/server/0289-Implement-squid-colors-for-rainglow-fabric-mod.patch rename to patches/server/0288-Implement-squid-colors-for-rainglow-fabric-mod.patch index e3deccff3..1b6b6f039 100644 --- a/patches/server/0289-Implement-squid-colors-for-rainglow-fabric-mod.patch +++ b/patches/server/0288-Implement-squid-colors-for-rainglow-fabric-mod.patch @@ -40,7 +40,7 @@ index c2309434b4d48a44587590623ac98dbf997b9578..6f723171fa71d74b351b5cf0cd167bb6 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0284a513bd3b9e8d615b7ffada5e7650343f605c..ba76cd6207ee0e66338718d2bceb8f7bc58076ba 100644 +index b1ecbf95c391221d9b609e2e5c39259eb39b76af..98545b9c06f4b5f1979633ff963bb5eb5e5f8a9c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1667,6 +1667,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0290-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0289-Add-an-option-to-fix-MC-3304-projectile-looting.patch similarity index 100% rename from patches/server/0290-Add-an-option-to-fix-MC-3304-projectile-looting.patch rename to patches/server/0289-Add-an-option-to-fix-MC-3304-projectile-looting.patch diff --git a/patches/server/0291-Configurable-block-blast-resistance.patch b/patches/server/0290-Configurable-block-blast-resistance.patch similarity index 100% rename from patches/server/0291-Configurable-block-blast-resistance.patch rename to patches/server/0290-Configurable-block-blast-resistance.patch diff --git a/patches/server/0292-Configurable-block-fall-damage-modifiers.patch b/patches/server/0291-Configurable-block-fall-damage-modifiers.patch similarity index 98% rename from patches/server/0292-Configurable-block-fall-damage-modifiers.patch rename to patches/server/0291-Configurable-block-fall-damage-modifiers.patch index fc3725203..b9387a412 100644 --- a/patches/server/0292-Configurable-block-fall-damage-modifiers.patch +++ b/patches/server/0291-Configurable-block-fall-damage-modifiers.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable block fall damage modifiers diff --git a/src/main/java/net/minecraft/world/level/block/BedBlock.java b/src/main/java/net/minecraft/world/level/block/BedBlock.java -index fec04d23d1b4f706c04b3c647e9afaf0c57a14c2..d56bbd43b127a1d663a398b1da7090ff64ab6a6c 100644 +index ea448ef3e072f4144e6f506f1f38399ecd571d76..19d31064eb271ee02115a75cde383796c899e7f7 100644 --- a/src/main/java/net/minecraft/world/level/block/BedBlock.java +++ b/src/main/java/net/minecraft/world/level/block/BedBlock.java @@ -174,7 +174,7 @@ public class BedBlock extends HorizontalDirectionalBlock implements EntityBlock diff --git a/patches/server/0293-Language-API.patch b/patches/server/0292-Language-API.patch similarity index 93% rename from patches/server/0293-Language-API.patch rename to patches/server/0292-Language-API.patch index 6f44baaed..056bf1afb 100644 --- a/patches/server/0293-Language-API.patch +++ b/patches/server/0292-Language-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Language API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 37f0618747e0615ff1ef583e12b434b0cfacdaba..bc1a2df0a7ddaf030917e4723994464d77e55d02 100644 +index 5e7162866530c323f50ea99183757622cc6b2b97..b4d174e3603a45f768add973796d603f4ed8f976 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -316,6 +316,20 @@ public final class CraftServer implements Server { diff --git a/patches/server/0294-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0293-Milk-Keeps-Beneficial-Effects.patch similarity index 95% rename from patches/server/0294-Milk-Keeps-Beneficial-Effects.patch rename to patches/server/0293-Milk-Keeps-Beneficial-Effects.patch index 997fcb91e..39a66109b 100644 --- a/patches/server/0294-Milk-Keeps-Beneficial-Effects.patch +++ b/patches/server/0293-Milk-Keeps-Beneficial-Effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Milk Keeps Beneficial Effects diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 79925dcc3dec57bae886263a804de28e2bd6ad72..8d7c33e16f9eaec2120c5aad75172ff656d1bd17 100644 +index ac323afc8491749969e53aa3841bc684d79c48d3..b67660cda74a4754d1701e746aca99bde868c150 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1107,6 +1107,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -30,7 +30,7 @@ index fef9fd3e50bba3d0fffa3d61b60f3bb8cad081e0..a6a4d5203cb5f35306f8225e56681bc2 this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this)); this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ba76cd6207ee0e66338718d2bceb8f7bc58076ba..49c12f24cc5446f8d996490740ede863ed232562 100644 +index 98545b9c06f4b5f1979633ff963bb5eb5e5f8a9c..afeab1031c329f5cfd23066f4d28827bc84c72ae 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -130,6 +130,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0295-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0294-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch similarity index 100% rename from patches/server/0295-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch rename to patches/server/0294-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch diff --git a/patches/server/0296-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0295-Add-log-suppression-for-LibraryLoader.patch similarity index 100% rename from patches/server/0296-Add-log-suppression-for-LibraryLoader.patch rename to patches/server/0295-Add-log-suppression-for-LibraryLoader.patch diff --git a/patches/server/0297-Allow-Transparent-Blocks-In-Enchanting-Box.patch b/patches/server/0296-Allow-Transparent-Blocks-In-Enchanting-Box.patch similarity index 100% rename from patches/server/0297-Allow-Transparent-Blocks-In-Enchanting-Box.patch rename to patches/server/0296-Allow-Transparent-Blocks-In-Enchanting-Box.patch diff --git a/patches/server/0298-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0297-Add-option-to-allow-creeper-to-encircle-target-when-.patch similarity index 96% rename from patches/server/0298-Add-option-to-allow-creeper-to-encircle-target-when-.patch rename to patches/server/0297-Add-option-to-allow-creeper-to-encircle-target-when-.patch index dd486e5c2..a1247e164 100644 --- a/patches/server/0298-Add-option-to-allow-creeper-to-encircle-target-when-.patch +++ b/patches/server/0297-Add-option-to-allow-creeper-to-encircle-target-when-.patch @@ -24,7 +24,7 @@ index e241ae250f4f04a17ef2c583d00b065a4ca56a4c..02b567e4e808e1a809d285ef39e1abc5 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 49c12f24cc5446f8d996490740ede863ed232562..fd565abe6bb48f3ec112bdbbe4a698d88fd2d0dc 100644 +index afeab1031c329f5cfd23066f4d28827bc84c72ae..e3b81cc53213f9b6404abf5e3478e3abfdf0a9c2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1323,6 +1323,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0299-Fire-Immunity-API.patch b/patches/server/0298-Fire-Immunity-API.patch similarity index 97% rename from patches/server/0299-Fire-Immunity-API.patch rename to patches/server/0298-Fire-Immunity-API.patch index 71b7d3a65..ebff4c2a1 100644 --- a/patches/server/0299-Fire-Immunity-API.patch +++ b/patches/server/0298-Fire-Immunity-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fire Immunity API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c88eda6be7ffe312a2efd90eae85bc7fbc5397ef..b22c988cc7d5aee6eb4fcb53af9485ee89dc3497 100644 +index 55116e7a7b70a6f9db187ac7ef0747fe5100cacd..c4cfbf008bc07074664b9310d5ff7b750bb98e96 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -399,6 +399,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0300-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0299-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch similarity index 100% rename from patches/server/0300-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch rename to patches/server/0299-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch diff --git a/patches/server/0301-Added-got-ram-event.patch b/patches/server/0300-Added-got-ram-event.patch similarity index 100% rename from patches/server/0301-Added-got-ram-event.patch rename to patches/server/0300-Added-got-ram-event.patch diff --git a/patches/server/0302-Log-skipped-entity-s-position.patch b/patches/server/0301-Log-skipped-entity-s-position.patch similarity index 100% rename from patches/server/0302-Log-skipped-entity-s-position.patch rename to patches/server/0301-Log-skipped-entity-s-position.patch diff --git a/patches/server/0303-End-Crystal-Cramming.patch b/patches/server/0302-End-Crystal-Cramming.patch similarity index 96% rename from patches/server/0303-End-Crystal-Cramming.patch rename to patches/server/0302-End-Crystal-Cramming.patch index c4078256c..8c4b99cec 100644 --- a/patches/server/0303-End-Crystal-Cramming.patch +++ b/patches/server/0302-End-Crystal-Cramming.patch @@ -17,7 +17,7 @@ index a4fc0e9cb52bb5937effe5cd09f8bbefcf8dd531..e3fe5f18c77e36479eaeb7edfd2a3eb9 // Purpur start diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f4c20ea2b683901a68a41e4145b62d0bb61fbbef..7a7feba3ce560a508aaa352b0ae63299c248e434 100644 +index 4594b47bea1db94d84e7a902b3b7ea1e10d36545..d756ec52759f2888ae49f8574d51b7343c76eae6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -852,6 +852,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0304-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0303-Option-to-allow-beacon-effects-when-covered-by-tinte.patch similarity index 97% rename from patches/server/0304-Option-to-allow-beacon-effects-when-covered-by-tinte.patch rename to patches/server/0303-Option-to-allow-beacon-effects-when-covered-by-tinte.patch index 759a43eb0..99f0233f2 100644 --- a/patches/server/0304-Option-to-allow-beacon-effects-when-covered-by-tinte.patch +++ b/patches/server/0303-Option-to-allow-beacon-effects-when-covered-by-tinte.patch @@ -36,7 +36,7 @@ index c787019b5cbadec81dd33ef4021708b9b423485a..8f82b0ce87afc8890c5b3386d5f6e22c BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7a7feba3ce560a508aaa352b0ae63299c248e434..ab04966c16dc9929ae70fb727d3f8fbb54ffd57f 100644 +index d756ec52759f2888ae49f8574d51b7343c76eae6..bcefc3d5a0bab517d0ee06fd81dd6b040120cc6e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -746,11 +746,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0305-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0304-Add-attribute-clamping-and-armor-limit-config.patch similarity index 100% rename from patches/server/0305-Add-attribute-clamping-and-armor-limit-config.patch rename to patches/server/0304-Add-attribute-clamping-and-armor-limit-config.patch diff --git a/patches/server/0306-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0305-Config-to-remove-explosion-radius-clamp.patch similarity index 97% rename from patches/server/0306-Config-to-remove-explosion-radius-clamp.patch rename to patches/server/0305-Config-to-remove-explosion-radius-clamp.patch index 8d892bf17..696d5dcd1 100644 --- a/patches/server/0306-Config-to-remove-explosion-radius-clamp.patch +++ b/patches/server/0305-Config-to-remove-explosion-radius-clamp.patch @@ -39,7 +39,7 @@ index 4392336d28aa3cc7a767a2e638e2227c16a597f4..4929149dde7630a2249a86f4ed0bf00e } // CraftBukkit end diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ab04966c16dc9929ae70fb727d3f8fbb54ffd57f..7b93c263fa7d2d69cbf1a6d2f791199f0f477493 100644 +index bcefc3d5a0bab517d0ee06fd81dd6b040120cc6e..e8f0ec7eb707776e8746eae07e0fb1ac50cf7398 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -215,6 +215,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0307-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0306-bonemealable-sugarcane-cactus-and-netherwart.patch similarity index 98% rename from patches/server/0307-bonemealable-sugarcane-cactus-and-netherwart.patch rename to patches/server/0306-bonemealable-sugarcane-cactus-and-netherwart.patch index 4fca764d0..0104e088b 100644 --- a/patches/server/0307-bonemealable-sugarcane-cactus-and-netherwart.patch +++ b/patches/server/0306-bonemealable-sugarcane-cactus-and-netherwart.patch @@ -137,7 +137,7 @@ index 6b400a4759c8c8612a3b5c96ca0d87ef9dc71435..992de1ab2c00a2545a857f1b5533926b + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7b93c263fa7d2d69cbf1a6d2f791199f0f477493..fe903b1e1bd211651e3808becd34a2d28dc57f34 100644 +index e8f0ec7eb707776e8746eae07e0fb1ac50cf7398..9159e790533f06582a521f11103e6cbcbc72978b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -805,8 +805,20 @@ public class PurpurWorldConfig { diff --git a/patches/server/0308-Add-PreExplodeEvents.patch b/patches/server/0307-Add-PreExplodeEvents.patch similarity index 100% rename from patches/server/0308-Add-PreExplodeEvents.patch rename to patches/server/0307-Add-PreExplodeEvents.patch diff --git a/patches/server/0309-Improve-output-of-plugins-command.patch b/patches/server/0308-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/server/0309-Improve-output-of-plugins-command.patch rename to patches/server/0308-Improve-output-of-plugins-command.patch