diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index 8870d05f8e..a690beaffd 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -99,48 +99,6 @@ index 0ed5e15d3175ee5d145730ff8f506ffb959e5e6c..6e67ea018cd6f362bba104f542c52438 com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.getClass(); // load mappings for stacktrace deobf -diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ca7718053a6a2eb715ea3671bd4bc15304ede420..bf31ae9f1ea08d67e7e828cff07b30a315828b2f 100644 ---- a/src/main/java/net/minecraft/world/entity/Entity.java -+++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3565,6 +3565,37 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n - return SlotAccess.NULL; - } - -+ // Purpur Start -+ public void sendMessage(@Nullable String message) { -+ sendMessage(message, Util.NIL_UUID); -+ } -+ -+ public void sendMessage(@Nullable String message, UUID sender) { -+ if (message == null) { -+ return; -+ } -+ sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message), sender); -+ } -+ -+ public void sendMessage(@Nullable net.kyori.adventure.text.Component message) { -+ sendMessage(message, Util.NIL_UUID); -+ } -+ -+ public void sendMessage(@Nullable net.kyori.adventure.text.Component message, UUID sender) { -+ if (message == null) { -+ return; -+ } -+ sendMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), sender); -+ } -+ -+ public void sendMessage(@Nullable Component message) { -+ if (message == null) { -+ return; -+ } -+ sendMessage(message, Util.NIL_UUID); -+ } -+ // Purpur end -+ - @Override - public void sendMessage(Component message, UUID sender) {} - diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java index 862553e98a7237d39a26036c615b9cbd001bd3bf..d11b463548b847382a22fdf50496b186caa0c526 100644 --- a/src/main/java/net/minecraft/world/level/Level.java @@ -508,7 +466,7 @@ index 818dde63df240c7e72526ef0aef87c9f8739f78a..6329a85dbed1de21dd7dcde8b62d51f0 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 332c33c95cc450d76f512e58dd6d4b61ea2de431..01ff1a9757732872693b16cdb1bf386e0a6c1e73 100644 +index c59deadcfbfd5afbf951a167979a4eceb0c63579..a335d1689ebf01e0e96a45c640188dc024610e2c 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -154,6 +154,14 @@ public class Main { diff --git a/patches/server/0004-Component-related-conveniences.patch b/patches/server/0004-Component-related-conveniences.patch new file mode 100644 index 0000000000..3843e81877 --- /dev/null +++ b/patches/server/0004-Component-related-conveniences.patch @@ -0,0 +1,112 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Tue, 29 Jun 2021 21:37:40 -0500 +Subject: [PATCH] Component related conveniences + + +diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java +index 570cea8ee6a442b2dc3c6ef849294ef0c02027ca..5a344f68176bc9dcc31a1d75ada2afa5f1f3b8ce 100644 +--- a/src/main/java/net/minecraft/server/players/PlayerList.java ++++ b/src/main/java/net/minecraft/server/players/PlayerList.java +@@ -1389,6 +1389,62 @@ public abstract class PlayerList { + } + // CraftBukkit end + ++ // Purpur start ++ public void sendMessage(@Nullable String message) { ++ sendMessage(message, Util.NIL_UUID); ++ } ++ ++ public void sendMessage(@Nullable String message, ChatType type) { ++ sendMessage(message, type, Util.NIL_UUID); ++ } ++ ++ public void sendMessage(@Nullable String message, UUID sender) { ++ sendMessage(message, ChatType.SYSTEM, sender); ++ } ++ ++ public void sendMessage(@Nullable String message, ChatType type, UUID sender) { ++ if (message != null) { ++ sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message), type, sender); ++ } ++ } ++ ++ public void sendMessage(@Nullable net.kyori.adventure.text.Component message) { ++ sendMessage(message, Util.NIL_UUID); ++ } ++ ++ public void sendMessage(@Nullable net.kyori.adventure.text.Component message, ChatType type) { ++ sendMessage(message, type, Util.NIL_UUID); ++ } ++ ++ public void sendMessage(@Nullable net.kyori.adventure.text.Component message, UUID sender) { ++ sendMessage(message, ChatType.SYSTEM, sender); ++ } ++ ++ public void sendMessage(@Nullable net.kyori.adventure.text.Component message, ChatType type, UUID sender) { ++ if (message != null) { ++ sendMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), type, sender); ++ } ++ } ++ ++ public void sendMessage(@Nullable Component message) { ++ sendMessage(message, Util.NIL_UUID); ++ } ++ ++ public void sendMessage(@Nullable Component message, ChatType type) { ++ sendMessage(message, type, Util.NIL_UUID); ++ } ++ ++ public void sendMessage(@Nullable Component message, UUID sender) { ++ sendMessage(message, ChatType.SYSTEM, sender); ++ } ++ ++ public void sendMessage(@Nullable Component message, ChatType type, UUID sender) { ++ if (message != null) { ++ broadcastMessage(message, type, sender); ++ } ++ } ++ // Purpur end ++ + public void broadcastMessage(Component message, ChatType type, UUID sender) { + this.server.sendMessage(message, sender); + Iterator iterator = this.players.iterator(); +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java +index ca7718053a6a2eb715ea3671bd4bc15304ede420..19d716a7350c6ed5b912064aa1e63a1fbbe4183f 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -3565,6 +3565,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n + return SlotAccess.NULL; + } + ++ // Purpur Start ++ public void sendMessage(@Nullable String message) { ++ sendMessage(message, Util.NIL_UUID); ++ } ++ ++ public void sendMessage(@Nullable String message, UUID sender) { ++ if (message != null) { ++ sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.get().parse(message), sender); ++ } ++ } ++ ++ public void sendMessage(@Nullable net.kyori.adventure.text.Component message) { ++ sendMessage(message, Util.NIL_UUID); ++ } ++ ++ public void sendMessage(@Nullable net.kyori.adventure.text.Component message, UUID sender) { ++ if (message != null) { ++ sendMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), sender); ++ } ++ } ++ ++ public void sendMessage(@Nullable Component message) { ++ if (message != null) { ++ sendMessage(message, Util.NIL_UUID); ++ } ++ } ++ // Purpur end ++ + @Override + public void sendMessage(Component message, UUID sender) {} + diff --git a/patches/server/0004-Ridables.patch b/patches/server/0005-Ridables.patch similarity index 99% rename from patches/server/0004-Ridables.patch rename to patches/server/0005-Ridables.patch index 6c6f990b71..0b3465ebe4 100644 --- a/patches/server/0004-Ridables.patch +++ b/patches/server/0005-Ridables.patch @@ -86,7 +86,7 @@ index 9dc5c82ea1d497174d288000f9f1ccaabbcb4a18..86159b0fcf33b70310f060962ab37cd6 if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) { ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity)); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index bf31ae9f1ea08d67e7e828cff07b30a315828b2f..f98f9e295a8e76a95e2afd24b1469a354fe614c5 100644 +index 19d716a7350c6ed5b912064aa1e63a1fbbe4183f..37db4d89996cde1bdcdc513757be75612d444f97 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -135,7 +135,7 @@ index bf31ae9f1ea08d67e7e828cff07b30a315828b2f..f98f9e295a8e76a95e2afd24b1469a35 if (this.passengers.size() == 1 && this.passengers.get(0) == entity) { this.passengers = ImmutableList.of(); } else { -@@ -4211,4 +4225,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -4208,4 +4222,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this); } // Paper end @@ -4526,7 +4526,7 @@ index 69f439851fe1ff07d827eaed274940a5783d5f6c..07853aff3d42ce50799406ee1c14389b Projectile(EntityType type, Level world) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 32f44983aaec838960e6435580ee261cfa266b53..feceb11ae27bf32db5bb3ea8f02ebaa26dc9466b 100644 +index 5bc7d1d72847fc200a5bcd19f083e45805546aeb..46e792b67e15e31848a43d7fa2640ebb55cbe2b9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -127,4 +127,9 @@ public class PurpurConfig { diff --git a/patches/server/0005-Configurable-entity-base-attributes.patch b/patches/server/0006-Configurable-entity-base-attributes.patch similarity index 99% rename from patches/server/0005-Configurable-entity-base-attributes.patch rename to patches/server/0006-Configurable-entity-base-attributes.patch index 380a6e4894..95cb2b4a9e 100644 --- a/patches/server/0005-Configurable-entity-base-attributes.patch +++ b/patches/server/0006-Configurable-entity-base-attributes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index f98f9e295a8e76a95e2afd24b1469a354fe614c5..c5a3f54a590d164ec0f7794f6745ea86753a30d3 100644 +index 37db4d89996cde1bdcdc513757be75612d444f97..f3c5d5906a8ce64c93f4fb1f63474800a24ef012 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -150,7 +150,7 @@ import org.bukkit.plugin.PluginManager; diff --git a/patches/server/0006-Timings-stuff.patch b/patches/server/0007-Timings-stuff.patch similarity index 97% rename from patches/server/0006-Timings-stuff.patch rename to patches/server/0007-Timings-stuff.patch index 4454b21fa4..fc9378c7ec 100644 --- a/patches/server/0006-Timings-stuff.patch +++ b/patches/server/0007-Timings-stuff.patch @@ -55,7 +55,7 @@ index 9d920565ff65a84b1b9a2a4777fd8bc8f07e0153..33263af33b4355e5079fadfcfae77d03 String hostName = "BrokenHost"; try { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index feceb11ae27bf32db5bb3ea8f02ebaa26dc9466b..7c898f58e954692481753238a307ad8e107411c1 100644 +index 46e792b67e15e31848a43d7fa2640ebb55cbe2b9..056f2a94912a549f63744e2afa7d34735a962120 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -132,4 +132,10 @@ public class PurpurConfig { diff --git a/patches/server/0007-Barrels-and-enderchests-6-rows.patch b/patches/server/0008-Barrels-and-enderchests-6-rows.patch similarity index 99% rename from patches/server/0007-Barrels-and-enderchests-6-rows.patch rename to patches/server/0008-Barrels-and-enderchests-6-rows.patch index 0730c7b550..9432752213 100644 --- a/patches/server/0007-Barrels-and-enderchests-6-rows.patch +++ b/patches/server/0008-Barrels-and-enderchests-6-rows.patch @@ -142,7 +142,7 @@ index f494063ead9c6303fb3ca880aba2a877ae8d83ab..3b027111ed933856ae86ad5f62aac744 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 7c898f58e954692481753238a307ad8e107411c1..6388f8ebd0b2aede894da39cdab2c2965e0f231f 100644 +index 056f2a94912a549f63744e2afa7d34735a962120..be910f7950edcbfcd5c6192ff294166c470149e9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -138,4 +138,23 @@ public class PurpurConfig { diff --git a/patches/server/0008-Advancement-API.patch b/patches/server/0009-Advancement-API.patch similarity index 100% rename from patches/server/0008-Advancement-API.patch rename to patches/server/0009-Advancement-API.patch diff --git a/patches/server/0009-Llama-API.patch b/patches/server/0010-Llama-API.patch similarity index 100% rename from patches/server/0009-Llama-API.patch rename to patches/server/0010-Llama-API.patch diff --git a/patches/server/0010-AFK-API.patch b/patches/server/0011-AFK-API.patch similarity index 100% rename from patches/server/0010-AFK-API.patch rename to patches/server/0011-AFK-API.patch diff --git a/patches/server/0011-Bring-back-server-name.patch b/patches/server/0012-Bring-back-server-name.patch similarity index 100% rename from patches/server/0011-Bring-back-server-name.patch rename to patches/server/0012-Bring-back-server-name.patch diff --git a/patches/server/0012-Configurable-server-mod-name.patch b/patches/server/0013-Configurable-server-mod-name.patch similarity index 94% rename from patches/server/0012-Configurable-server-mod-name.patch rename to patches/server/0013-Configurable-server-mod-name.patch index d89995e3b2..8ecd4203e0 100644 --- a/patches/server/0012-Configurable-server-mod-name.patch +++ b/patches/server/0013-Configurable-server-mod-name.patch @@ -18,7 +18,7 @@ index 06177ec182d79cd101da9cd43a841656d27d6d8b..0e0f7d48337f261481731917aabf45d8 public SystemReport fillSystemReport(SystemReport systemreport) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index b2b3d591d86f51e5cb118e2334f840c627b5e677..df4f0573be672f15fedf896200206344995c333a 100644 +index 64a9288888cd5c008d48d919eb2927670eb35696..bd8885362ddcad76d055612309257e310ba06718 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -141,6 +141,11 @@ public class PurpurConfig { diff --git a/patches/server/0013-LivingEntity-safeFallDistance.patch b/patches/server/0014-LivingEntity-safeFallDistance.patch similarity index 100% rename from patches/server/0013-LivingEntity-safeFallDistance.patch rename to patches/server/0014-LivingEntity-safeFallDistance.patch diff --git a/patches/server/0014-Lagging-threshold.patch b/patches/server/0015-Lagging-threshold.patch similarity index 100% rename from patches/server/0014-Lagging-threshold.patch rename to patches/server/0015-Lagging-threshold.patch diff --git a/patches/server/0015-ItemFactory-getMonsterEgg.patch b/patches/server/0016-ItemFactory-getMonsterEgg.patch similarity index 100% rename from patches/server/0015-ItemFactory-getMonsterEgg.patch rename to patches/server/0016-ItemFactory-getMonsterEgg.patch diff --git a/patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch similarity index 100% rename from patches/server/0016-PlayerSetSpawnerTypeWithEggEvent.patch rename to patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch diff --git a/patches/server/0017-EMC-MonsterEggSpawnEvent.patch b/patches/server/0018-EMC-MonsterEggSpawnEvent.patch similarity index 100% rename from patches/server/0017-EMC-MonsterEggSpawnEvent.patch rename to patches/server/0018-EMC-MonsterEggSpawnEvent.patch diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0019-Player-invulnerabilities.patch similarity index 98% rename from patches/server/0018-Player-invulnerabilities.patch rename to patches/server/0019-Player-invulnerabilities.patch index 5ddf394e16..df261db1fa 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0019-Player-invulnerabilities.patch @@ -77,7 +77,7 @@ index af0c7bbce7641f5aa659abb440a6cd6f57019ede..71030d9e156ce28f1ef9e3ed6845f022 this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit // Paper end diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 570cea8ee6a442b2dc3c6ef849294ef0c02027ca..5967cb5b357bd64b2ed7b48a27ad0bea56ed0349 100644 +index 5a344f68176bc9dcc31a1d75ada2afa5f1f3b8ce..62ba8ce35dc5827607c99163c6005ea0c4b7ee16 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -991,6 +991,8 @@ public abstract class PlayerList { diff --git a/patches/server/0019-Anvil-API.patch b/patches/server/0020-Anvil-API.patch similarity index 100% rename from patches/server/0019-Anvil-API.patch rename to patches/server/0020-Anvil-API.patch diff --git a/patches/server/0020-Configurable-villager-brain-ticks.patch b/patches/server/0021-Configurable-villager-brain-ticks.patch similarity index 100% rename from patches/server/0020-Configurable-villager-brain-ticks.patch rename to patches/server/0021-Configurable-villager-brain-ticks.patch diff --git a/patches/server/0021-Alternative-Keepalive-Handling.patch b/patches/server/0022-Alternative-Keepalive-Handling.patch similarity index 97% rename from patches/server/0021-Alternative-Keepalive-Handling.patch rename to patches/server/0022-Alternative-Keepalive-Handling.patch index 45706c208e..37d1dd6f2d 100644 --- a/patches/server/0021-Alternative-Keepalive-Handling.patch +++ b/patches/server/0022-Alternative-Keepalive-Handling.patch @@ -56,7 +56,7 @@ index 71030d9e156ce28f1ef9e3ed6845f022a62dfdaf..db8a8e81054e91161d43515fb19ab010 if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) { int i = (int) (Util.getMillis() - this.keepAliveTime); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 77b3f9165e74c4437ca863cc9c6cbe5771faee9e..45522d00049ee72ed3cb243c74061a08a7fecae0 100644 +index 615aa4230ae9eaa2f744dd039390637aaae01a91..21e6157f85bb8b793a3e8d5e15e2045a1a6a057a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -157,6 +157,11 @@ public class PurpurConfig { diff --git a/patches/server/0022-Silk-touch-spawners.patch b/patches/server/0023-Silk-touch-spawners.patch similarity index 100% rename from patches/server/0022-Silk-touch-spawners.patch rename to patches/server/0023-Silk-touch-spawners.patch diff --git a/patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch similarity index 100% rename from patches/server/0023-MC-168772-Fix-Add-turtle-egg-block-options.patch rename to patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch diff --git a/patches/server/0024-Fix-vanilla-command-permission-handler.patch b/patches/server/0025-Fix-vanilla-command-permission-handler.patch similarity index 100% rename from patches/server/0024-Fix-vanilla-command-permission-handler.patch rename to patches/server/0025-Fix-vanilla-command-permission-handler.patch diff --git a/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch similarity index 96% rename from patches/server/0025-Logger-settings-suppressing-pointless-logs.patch rename to patches/server/0026-Logger-settings-suppressing-pointless-logs.patch index ad0f152e76..cf287a5ab9 100644 --- a/patches/server/0025-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch @@ -17,7 +17,7 @@ index 7d6dc0a8ee35274052b122bbc446bc54750de0a6..c46df052a5a39d92688f51377ee1f7b5 } // CraftBukkit end diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 45522d00049ee72ed3cb243c74061a08a7fecae0..d92d0052c7dc0bf63d24c442a08167de31107b23 100644 +index 21e6157f85bb8b793a3e8d5e15e2045a1a6a057a..8bfecd58ad2f1e6657414c9620fcd85c7f012ae4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -180,4 +180,11 @@ public class PurpurConfig { diff --git a/patches/server/0026-Disable-outdated-build-check.patch b/patches/server/0027-Disable-outdated-build-check.patch similarity index 92% rename from patches/server/0026-Disable-outdated-build-check.patch rename to patches/server/0027-Disable-outdated-build-check.patch index 4a00806f45..d5a4a49c81 100644 --- a/patches/server/0026-Disable-outdated-build-check.patch +++ b/patches/server/0027-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 01ff1a9757732872693b16cdb1bf386e0a6c1e73..2ac68e87ae16622bf1828b3a1c71b6a13c52bea4 100644 +index a335d1689ebf01e0e96a45c640188dc024610e2c..01ca38ee35f2c1e5031ea4b8aca09a2a59c4a475 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -276,7 +276,7 @@ public class Main { diff --git a/patches/server/0027-Giants-AI-settings.patch b/patches/server/0028-Giants-AI-settings.patch similarity index 100% rename from patches/server/0027-Giants-AI-settings.patch rename to patches/server/0028-Giants-AI-settings.patch diff --git a/patches/server/0028-Zombie-horse-naturally-spawn.patch b/patches/server/0029-Zombie-horse-naturally-spawn.patch similarity index 100% rename from patches/server/0028-Zombie-horse-naturally-spawn.patch rename to patches/server/0029-Zombie-horse-naturally-spawn.patch diff --git a/patches/server/0029-Charged-creeper-naturally-spawn.patch b/patches/server/0030-Charged-creeper-naturally-spawn.patch similarity index 100% rename from patches/server/0029-Charged-creeper-naturally-spawn.patch rename to patches/server/0030-Charged-creeper-naturally-spawn.patch diff --git a/patches/server/0030-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch similarity index 100% rename from patches/server/0030-Rabbit-naturally-spawn-toast-and-killer.patch rename to patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch diff --git a/patches/server/0031-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0031-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0032-Dont-send-useless-entity-packets.patch b/patches/server/0033-Dont-send-useless-entity-packets.patch similarity index 97% rename from patches/server/0032-Dont-send-useless-entity-packets.patch rename to patches/server/0033-Dont-send-useless-entity-packets.patch index 2e8a7650cb..ed66a0b18e 100644 --- a/patches/server/0032-Dont-send-useless-entity-packets.patch +++ b/patches/server/0033-Dont-send-useless-entity-packets.patch @@ -40,7 +40,7 @@ index a00627e0fa38632449042f59c053b4dac13e58bf..8218a074cdbe9df514f4de5aefd3c266 this.entity.stopSeenByPlayer(player); player.connection.send(new ClientboundRemoveEntityPacket(this.entity.getId())); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d92d0052c7dc0bf63d24c442a08167de31107b23..bb134c5f14b0d52e1e4ffeee20c2cc9293126d22 100644 +index 8bfecd58ad2f1e6657414c9620fcd85c7f012ae4..09f1d0355f0dabbf742cdef544ae630666b455fb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -181,6 +181,11 @@ public class PurpurConfig { diff --git a/patches/server/0033-Tulips-change-fox-type.patch b/patches/server/0034-Tulips-change-fox-type.patch similarity index 100% rename from patches/server/0033-Tulips-change-fox-type.patch rename to patches/server/0034-Tulips-change-fox-type.patch diff --git a/patches/server/0034-Breedable-Polar-Bears.patch b/patches/server/0035-Breedable-Polar-Bears.patch similarity index 100% rename from patches/server/0034-Breedable-Polar-Bears.patch rename to patches/server/0035-Breedable-Polar-Bears.patch diff --git a/patches/server/0035-Chickens-can-retaliate.patch b/patches/server/0036-Chickens-can-retaliate.patch similarity index 100% rename from patches/server/0035-Chickens-can-retaliate.patch rename to patches/server/0036-Chickens-can-retaliate.patch diff --git a/patches/server/0036-Add-option-to-set-armorstand-step-height.patch b/patches/server/0037-Add-option-to-set-armorstand-step-height.patch similarity index 100% rename from patches/server/0036-Add-option-to-set-armorstand-step-height.patch rename to patches/server/0037-Add-option-to-set-armorstand-step-height.patch diff --git a/patches/server/0037-Cat-spawning-options.patch b/patches/server/0038-Cat-spawning-options.patch similarity index 100% rename from patches/server/0037-Cat-spawning-options.patch rename to patches/server/0038-Cat-spawning-options.patch diff --git a/patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch similarity index 100% rename from patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch rename to patches/server/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch diff --git a/patches/server/0039-Cows-eat-mushrooms.patch b/patches/server/0040-Cows-eat-mushrooms.patch similarity index 100% rename from patches/server/0039-Cows-eat-mushrooms.patch rename to patches/server/0040-Cows-eat-mushrooms.patch diff --git a/patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0041-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0041-Pigs-give-saddle-back.patch b/patches/server/0042-Pigs-give-saddle-back.patch similarity index 100% rename from patches/server/0041-Pigs-give-saddle-back.patch rename to patches/server/0042-Pigs-give-saddle-back.patch diff --git a/patches/server/0042-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch similarity index 100% rename from patches/server/0042-Snowman-drop-and-put-back-pumpkin.patch rename to patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch diff --git a/patches/server/0043-Ender-dragon-always-drop-full-exp.patch b/patches/server/0044-Ender-dragon-always-drop-full-exp.patch similarity index 100% rename from patches/server/0043-Ender-dragon-always-drop-full-exp.patch rename to patches/server/0044-Ender-dragon-always-drop-full-exp.patch diff --git a/patches/server/0044-Signs-editable-on-right-click.patch b/patches/server/0045-Signs-editable-on-right-click.patch similarity index 100% rename from patches/server/0044-Signs-editable-on-right-click.patch rename to patches/server/0045-Signs-editable-on-right-click.patch diff --git a/patches/server/0045-Signs-allow-color-codes.patch b/patches/server/0046-Signs-allow-color-codes.patch similarity index 100% rename from patches/server/0045-Signs-allow-color-codes.patch rename to patches/server/0046-Signs-allow-color-codes.patch diff --git a/patches/server/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch similarity index 100% rename from patches/server/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch rename to patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch diff --git a/patches/server/0047-Minecart-settings-and-WASD-controls.patch b/patches/server/0048-Minecart-settings-and-WASD-controls.patch similarity index 100% rename from patches/server/0047-Minecart-settings-and-WASD-controls.patch rename to patches/server/0048-Minecart-settings-and-WASD-controls.patch diff --git a/patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch similarity index 100% rename from patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch rename to patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch diff --git a/patches/server/0049-Players-should-not-cram-to-death.patch b/patches/server/0050-Players-should-not-cram-to-death.patch similarity index 100% rename from patches/server/0049-Players-should-not-cram-to-death.patch rename to patches/server/0050-Players-should-not-cram-to-death.patch diff --git a/patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch similarity index 100% rename from patches/server/0050-Option-to-toggle-milk-curing-bad-omen.patch rename to patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch diff --git a/patches/server/0051-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0051-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0052-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0052-Fix-the-dead-lagging-the-server.patch b/patches/server/0053-Fix-the-dead-lagging-the-server.patch similarity index 94% rename from patches/server/0052-Fix-the-dead-lagging-the-server.patch rename to patches/server/0053-Fix-the-dead-lagging-the-server.patch index 8ff4ce0230..04bbfde580 100644 --- a/patches/server/0052-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0053-Fix-the-dead-lagging-the-server.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c5a3f54a590d164ec0f7794f6745ea86753a30d3..aa1d31016c89e9988976ca28ce025f675cdc4c77 100644 +index f3c5d5906a8ce64c93f4fb1f63474800a24ef012..d5df366dcbbd92523b9dd3a4afd4186a4d7ce5a1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1735,6 +1735,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0053-Skip-events-if-there-s-no-listeners.patch b/patches/server/0054-Skip-events-if-there-s-no-listeners.patch similarity index 100% rename from patches/server/0053-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0054-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0054-Add-permission-for-F3-N-debug.patch b/patches/server/0055-Add-permission-for-F3-N-debug.patch similarity index 89% rename from patches/server/0054-Add-permission-for-F3-N-debug.patch rename to patches/server/0055-Add-permission-for-F3-N-debug.patch index 0b8fddd8fb..28bedf2940 100644 --- a/patches/server/0054-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0055-Add-permission-for-F3-N-debug.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 51ef325fab982c2fd8a7eb3d7e73cbfdf5b82734..e4b77d55350e93926eef9a7c521a074047542644 100644 +index 62ba8ce35dc5827607c99163c6005ea0c4b7ee16..c92b57e7e5d1b31db8b7e75a9013df41eb2806c4 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1156,6 +1156,7 @@ public abstract class PlayerList { diff --git a/patches/server/0055-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch similarity index 100% rename from patches/server/0055-Add-wither-skeleton-takes-wither-damage-option.patch rename to patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch diff --git a/patches/server/0056-Configurable-TPS-Catchup.patch b/patches/server/0057-Configurable-TPS-Catchup.patch similarity index 95% rename from patches/server/0056-Configurable-TPS-Catchup.patch rename to patches/server/0057-Configurable-TPS-Catchup.patch index 38a14dfe44..0fea2d351f 100644 --- a/patches/server/0056-Configurable-TPS-Catchup.patch +++ b/patches/server/0057-Configurable-TPS-Catchup.patch @@ -24,7 +24,7 @@ index 34e364afff8cfe060244e5dd7cc0c34033dc6945..c5f1141d46acca284f5489d68d3b628e this.profiler.pop(); this.endMetricsRecordingTick(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index bb134c5f14b0d52e1e4ffeee20c2cc9293126d22..052eb37087b5f97d92c00944968c13fec343d5a3 100644 +index 09f1d0355f0dabbf742cdef544ae630666b455fb..f85849c637c338d42aa6f8d5f96b189113658422 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -192,4 +192,9 @@ public class PurpurConfig { diff --git a/patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch similarity index 100% rename from patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch rename to patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch diff --git a/patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch similarity index 100% rename from patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch rename to patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch diff --git a/patches/server/0059-Villagers-follow-emerald-blocks.patch b/patches/server/0060-Villagers-follow-emerald-blocks.patch similarity index 100% rename from patches/server/0059-Villagers-follow-emerald-blocks.patch rename to patches/server/0060-Villagers-follow-emerald-blocks.patch diff --git a/patches/server/0060-Allow-leashing-villagers.patch b/patches/server/0061-Allow-leashing-villagers.patch similarity index 100% rename from patches/server/0060-Allow-leashing-villagers.patch rename to patches/server/0061-Allow-leashing-villagers.patch diff --git a/patches/server/0061-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0061-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0062-Implement-infinite-lava.patch b/patches/server/0063-Implement-infinite-lava.patch similarity index 100% rename from patches/server/0062-Implement-infinite-lava.patch rename to patches/server/0063-Implement-infinite-lava.patch diff --git a/patches/server/0063-Make-lava-flow-speed-configurable.patch b/patches/server/0064-Make-lava-flow-speed-configurable.patch similarity index 100% rename from patches/server/0063-Make-lava-flow-speed-configurable.patch rename to patches/server/0064-Make-lava-flow-speed-configurable.patch diff --git a/patches/server/0064-Add-player-death-exp-control-options.patch b/patches/server/0065-Add-player-death-exp-control-options.patch similarity index 100% rename from patches/server/0064-Add-player-death-exp-control-options.patch rename to patches/server/0065-Add-player-death-exp-control-options.patch diff --git a/patches/server/0065-Configurable-void-damage-height-and-damage.patch b/patches/server/0066-Configurable-void-damage-height-and-damage.patch similarity index 97% rename from patches/server/0065-Configurable-void-damage-height-and-damage.patch rename to patches/server/0066-Configurable-void-damage-height-and-damage.patch index c1bb0c4710..aacb87d516 100644 --- a/patches/server/0065-Configurable-void-damage-height-and-damage.patch +++ b/patches/server/0066-Configurable-void-damage-height-and-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index aa1d31016c89e9988976ca28ce025f675cdc4c77..34349fa7a39841dad19be112eef8b02033945f3e 100644 +index d5df366dcbbd92523b9dd3a4afd4186a4d7ce5a1..b9896dd54fe1cd6084f55f697e0f36a3ea242545 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -767,7 +767,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0066-Add-canSaveToDisk-to-Entity.patch b/patches/server/0067-Add-canSaveToDisk-to-Entity.patch similarity index 96% rename from patches/server/0066-Add-canSaveToDisk-to-Entity.patch rename to patches/server/0067-Add-canSaveToDisk-to-Entity.patch index 93cdb5f23d..9c54922966 100644 --- a/patches/server/0066-Add-canSaveToDisk-to-Entity.patch +++ b/patches/server/0067-Add-canSaveToDisk-to-Entity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 34349fa7a39841dad19be112eef8b02033945f3e..28a763cb92cd5c63e5f9083e451802d5b1516eb1 100644 +index b9896dd54fe1cd6084f55f697e0f36a3ea242545..d2828fabedd353fb8a854fbd0beb978f5a93b504 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4262,5 +4262,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -4259,5 +4259,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n public boolean processClick(InteractionHand hand) { return false; } diff --git a/patches/server/0067-Dispenser-curse-of-binding-protection.patch b/patches/server/0068-Dispenser-curse-of-binding-protection.patch similarity index 100% rename from patches/server/0067-Dispenser-curse-of-binding-protection.patch rename to patches/server/0068-Dispenser-curse-of-binding-protection.patch diff --git a/patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch similarity index 100% rename from patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch rename to patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch diff --git a/patches/server/0069-Mending-mends-most-damages-equipment-first.patch b/patches/server/0070-Mending-mends-most-damages-equipment-first.patch similarity index 100% rename from patches/server/0069-Mending-mends-most-damages-equipment-first.patch rename to patches/server/0070-Mending-mends-most-damages-equipment-first.patch diff --git a/patches/server/0070-Add-5-second-tps-average-in-tps.patch b/patches/server/0071-Add-5-second-tps-average-in-tps.patch similarity index 100% rename from patches/server/0070-Add-5-second-tps-average-in-tps.patch rename to patches/server/0071-Add-5-second-tps-average-in-tps.patch diff --git a/patches/server/0071-Implement-elytra-settings.patch b/patches/server/0072-Implement-elytra-settings.patch similarity index 100% rename from patches/server/0071-Implement-elytra-settings.patch rename to patches/server/0072-Implement-elytra-settings.patch diff --git a/patches/server/0072-Item-entity-immunities.patch b/patches/server/0073-Item-entity-immunities.patch similarity index 100% rename from patches/server/0072-Item-entity-immunities.patch rename to patches/server/0073-Item-entity-immunities.patch diff --git a/patches/server/0073-Add-ping-command.patch b/patches/server/0074-Add-ping-command.patch similarity index 97% rename from patches/server/0073-Add-ping-command.patch rename to patches/server/0074-Add-ping-command.patch index fc5adb0b57..829948d98a 100644 --- a/patches/server/0073-Add-ping-command.patch +++ b/patches/server/0074-Add-ping-command.patch @@ -17,7 +17,7 @@ index d478627dcd2b6e3d3d95b3fa224a25d44e6bbafb..158fc5748f175708a0c3415a2217663f if (environment.includeIntegrated) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 052eb37087b5f97d92c00944968c13fec343d5a3..4f63424369ad76249bfb340e7ee23c25537546be 100644 +index f85849c637c338d42aa6f8d5f96b189113658422..e4031bdfca9cfd1b54d13187f276b15c640dea88 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -133,12 +133,14 @@ public class PurpurConfig { diff --git a/patches/server/0074-Add-demo-command.patch b/patches/server/0075-Add-demo-command.patch similarity index 97% rename from patches/server/0074-Add-demo-command.patch rename to patches/server/0075-Add-demo-command.patch index c09aff689a..dab529e689 100644 --- a/patches/server/0074-Add-demo-command.patch +++ b/patches/server/0075-Add-demo-command.patch @@ -17,7 +17,7 @@ index 158fc5748f175708a0c3415a2217663f77271bc7..9cbaaf4cd138e6c1d2d51afcef24a81a } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 4f63424369ad76249bfb340e7ee23c25537546be..4eccccee09c8bcb9daa264b10116f7253a737f3c 100644 +index e4031bdfca9cfd1b54d13187f276b15c640dea88..47c71cf5793c8e0c72795effeb189c46f29d6a41 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -133,6 +133,7 @@ public class PurpurConfig { diff --git a/patches/server/0075-Add-credits-command.patch b/patches/server/0076-Add-credits-command.patch similarity index 97% rename from patches/server/0075-Add-credits-command.patch rename to patches/server/0076-Add-credits-command.patch index 4393a7b6d7..5b9a23a31e 100644 --- a/patches/server/0075-Add-credits-command.patch +++ b/patches/server/0076-Add-credits-command.patch @@ -17,7 +17,7 @@ index 9cbaaf4cd138e6c1d2d51afcef24a81a3f2973c5..f164106a957c24bdb71bde85d82948a6 net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 4eccccee09c8bcb9daa264b10116f7253a737f3c..49c1be11f0e1d00a9bdaaf4cca7348d0dddbfc05 100644 +index 47c71cf5793c8e0c72795effeb189c46f29d6a41..d847ef8fc7c156e44cc83929f2d7232eea3c0f14 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -133,6 +133,7 @@ public class PurpurConfig { diff --git a/patches/server/0076-Configurable-jockey-options.patch b/patches/server/0077-Configurable-jockey-options.patch similarity index 100% rename from patches/server/0076-Configurable-jockey-options.patch rename to patches/server/0077-Configurable-jockey-options.patch diff --git a/patches/server/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 100% rename from patches/server/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch diff --git a/patches/server/0078-Add-phantom-spawning-options.patch b/patches/server/0079-Add-phantom-spawning-options.patch similarity index 100% rename from patches/server/0078-Add-phantom-spawning-options.patch rename to patches/server/0079-Add-phantom-spawning-options.patch diff --git a/patches/server/0079-Implement-bed-explosion-options.patch b/patches/server/0080-Implement-bed-explosion-options.patch similarity index 100% rename from patches/server/0079-Implement-bed-explosion-options.patch rename to patches/server/0080-Implement-bed-explosion-options.patch diff --git a/patches/server/0080-Implement-respawn-anchor-explosion-options.patch b/patches/server/0081-Implement-respawn-anchor-explosion-options.patch similarity index 100% rename from patches/server/0080-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0081-Implement-respawn-anchor-explosion-options.patch diff --git a/patches/server/0081-Add-allow-water-in-end-world-option.patch b/patches/server/0082-Add-allow-water-in-end-world-option.patch similarity index 98% rename from patches/server/0081-Add-allow-water-in-end-world-option.patch rename to patches/server/0082-Add-allow-water-in-end-world-option.patch index e77aa18077..24a62a87a4 100644 --- a/patches/server/0081-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0082-Add-allow-water-in-end-world-option.patch @@ -68,7 +68,7 @@ index df4f2c729f09d5229553308e4876f29de648543f..f2b0278679fa649bbc2904660e0dc9ab } else { world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState()); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 49c1be11f0e1d00a9bdaaf4cca7348d0dddbfc05..98737d9dd6fe299f4c5d88d1a6a2400665f2e2bf 100644 +index d847ef8fc7c156e44cc83929f2d7232eea3c0f14..9fb6bf4cd4d812481fc9bb11075a4ce9c7eaab0b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -192,6 +192,11 @@ public class PurpurConfig { diff --git a/patches/server/0082-Allow-color-codes-in-books.patch b/patches/server/0083-Allow-color-codes-in-books.patch similarity index 100% rename from patches/server/0082-Allow-color-codes-in-books.patch rename to patches/server/0083-Allow-color-codes-in-books.patch diff --git a/patches/server/0083-Entity-lifespan.patch b/patches/server/0084-Entity-lifespan.patch similarity index 100% rename from patches/server/0083-Entity-lifespan.patch rename to patches/server/0084-Entity-lifespan.patch diff --git a/patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 100% rename from patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0085-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch diff --git a/patches/server/0085-Squid-EAR-immunity.patch b/patches/server/0086-Squid-EAR-immunity.patch similarity index 100% rename from patches/server/0085-Squid-EAR-immunity.patch rename to patches/server/0086-Squid-EAR-immunity.patch diff --git a/patches/server/0086-Configurable-feature-seed-settings.patch b/patches/server/0087-Configurable-feature-seed-settings.patch similarity index 99% rename from patches/server/0086-Configurable-feature-seed-settings.patch rename to patches/server/0087-Configurable-feature-seed-settings.patch index 64e7b2c9f5..9a6c3fb2bf 100644 --- a/patches/server/0086-Configurable-feature-seed-settings.patch +++ b/patches/server/0087-Configurable-feature-seed-settings.patch @@ -835,7 +835,7 @@ index ed3944a60d09495eb424dd11d00e8c3585177d51..fcf25cc905ece0213a0eb6365a0a5756 return false; } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 98737d9dd6fe299f4c5d88d1a6a2400665f2e2bf..8c7b8e8035e7ab91406f1a7cba7313ac9de1c742 100644 +index 9fb6bf4cd4d812481fc9bb11075a4ce9c7eaab0b..18af1952331ea6037495c1aa57ab41fbd080f0f9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0087-Phantoms-burn-in-light.patch b/patches/server/0088-Phantoms-burn-in-light.patch similarity index 100% rename from patches/server/0087-Phantoms-burn-in-light.patch rename to patches/server/0088-Phantoms-burn-in-light.patch diff --git a/patches/server/0088-Configurable-villager-breeding.patch b/patches/server/0089-Configurable-villager-breeding.patch similarity index 100% rename from patches/server/0088-Configurable-villager-breeding.patch rename to patches/server/0089-Configurable-villager-breeding.patch diff --git a/patches/server/0089-Redstone-deactivates-spawners.patch b/patches/server/0090-Redstone-deactivates-spawners.patch similarity index 100% rename from patches/server/0089-Redstone-deactivates-spawners.patch rename to patches/server/0090-Redstone-deactivates-spawners.patch diff --git a/patches/server/0090-Totems-work-in-inventory.patch b/patches/server/0091-Totems-work-in-inventory.patch similarity index 100% rename from patches/server/0090-Totems-work-in-inventory.patch rename to patches/server/0091-Totems-work-in-inventory.patch diff --git a/patches/server/0091-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0092-Add-vindicator-johnny-spawn-chance.patch similarity index 100% rename from patches/server/0091-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0092-Add-vindicator-johnny-spawn-chance.patch diff --git a/patches/server/0092-Add-option-to-disable-certain-block-updates.patch b/patches/server/0093-Add-option-to-disable-certain-block-updates.patch similarity index 99% rename from patches/server/0092-Add-option-to-disable-certain-block-updates.patch rename to patches/server/0093-Add-option-to-disable-certain-block-updates.patch index e71dd60dc1..b2f3e70aeb 100644 --- a/patches/server/0092-Add-option-to-disable-certain-block-updates.patch +++ b/patches/server/0093-Add-option-to-disable-certain-block-updates.patch @@ -117,7 +117,7 @@ index f8e58d9f71703139a736d93e7f1996e027a29444..d3c8fd8399629efb8bcbaf7d9a0c4334 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 8c7b8e8035e7ab91406f1a7cba7313ac9de1c742..d7cce288e6eeef6d63325a4d30a03acf36933b9b 100644 +index 18af1952331ea6037495c1aa57ab41fbd080f0f9..11694f63641932c165c343bec254d0b1a94358ea 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -320,6 +320,15 @@ public class PurpurConfig { diff --git a/patches/server/0093-Dispensers-place-anvils-option.patch b/patches/server/0094-Dispensers-place-anvils-option.patch similarity index 100% rename from patches/server/0093-Dispensers-place-anvils-option.patch rename to patches/server/0094-Dispensers-place-anvils-option.patch diff --git a/patches/server/0094-Allow-anvil-colors.patch b/patches/server/0095-Allow-anvil-colors.patch similarity index 100% rename from patches/server/0094-Allow-anvil-colors.patch rename to patches/server/0095-Allow-anvil-colors.patch diff --git a/patches/server/0095-Add-no-random-tick-block-list.patch b/patches/server/0096-Add-no-random-tick-block-list.patch similarity index 100% rename from patches/server/0095-Add-no-random-tick-block-list.patch rename to patches/server/0096-Add-no-random-tick-block-list.patch diff --git a/patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0097-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 100% rename from patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0097-Add-option-to-disable-dolphin-treasure-searching.patch diff --git a/patches/server/0097-Short-enderman-height.patch b/patches/server/0098-Short-enderman-height.patch similarity index 97% rename from patches/server/0097-Short-enderman-height.patch rename to patches/server/0098-Short-enderman-height.patch index b92c0e5c02..03878821d2 100644 --- a/patches/server/0097-Short-enderman-height.patch +++ b/patches/server/0098-Short-enderman-height.patch @@ -31,7 +31,7 @@ index 6e0b5fbf5b0d216b6b7c647d45ef37cd6b591717..5ebedd6a156b06e98aded57c817f6342 if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start for (int i = 0; i < 64; ++i) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d7cce288e6eeef6d63325a4d30a03acf36933b9b..dcc1548a3ca7afab671ede65a8ef265e4a80772a 100644 +index 11694f63641932c165c343bec254d0b1a94358ea..223d93c5c03a43076d8544232e3656c4c29ad2d0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -3,6 +3,8 @@ package net.pl3x.purpur; diff --git a/patches/server/0098-Stop-squids-floating-on-top-of-water.patch b/patches/server/0099-Stop-squids-floating-on-top-of-water.patch similarity index 96% rename from patches/server/0098-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0099-Stop-squids-floating-on-top-of-water.patch index 5cf1bcacb6..781227dc73 100644 --- a/patches/server/0098-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0099-Stop-squids-floating-on-top-of-water.patch @@ -5,10 +5,10 @@ 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 28a763cb92cd5c63e5f9083e451802d5b1516eb1..a4c5bf20c69432a35ce04846e49c347364ecfaff 100644 +index d2828fabedd353fb8a854fbd0beb978f5a93b504..e43b31f07d6f0cbb35f925dca952b5947fe1fd4f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3832,11 +3832,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -3829,11 +3829,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n this.yRotO = this.getYRot(); } diff --git a/patches/server/0099-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0100-Use-configured-height-for-nether-surface-builders.patch similarity index 100% rename from patches/server/0099-Use-configured-height-for-nether-surface-builders.patch rename to patches/server/0100-Use-configured-height-for-nether-surface-builders.patch diff --git a/patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0101-Crying-obsidian-valid-for-portal-frames.patch similarity index 96% rename from patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch rename to patches/server/0101-Crying-obsidian-valid-for-portal-frames.patch index 6e3e2c5a67..e492c8af76 100644 --- a/patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch +++ b/patches/server/0101-Crying-obsidian-valid-for-portal-frames.patch @@ -18,7 +18,7 @@ index c07b5d1f1ef8b5e6026c7555d476880c8802d6c5..068f1b184a3694603f564d49fa45d5ce private final LevelAccessor level; private final Direction.Axis axis; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index dcc1548a3ca7afab671ede65a8ef265e4a80772a..c620ce09ae3e10f2a28ca4301eab6ce0b4f59558 100644 +index 223d93c5c03a43076d8544232e3656c4c29ad2d0..cd9f2217beba48a204edd3769429fa1ab312ab69 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -296,6 +296,7 @@ public class PurpurConfig { diff --git a/patches/server/0101-Entities-can-use-portals-configuration.patch b/patches/server/0102-Entities-can-use-portals-configuration.patch similarity index 96% rename from patches/server/0101-Entities-can-use-portals-configuration.patch rename to patches/server/0102-Entities-can-use-portals-configuration.patch index 6750129591..6c9bc43437 100644 --- a/patches/server/0101-Entities-can-use-portals-configuration.patch +++ b/patches/server/0102-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 a4c5bf20c69432a35ce04846e49c347364ecfaff..13650930c6e573da323a718df778dce4f73d4adc 100644 +index e43b31f07d6f0cbb35f925dca952b5947fe1fd4f..cc5854281d976c2faa453c2a6b07b5747eed6100 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2701,7 +2701,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0102-LivingEntity-broadcastItemBreak.patch b/patches/server/0103-LivingEntity-broadcastItemBreak.patch similarity index 100% rename from patches/server/0102-LivingEntity-broadcastItemBreak.patch rename to patches/server/0103-LivingEntity-broadcastItemBreak.patch diff --git a/patches/server/0103-Customizable-wither-health-and-healing.patch b/patches/server/0104-Customizable-wither-health-and-healing.patch similarity index 100% rename from patches/server/0103-Customizable-wither-health-and-healing.patch rename to patches/server/0104-Customizable-wither-health-and-healing.patch diff --git a/patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0105-Allow-toggling-special-MobSpawners-per-world.patch similarity index 100% rename from patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch rename to patches/server/0105-Allow-toggling-special-MobSpawners-per-world.patch diff --git a/patches/server/0105-Raid-cooldown-setting.patch b/patches/server/0106-Raid-cooldown-setting.patch similarity index 100% rename from patches/server/0105-Raid-cooldown-setting.patch rename to patches/server/0106-Raid-cooldown-setting.patch diff --git a/patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0107-Despawn-rate-config-options-per-projectile-type.patch similarity index 100% rename from patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch rename to patches/server/0107-Despawn-rate-config-options-per-projectile-type.patch diff --git a/patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0108-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 100% rename from patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/server/0108-Add-option-to-disable-zombie-aggressiveness-towards-.patch diff --git a/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0109-Persistent-TileEntity-Lore-and-DisplayName.patch similarity index 100% rename from patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch rename to patches/server/0109-Persistent-TileEntity-Lore-and-DisplayName.patch diff --git a/patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0110-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/server/0110-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/server/0110-Flying-squids-Oh-my.patch b/patches/server/0111-Flying-squids-Oh-my.patch similarity index 100% rename from patches/server/0110-Flying-squids-Oh-my.patch rename to patches/server/0111-Flying-squids-Oh-my.patch diff --git a/patches/server/0111-Infinity-bow-settings.patch b/patches/server/0112-Infinity-bow-settings.patch similarity index 100% rename from patches/server/0111-Infinity-bow-settings.patch rename to patches/server/0112-Infinity-bow-settings.patch diff --git a/patches/server/0112-Stonecutter-damage.patch b/patches/server/0113-Stonecutter-damage.patch similarity index 97% rename from patches/server/0112-Stonecutter-damage.patch rename to patches/server/0113-Stonecutter-damage.patch index df8a193e9c..df449551a2 100644 --- a/patches/server/0112-Stonecutter-damage.patch +++ b/patches/server/0113-Stonecutter-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stonecutter damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 13650930c6e573da323a718df778dce4f73d4adc..685fc8d4ddfab1c6ec04816068fc937038758f8d 100644 +index cc5854281d976c2faa453c2a6b07b5747eed6100..57a80aed6106ec55aeb636c5b5f3abc7fb4fff14 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1001,7 +1001,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0113-Configurable-daylight-cycle.patch b/patches/server/0114-Configurable-daylight-cycle.patch similarity index 100% rename from patches/server/0113-Configurable-daylight-cycle.patch rename to patches/server/0114-Configurable-daylight-cycle.patch diff --git a/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0115-Allow-infinite-and-mending-enchantments-together.patch similarity index 95% rename from patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch rename to patches/server/0115-Allow-infinite-and-mending-enchantments-together.patch index c09e130cfc..93238a2fbc 100644 --- a/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch +++ b/patches/server/0115-Allow-infinite-and-mending-enchantments-together.patch @@ -17,7 +17,7 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c620ce09ae3e10f2a28ca4301eab6ce0b4f59558..ceac3e7217965392357ae490a9e0243f97f1b421 100644 +index cd9f2217beba48a204edd3769429fa1ab312ab69..327dc3b4a06ed180521153c4ce5c57dfdf560aef 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -314,6 +314,16 @@ public class PurpurConfig { diff --git a/patches/server/0115-Infinite-fuel-furnace.patch b/patches/server/0116-Infinite-fuel-furnace.patch similarity index 100% rename from patches/server/0115-Infinite-fuel-furnace.patch rename to patches/server/0116-Infinite-fuel-furnace.patch diff --git a/patches/server/0116-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0117-Arrows-should-not-reset-despawn-counter.patch similarity index 100% rename from patches/server/0116-Arrows-should-not-reset-despawn-counter.patch rename to patches/server/0117-Arrows-should-not-reset-despawn-counter.patch diff --git a/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch similarity index 100% rename from patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch rename to patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch diff --git a/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0119-Add-adjustable-breeding-cooldown-to-config.patch similarity index 100% rename from patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch rename to patches/server/0119-Add-adjustable-breeding-cooldown-to-config.patch diff --git a/patches/server/0119-Make-entity-breeding-times-configurable.patch b/patches/server/0120-Make-entity-breeding-times-configurable.patch similarity index 100% rename from patches/server/0119-Make-entity-breeding-times-configurable.patch rename to patches/server/0120-Make-entity-breeding-times-configurable.patch diff --git a/patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0121-Apply-display-names-from-item-forms-of-entities-to-e.patch similarity index 100% rename from patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch rename to patches/server/0121-Apply-display-names-from-item-forms-of-entities-to-e.patch diff --git a/patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0122-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch similarity index 100% rename from patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch rename to patches/server/0122-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch diff --git a/patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0123-Add-twisting-and-weeping-vines-growth-rates.patch similarity index 100% rename from patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch rename to patches/server/0123-Add-twisting-and-weeping-vines-growth-rates.patch diff --git a/patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0124-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch similarity index 100% rename from patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch rename to patches/server/0124-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch diff --git a/patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0125-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch similarity index 100% rename from patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch rename to patches/server/0125-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch diff --git a/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0126-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch similarity index 100% rename from patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch rename to patches/server/0126-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch diff --git a/patches/server/0126-Add-configurable-snowball-damage.patch b/patches/server/0127-Add-configurable-snowball-damage.patch similarity index 100% rename from patches/server/0126-Add-configurable-snowball-damage.patch rename to patches/server/0127-Add-configurable-snowball-damage.patch diff --git a/patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0128-Zombie-break-door-minimum-difficulty-option.patch similarity index 100% rename from patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch rename to patches/server/0128-Zombie-break-door-minimum-difficulty-option.patch diff --git a/patches/server/0128-Left-handed-API.patch b/patches/server/0129-Left-handed-API.patch similarity index 100% rename from patches/server/0128-Left-handed-API.patch rename to patches/server/0129-Left-handed-API.patch diff --git a/patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0130-Changeable-Mob-Left-Handed-Chance.patch similarity index 100% rename from patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch rename to patches/server/0130-Changeable-Mob-Left-Handed-Chance.patch diff --git a/patches/server/0130-Add-boat-fall-damage-config.patch b/patches/server/0131-Add-boat-fall-damage-config.patch similarity index 100% rename from patches/server/0130-Add-boat-fall-damage-config.patch rename to patches/server/0131-Add-boat-fall-damage-config.patch diff --git a/patches/server/0131-Snow-Golem-rate-of-fire-config.patch b/patches/server/0132-Snow-Golem-rate-of-fire-config.patch similarity index 100% rename from patches/server/0131-Snow-Golem-rate-of-fire-config.patch rename to patches/server/0132-Snow-Golem-rate-of-fire-config.patch diff --git a/patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0133-PaperPR-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0133-PaperPR-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0133-EMC-Configurable-disable-give-dropping.patch b/patches/server/0134-EMC-Configurable-disable-give-dropping.patch similarity index 95% rename from patches/server/0133-EMC-Configurable-disable-give-dropping.patch rename to patches/server/0134-EMC-Configurable-disable-give-dropping.patch index 150a9c427d..d48becb091 100644 --- a/patches/server/0133-EMC-Configurable-disable-give-dropping.patch +++ b/patches/server/0134-EMC-Configurable-disable-give-dropping.patch @@ -20,7 +20,7 @@ index a0dc380e90415de9068ea408d62a1605c82631df..60fd566f7e1499ecf2ad91216a667f12 itemStack.setCount(1); ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index ceac3e7217965392357ae490a9e0243f97f1b421..64748248817886cf56b76ea325975760d5713f2b 100644 +index 327dc3b4a06ed180521153c4ce5c57dfdf560aef..a5b9153286236eb2a88404f7d3321ecb32c8aa82 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -293,6 +293,11 @@ public class PurpurConfig { diff --git a/patches/server/0134-Lobotomize-stuck-villagers.patch b/patches/server/0135-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/server/0134-Lobotomize-stuck-villagers.patch rename to patches/server/0135-Lobotomize-stuck-villagers.patch diff --git a/patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0136-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 100% rename from patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to patches/server/0136-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch diff --git a/patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0137-Toggle-for-Zombified-Piglin-death-always-counting-as.patch similarity index 100% rename from patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch rename to patches/server/0137-Toggle-for-Zombified-Piglin-death-always-counting-as.patch diff --git a/patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0138-Spread-out-and-optimise-player-list-ticksSpread-out-.patch similarity index 93% rename from patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch rename to patches/server/0138-Spread-out-and-optimise-player-list-ticksSpread-out-.patch index 0793e6cac2..1a98534947 100644 --- a/patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch +++ b/patches/server/0138-Spread-out-and-optimise-player-list-ticksSpread-out-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index e4b77d55350e93926eef9a7c521a074047542644..3508c809d2840a07fa06a37b177a73a0671b633a 100644 +index c92b57e7e5d1b31db8b7e75a9013df41eb2806c4..7d7e5b7508470c0570e7f0becd607a2c35d17d6b 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1005,22 +1005,22 @@ public abstract class PlayerList { @@ -46,7 +46,7 @@ index e4b77d55350e93926eef9a7c521a074047542644..3508c809d2840a07fa06a37b177a73a0 public void broadcastAll(Packet packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 22693f6c27b120c987153753dd33ffd37c227592..dda1a5033172db0bb6b53e93448f92af065248ad 100644 +index a2b041d713e937b4b5e1e6c7c73be8ab32115120..53d1eabf3e4490fb3f6eb1195c8ec584ceb50794 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1558,7 +1558,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0139-Configurable-chance-for-wolves-to-spawn-rabid.patch similarity index 100% rename from patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch rename to patches/server/0139-Configurable-chance-for-wolves-to-spawn-rabid.patch diff --git a/patches/server/0139-Configurable-default-wolf-collar-color.patch b/patches/server/0140-Configurable-default-wolf-collar-color.patch similarity index 100% rename from patches/server/0139-Configurable-default-wolf-collar-color.patch rename to patches/server/0140-Configurable-default-wolf-collar-color.patch diff --git a/patches/server/0140-Phantom-flames-on-swoop.patch b/patches/server/0141-Phantom-flames-on-swoop.patch similarity index 100% rename from patches/server/0140-Phantom-flames-on-swoop.patch rename to patches/server/0141-Phantom-flames-on-swoop.patch diff --git a/patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0142-Option-for-chests-to-open-even-with-a-solid-block-on.patch similarity index 100% rename from patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch rename to patches/server/0142-Option-for-chests-to-open-even-with-a-solid-block-on.patch diff --git a/patches/server/0142-Implement-TPSBar.patch b/patches/server/0143-Implement-TPSBar.patch similarity index 98% rename from patches/server/0142-Implement-TPSBar.patch rename to patches/server/0143-Implement-TPSBar.patch index 546f6bf030..fb8bd7849c 100644 --- a/patches/server/0142-Implement-TPSBar.patch +++ b/patches/server/0143-Implement-TPSBar.patch @@ -42,7 +42,7 @@ index 6e67ea018cd6f362bba104f542c52438b455ccab..66d2559e5bd8630c6cbca0fe8d0eb1f7 } } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 3508c809d2840a07fa06a37b177a73a0671b633a..340297eaa566480997aba5537c73134ec8b5111c 100644 +index 7d7e5b7508470c0570e7f0becd607a2c35d17d6b..3f5002c106ef251ed0c30e61a8726c1a35c51c21 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -586,6 +586,8 @@ public abstract class PlayerList { diff --git a/patches/server/0143-Striders-give-saddle-back.patch b/patches/server/0144-Striders-give-saddle-back.patch similarity index 100% rename from patches/server/0143-Striders-give-saddle-back.patch rename to patches/server/0144-Striders-give-saddle-back.patch diff --git a/patches/server/0144-PlayerBookTooLargeEvent.patch b/patches/server/0145-PlayerBookTooLargeEvent.patch similarity index 100% rename from patches/server/0144-PlayerBookTooLargeEvent.patch rename to patches/server/0145-PlayerBookTooLargeEvent.patch diff --git a/patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0146-Full-netherite-armor-grants-fire-resistance.patch similarity index 100% rename from patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch rename to patches/server/0146-Full-netherite-armor-grants-fire-resistance.patch diff --git a/patches/server/0146-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0147-Fix-rotating-UP-DOWN-CW-and-CCW.patch similarity index 100% rename from patches/server/0146-Fix-rotating-UP-DOWN-CW-and-CCW.patch rename to patches/server/0147-Fix-rotating-UP-DOWN-CW-and-CCW.patch diff --git a/patches/server/0147-Add-MC-4-fix-back.patch b/patches/server/0148-Add-MC-4-fix-back.patch similarity index 94% rename from patches/server/0147-Add-MC-4-fix-back.patch rename to patches/server/0148-Add-MC-4-fix-back.patch index 3bcfd684a7..d21f627486 100644 --- a/patches/server/0147-Add-MC-4-fix-back.patch +++ b/patches/server/0148-Add-MC-4-fix-back.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add MC-4 fix back diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 685fc8d4ddfab1c6ec04816068fc937038758f8d..103cac9915855858768c80a05e6e6a73f9cb9402 100644 +index 57a80aed6106ec55aeb636c5b5f3abc7fb4fff14..7ebbe6588256471b6e5903ed6aaa20878340332e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4029,17 +4029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -4026,17 +4026,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n return this.getZ((2.0D * this.random.nextDouble() - 1.0D) * widthScale); } diff --git a/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch similarity index 100% rename from patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch rename to patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch diff --git a/patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0150-Config-to-allow-Note-Block-sounds-when-blocked.patch similarity index 100% rename from patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch rename to patches/server/0150-Config-to-allow-Note-Block-sounds-when-blocked.patch diff --git a/patches/server/0150-Add-EntityTeleportHinderedEvent.patch b/patches/server/0151-Add-EntityTeleportHinderedEvent.patch similarity index 99% rename from patches/server/0150-Add-EntityTeleportHinderedEvent.patch rename to patches/server/0151-Add-EntityTeleportHinderedEvent.patch index 643f36c235..6e6b35fa24 100644 --- a/patches/server/0150-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0151-Add-EntityTeleportHinderedEvent.patch @@ -113,7 +113,7 @@ index edc08af4ec2ce6e90c30da286c0ba5ac16efd3fc..3a92c0112befe51e795f81b1fce52e1f } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index dda1a5033172db0bb6b53e93448f92af065248ad..cc3750a28627a2b9def1b2cac91f43b9a0b7f2e3 100644 +index 53d1eabf3e4490fb3f6eb1195c8ec584ceb50794..5e729ad8677b84be00895fb29a4e209248e3f55f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -997,6 +997,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0151-Add-StructureGenerateEvent.patch b/patches/server/0152-Add-StructureGenerateEvent.patch similarity index 100% rename from patches/server/0151-Add-StructureGenerateEvent.patch rename to patches/server/0152-Add-StructureGenerateEvent.patch diff --git a/patches/server/0152-Farmland-trampling-changes.patch b/patches/server/0153-Farmland-trampling-changes.patch similarity index 100% rename from patches/server/0152-Farmland-trampling-changes.patch rename to patches/server/0153-Farmland-trampling-changes.patch diff --git a/patches/server/0153-Movement-options-for-armor-stands.patch b/patches/server/0154-Movement-options-for-armor-stands.patch similarity index 98% rename from patches/server/0153-Movement-options-for-armor-stands.patch rename to patches/server/0154-Movement-options-for-armor-stands.patch index 7d954e6414..efffecafa1 100644 --- a/patches/server/0153-Movement-options-for-armor-stands.patch +++ b/patches/server/0154-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 103cac9915855858768c80a05e6e6a73f9cb9402..9a83d2eea22f5602c79a08cf9d3af14a0838f9c9 100644 +index 7ebbe6588256471b6e5903ed6aaa20878340332e..1029b004b526acbeecc1f2e82ddae00ff3de1196 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1588,7 +1588,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0154-Fix-stuck-in-portals.patch b/patches/server/0155-Fix-stuck-in-portals.patch similarity index 97% rename from patches/server/0154-Fix-stuck-in-portals.patch rename to patches/server/0155-Fix-stuck-in-portals.patch index fc83f3bffc..16d0e0c890 100644 --- a/patches/server/0154-Fix-stuck-in-portals.patch +++ b/patches/server/0155-Fix-stuck-in-portals.patch @@ -17,7 +17,7 @@ index d362c9efbad593a7cd7efbcdba4acf1457abe4f7..1747d80315d7b11b7ccb21dd41324434 // 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 9a83d2eea22f5602c79a08cf9d3af14a0838f9c9..59c2cd680830b87d6f412020672a0a156800b7fc 100644 +index 1029b004b526acbeecc1f2e82ddae00ff3de1196..1f06a8b4102d8736755e052f03d3bfb0bbf867a1 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2698,12 +2698,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch similarity index 100% rename from patches/server/0155-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch diff --git a/patches/server/0156-Config-to-always-tame-in-Creative.patch b/patches/server/0157-Config-to-always-tame-in-Creative.patch similarity index 100% rename from patches/server/0156-Config-to-always-tame-in-Creative.patch rename to patches/server/0157-Config-to-always-tame-in-Creative.patch diff --git a/patches/server/0157-End-crystal-explosion-options.patch b/patches/server/0158-End-crystal-explosion-options.patch similarity index 100% rename from patches/server/0157-End-crystal-explosion-options.patch rename to patches/server/0158-End-crystal-explosion-options.patch diff --git a/patches/server/0158-Add-unsafe-Entity-serialization-API.patch b/patches/server/0159-Add-unsafe-Entity-serialization-API.patch similarity index 100% rename from patches/server/0158-Add-unsafe-Entity-serialization-API.patch rename to patches/server/0159-Add-unsafe-Entity-serialization-API.patch diff --git a/patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 100% rename from patches/server/0159-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch diff --git a/patches/server/0160-Dont-run-with-scissors.patch b/patches/server/0161-Dont-run-with-scissors.patch similarity index 100% rename from patches/server/0160-Dont-run-with-scissors.patch rename to patches/server/0161-Dont-run-with-scissors.patch diff --git a/patches/server/0161-One-Punch-Man.patch b/patches/server/0162-One-Punch-Man.patch similarity index 100% rename from patches/server/0161-One-Punch-Man.patch rename to patches/server/0162-One-Punch-Man.patch diff --git a/patches/server/0162-Add-config-for-snow-on-blue-ice.patch b/patches/server/0163-Add-config-for-snow-on-blue-ice.patch similarity index 100% rename from patches/server/0162-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0163-Add-config-for-snow-on-blue-ice.patch diff --git a/patches/server/0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0164-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 100% rename from patches/server/0163-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0164-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch diff --git a/patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0165-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 100% rename from patches/server/0164-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0165-Config-to-ignore-nearby-mobs-when-sleeping.patch diff --git a/patches/server/0165-Add-back-player-spawned-endermite-API.patch b/patches/server/0166-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/server/0165-Add-back-player-spawned-endermite-API.patch rename to patches/server/0166-Add-back-player-spawned-endermite-API.patch diff --git a/patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 100% rename from patches/server/0166-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch diff --git a/patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 100% rename from patches/server/0167-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch diff --git a/patches/server/0168-Tick-fluids-config.patch b/patches/server/0169-Tick-fluids-config.patch similarity index 100% rename from patches/server/0168-Tick-fluids-config.patch rename to patches/server/0169-Tick-fluids-config.patch diff --git a/patches/server/0169-Config-to-disable-Llama-caravans.patch b/patches/server/0170-Config-to-disable-Llama-caravans.patch similarity index 100% rename from patches/server/0169-Config-to-disable-Llama-caravans.patch rename to patches/server/0170-Config-to-disable-Llama-caravans.patch diff --git a/patches/server/0170-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0171-Config-to-make-Creepers-explode-on-death.patch similarity index 100% rename from patches/server/0170-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0171-Config-to-make-Creepers-explode-on-death.patch diff --git a/patches/server/0171-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0172-Configurable-ravager-griefable-blocks-list.patch similarity index 100% rename from patches/server/0171-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0172-Configurable-ravager-griefable-blocks-list.patch diff --git a/patches/server/0172-Sneak-to-bulk-process-composter.patch b/patches/server/0173-Sneak-to-bulk-process-composter.patch similarity index 100% rename from patches/server/0172-Sneak-to-bulk-process-composter.patch rename to patches/server/0173-Sneak-to-bulk-process-composter.patch diff --git a/patches/server/0173-Config-for-skipping-night.patch b/patches/server/0174-Config-for-skipping-night.patch similarity index 100% rename from patches/server/0173-Config-for-skipping-night.patch rename to patches/server/0174-Config-for-skipping-night.patch diff --git a/patches/server/0174-Add-config-for-villager-trading.patch b/patches/server/0175-Add-config-for-villager-trading.patch similarity index 100% rename from patches/server/0174-Add-config-for-villager-trading.patch rename to patches/server/0175-Add-config-for-villager-trading.patch diff --git a/patches/server/0175-Allow-infinity-on-crossbows.patch b/patches/server/0176-Allow-infinity-on-crossbows.patch similarity index 98% rename from patches/server/0175-Allow-infinity-on-crossbows.patch rename to patches/server/0176-Allow-infinity-on-crossbows.patch index e7de73937f..ea9a189d02 100644 --- a/patches/server/0175-Allow-infinity-on-crossbows.patch +++ b/patches/server/0176-Allow-infinity-on-crossbows.patch @@ -59,7 +59,7 @@ index 6f6106ca4d74d50a7b74b086adc96c58c7906cb6..d6417c1e77ac8823e18a179dc9f61757 public abstract boolean canEnchant(Item item); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 64748248817886cf56b76ea325975760d5713f2b..aed9304d8f14070d17134b117fb94170f367cb3e 100644 +index a5b9153286236eb2a88404f7d3321ecb32c8aa82..4d22da0c2e4787c3f3b0c156d05148357b861887 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -320,6 +320,7 @@ public class PurpurConfig { diff --git a/patches/server/0176-Drowning-Settings.patch b/patches/server/0177-Drowning-Settings.patch similarity index 97% rename from patches/server/0176-Drowning-Settings.patch rename to patches/server/0177-Drowning-Settings.patch index 7a5ffa8886..4b8c99206e 100644 --- a/patches/server/0176-Drowning-Settings.patch +++ b/patches/server/0177-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 59c2cd680830b87d6f412020672a0a156800b7fc..8223d014a00c09b0d3ee392b3a079f42dc67237a 100644 +index 1f06a8b4102d8736755e052f03d3bfb0bbf867a1..51dcd696413efe9c2e4fbf7536b5f65fd7806f0f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2932,7 +2932,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0177-Break-individual-slabs-when-sneaking.patch b/patches/server/0178-Break-individual-slabs-when-sneaking.patch similarity index 100% rename from patches/server/0177-Break-individual-slabs-when-sneaking.patch rename to patches/server/0178-Break-individual-slabs-when-sneaking.patch diff --git a/patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0179-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 100% rename from patches/server/0178-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0179-Config-to-disable-hostile-mob-spawn-on-ice.patch diff --git a/patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0180-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 100% rename from patches/server/0179-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0180-Config-to-show-Armor-Stand-arms-on-spawn.patch diff --git a/patches/server/0180-Option-to-make-doors-require-redstone.patch b/patches/server/0181-Option-to-make-doors-require-redstone.patch similarity index 100% rename from patches/server/0180-Option-to-make-doors-require-redstone.patch rename to patches/server/0181-Option-to-make-doors-require-redstone.patch diff --git a/patches/server/0181-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0182-Config-to-allow-for-unsafe-enchants.patch similarity index 97% rename from patches/server/0181-Config-to-allow-for-unsafe-enchants.patch rename to patches/server/0182-Config-to-allow-for-unsafe-enchants.patch index a014fb768f..82225ba6a5 100644 --- a/patches/server/0181-Config-to-allow-for-unsafe-enchants.patch +++ b/patches/server/0182-Config-to-allow-for-unsafe-enchants.patch @@ -44,7 +44,7 @@ index 5bd25f8b8a554b965665b3f5686c14189b51f28e..4be9924556e0f447dbe6a53c2d4cb7fb this.getOrCreateTag().put(key, tag); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index aed9304d8f14070d17134b117fb94170f367cb3e..c386351bac49aeb419305f69253d388719f5b318 100644 +index 4d22da0c2e4787c3f3b0c156d05148357b861887..2473554698b39690bcbc6a2c255e92e1decc1fdf 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -321,6 +321,7 @@ public class PurpurConfig { diff --git a/patches/server/0182-Configurable-sponge-absorption.patch b/patches/server/0183-Configurable-sponge-absorption.patch similarity index 100% rename from patches/server/0182-Configurable-sponge-absorption.patch rename to patches/server/0183-Configurable-sponge-absorption.patch diff --git a/patches/server/0183-Projectile-offset-config.patch b/patches/server/0184-Projectile-offset-config.patch similarity index 100% rename from patches/server/0183-Projectile-offset-config.patch rename to patches/server/0184-Projectile-offset-config.patch diff --git a/patches/server/0184-Config-for-powered-rail-activation-distance.patch b/patches/server/0185-Config-for-powered-rail-activation-distance.patch similarity index 100% rename from patches/server/0184-Config-for-powered-rail-activation-distance.patch rename to patches/server/0185-Config-for-powered-rail-activation-distance.patch diff --git a/patches/server/0185-Piglin-portal-spawn-modifier.patch b/patches/server/0186-Piglin-portal-spawn-modifier.patch similarity index 100% rename from patches/server/0185-Piglin-portal-spawn-modifier.patch rename to patches/server/0186-Piglin-portal-spawn-modifier.patch diff --git a/patches/server/0186-Config-to-change-max-number-of-bees.patch b/patches/server/0187-Config-to-change-max-number-of-bees.patch similarity index 96% rename from patches/server/0186-Config-to-change-max-number-of-bees.patch rename to patches/server/0187-Config-to-change-max-number-of-bees.patch index 0b4efd49db..4cc39f7390 100644 --- a/patches/server/0186-Config-to-change-max-number-of-bees.patch +++ b/patches/server/0187-Config-to-change-max-number-of-bees.patch @@ -18,7 +18,7 @@ index 8484e80a70129fb0358d56efab6fd54798b54e6e..ffacc4b8cc3ab8285c4131aec58e48ff public BeehiveBlockEntity(BlockPos pos, BlockState state) { super(BlockEntityType.BEEHIVE, pos, state); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c386351bac49aeb419305f69253d388719f5b318..c7686591a00253ff15f1a080d4e5e14ab21765eb 100644 +index 2473554698b39690bcbc6a2c255e92e1decc1fdf..3bfc5425da66a37034bfa7aa01246b695c4647cf 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -302,6 +302,7 @@ public class PurpurConfig { diff --git a/patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch similarity index 97% rename from patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch index 8a7b7d1f34..6798d95404 100644 --- a/patches/server/0187-Configurable-damage-settings-for-magma-blocks.patch +++ b/patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable damage settings for magma blocks diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8223d014a00c09b0d3ee392b3a079f42dc67237a..9fcba5b2b35b83675a032a0ace1605d35a65380b 100644 +index 51dcd696413efe9c2e4fbf7536b5f65fd7806f0f..aba462649a21ea68c83bd80c61ab9bf63eeb1a93 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1001,7 +1001,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0188-Config-for-wither-explosion-radius.patch b/patches/server/0189-Config-for-wither-explosion-radius.patch similarity index 100% rename from patches/server/0188-Config-for-wither-explosion-radius.patch rename to patches/server/0189-Config-for-wither-explosion-radius.patch diff --git a/patches/server/0189-Gamemode-extra-permissions.patch b/patches/server/0190-Gamemode-extra-permissions.patch similarity index 98% rename from patches/server/0189-Gamemode-extra-permissions.patch rename to patches/server/0190-Gamemode-extra-permissions.patch index a7d74ed630..30b56dd75a 100644 --- a/patches/server/0189-Gamemode-extra-permissions.patch +++ b/patches/server/0190-Gamemode-extra-permissions.patch @@ -54,7 +54,7 @@ index 79f6089b934124c3309c6bee2e48b36b937252e0..dff8ef0a1a2e52792070d93685c29002 for(ServerPlayer serverPlayer : targets) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c7686591a00253ff15f1a080d4e5e14ab21765eb..4ae94c8df21508ccfb4dcccf5fbdc56ce878c47f 100644 +index 3bfc5425da66a37034bfa7aa01246b695c4647cf..579ddb3560a812413af2fabe986abdd65ce93f99 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -298,6 +298,11 @@ public class PurpurConfig { diff --git a/patches/server/0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0191-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch similarity index 100% rename from patches/server/0190-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch rename to patches/server/0191-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch diff --git a/patches/server/0191-Configurable-piston-push-limit.patch b/patches/server/0192-Configurable-piston-push-limit.patch similarity index 100% rename from patches/server/0191-Configurable-piston-push-limit.patch rename to patches/server/0192-Configurable-piston-push-limit.patch diff --git a/patches/server/0192-Configurable-broadcast-settings.patch b/patches/server/0193-Configurable-broadcast-settings.patch similarity index 97% rename from patches/server/0192-Configurable-broadcast-settings.patch rename to patches/server/0193-Configurable-broadcast-settings.patch index 4327137474..7d8f438d68 100644 --- a/patches/server/0192-Configurable-broadcast-settings.patch +++ b/patches/server/0193-Configurable-broadcast-settings.patch @@ -29,7 +29,7 @@ index d5ee740792699f2eab3965d4920de913bd76f18e..434558824edd85809a747a436f2ad429 if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) { this.server.getPlayerList().broadcastToTeam((Player) this, ichatbasecomponent); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 4ae94c8df21508ccfb4dcccf5fbdc56ce878c47f..e152eb5884bc564e15415cd50b3942913825c13d 100644 +index 579ddb3560a812413af2fabe986abdd65ce93f99..6615bda9bb0a4e49daa40b29f9335ff08cec4207 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -150,6 +150,18 @@ public class PurpurConfig { diff --git a/patches/server/0193-Fix-SPIGOT-6278.patch b/patches/server/0194-Fix-SPIGOT-6278.patch similarity index 100% rename from patches/server/0193-Fix-SPIGOT-6278.patch rename to patches/server/0194-Fix-SPIGOT-6278.patch diff --git a/patches/server/0194-Configurable-mob-blindness.patch b/patches/server/0195-Configurable-mob-blindness.patch similarity index 100% rename from patches/server/0194-Configurable-mob-blindness.patch rename to patches/server/0195-Configurable-mob-blindness.patch diff --git a/patches/server/0195-Hide-hidden-players-from-entity-selector.patch b/patches/server/0196-Hide-hidden-players-from-entity-selector.patch similarity index 97% rename from patches/server/0195-Hide-hidden-players-from-entity-selector.patch rename to patches/server/0196-Hide-hidden-players-from-entity-selector.patch index ac7da8b653..c8f53be1b0 100644 --- a/patches/server/0195-Hide-hidden-players-from-entity-selector.patch +++ b/patches/server/0196-Hide-hidden-players-from-entity-selector.patch @@ -59,7 +59,7 @@ index 0fb8f32427843f4bfd90ab88ecb3ab3e4a4fda31..f99f1ba7f912a2fd503e12c446b342a8 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index e152eb5884bc564e15415cd50b3942913825c13d..36912a7cfd3efd49cefbbaf9dc7110de105cd638 100644 +index 6615bda9bb0a4e49daa40b29f9335ff08cec4207..587f9c75feb994b15c41e42d06139d1003cd15ab 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -311,8 +311,10 @@ public class PurpurConfig { diff --git a/patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0197-Config-for-health-to-impact-Creeper-explosion-radius.patch similarity index 100% rename from patches/server/0196-Config-for-health-to-impact-Creeper-explosion-radius.patch rename to patches/server/0197-Config-for-health-to-impact-Creeper-explosion-radius.patch diff --git a/patches/server/0197-Iron-golem-poppy-calms-anger.patch b/patches/server/0198-Iron-golem-poppy-calms-anger.patch similarity index 100% rename from patches/server/0197-Iron-golem-poppy-calms-anger.patch rename to patches/server/0198-Iron-golem-poppy-calms-anger.patch diff --git a/patches/server/0198-Breedable-parrots.patch b/patches/server/0199-Breedable-parrots.patch similarity index 100% rename from patches/server/0198-Breedable-parrots.patch rename to patches/server/0199-Breedable-parrots.patch diff --git a/patches/server/0199-Configurable-powered-rail-boost-modifier.patch b/patches/server/0200-Configurable-powered-rail-boost-modifier.patch similarity index 100% rename from patches/server/0199-Configurable-powered-rail-boost-modifier.patch rename to patches/server/0200-Configurable-powered-rail-boost-modifier.patch diff --git a/patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0201-Add-config-change-multiplier-critical-damage-value.patch similarity index 100% rename from patches/server/0200-Add-config-change-multiplier-critical-damage-value.patch rename to patches/server/0201-Add-config-change-multiplier-critical-damage-value.patch diff --git a/patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0202-Option-to-disable-dragon-egg-teleporting.patch similarity index 100% rename from patches/server/0201-Option-to-disable-dragon-egg-teleporting.patch rename to patches/server/0202-Option-to-disable-dragon-egg-teleporting.patch diff --git a/patches/server/0202-Config-for-unverified-username-message.patch b/patches/server/0203-Config-for-unverified-username-message.patch similarity index 97% rename from patches/server/0202-Config-for-unverified-username-message.patch rename to patches/server/0203-Config-for-unverified-username-message.patch index c8f8e74d33..c35de338dc 100644 --- a/patches/server/0202-Config-for-unverified-username-message.patch +++ b/patches/server/0203-Config-for-unverified-username-message.patch @@ -18,7 +18,7 @@ index 5d26417b5d4e182fdefdf1ef5c81a0b7d7f2d4c1..43090b05642d252fd5b3d4a65149beab } } catch (AuthenticationUnavailableException authenticationunavailableexception) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 36912a7cfd3efd49cefbbaf9dc7110de105cd638..598f058a5719e5f12467cb04a38e8aad3332a7c7 100644 +index 587f9c75feb994b15c41e42d06139d1003cd15ab..f7dffceb8c67bac36fdaf070894803e4cf90c30b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -139,6 +139,7 @@ public class PurpurConfig { diff --git a/patches/server/0203-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0204-Make-anvil-cumulative-cost-configurable.patch similarity index 95% rename from patches/server/0203-Make-anvil-cumulative-cost-configurable.patch rename to patches/server/0204-Make-anvil-cumulative-cost-configurable.patch index 8cb8efc44c..2b2b904ccc 100644 --- a/patches/server/0203-Make-anvil-cumulative-cost-configurable.patch +++ b/patches/server/0204-Make-anvil-cumulative-cost-configurable.patch @@ -18,7 +18,7 @@ index 2dbc71a3d76cc87e2683b8f351bd8db04481855e..44ecc27fd9bd5a02656321cf8c69bbae public void setItemName(String newItemName) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 598f058a5719e5f12467cb04a38e8aad3332a7c7..cd5a0a47fe705b7ef9e257f9fd89d3a7b660af5c 100644 +index f7dffceb8c67bac36fdaf070894803e4cf90c30b..75149211662984cd74b5ab3a5836c096dc2da0c3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -324,6 +324,7 @@ public class PurpurConfig { diff --git a/patches/server/0204-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0205-ShulkerBox-allow-oversized-stacks.patch similarity index 100% rename from patches/server/0204-ShulkerBox-allow-oversized-stacks.patch rename to patches/server/0205-ShulkerBox-allow-oversized-stacks.patch diff --git a/patches/server/0205-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0206-Bee-can-work-when-raining-or-at-night.patch similarity index 100% rename from patches/server/0205-Bee-can-work-when-raining-or-at-night.patch rename to patches/server/0206-Bee-can-work-when-raining-or-at-night.patch diff --git a/patches/server/0206-API-for-any-mob-to-burn-daylight.patch b/patches/server/0207-API-for-any-mob-to-burn-daylight.patch similarity index 99% rename from patches/server/0206-API-for-any-mob-to-burn-daylight.patch rename to patches/server/0207-API-for-any-mob-to-burn-daylight.patch index 5d4d18ce70..9b95ff6a67 100644 --- a/patches/server/0206-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0207-API-for-any-mob-to-burn-daylight.patch @@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight Co-authored by: Encode42 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9fcba5b2b35b83675a032a0ace1605d35a65380b..351a59c2e13f4180fc5eb3e77d9c239d0ae8b165 100644 +index aba462649a21ea68c83bd80c61ab9bf63eeb1a93..55ab331c8de0aa7c5c47e42ee92ae0d05c0443e7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4265,5 +4265,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n +@@ -4262,5 +4262,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n public boolean canSaveToDisk() { return true; } diff --git a/patches/server/0207-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0208-Fix-advancement-triggers-on-entity-death.patch similarity index 100% rename from patches/server/0207-Fix-advancement-triggers-on-entity-death.patch rename to patches/server/0208-Fix-advancement-triggers-on-entity-death.patch diff --git a/patches/server/0208-Config-MobEffect-by-world.patch b/patches/server/0209-Config-MobEffect-by-world.patch similarity index 100% rename from patches/server/0208-Config-MobEffect-by-world.patch rename to patches/server/0209-Config-MobEffect-by-world.patch diff --git a/patches/server/0209-Beacon-Activation-Range-Configurable.patch b/patches/server/0210-Beacon-Activation-Range-Configurable.patch similarity index 100% rename from patches/server/0209-Beacon-Activation-Range-Configurable.patch rename to patches/server/0210-Beacon-Activation-Range-Configurable.patch diff --git a/patches/server/0210-Add-toggle-for-sand-duping-fix.patch b/patches/server/0211-Add-toggle-for-sand-duping-fix.patch similarity index 100% rename from patches/server/0210-Add-toggle-for-sand-duping-fix.patch rename to patches/server/0211-Add-toggle-for-sand-duping-fix.patch diff --git a/patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0212-Add-toggle-for-end-portal-safe-teleporting.patch similarity index 97% rename from patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch rename to patches/server/0212-Add-toggle-for-end-portal-safe-teleporting.patch index fa6c3d83e4..7c30de0c4a 100644 --- a/patches/server/0211-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0212-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 351a59c2e13f4180fc5eb3e77d9c239d0ae8b165..39f84df6f7a9272c14066dff9145b8ecdafb60db 100644 +index 55ab331c8de0aa7c5c47e42ee92ae0d05c0443e7..63cfc111ccdaa725975234eb3f58c743c57177f3 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2749,7 +2749,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n diff --git a/patches/server/0212-Flying-Fall-Damage-API.patch b/patches/server/0213-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/server/0212-Flying-Fall-Damage-API.patch rename to patches/server/0213-Flying-Fall-Damage-API.patch diff --git a/patches/server/0213-Make-lightning-rod-range-configurable.patch b/patches/server/0214-Make-lightning-rod-range-configurable.patch similarity index 96% rename from patches/server/0213-Make-lightning-rod-range-configurable.patch rename to patches/server/0214-Make-lightning-rod-range-configurable.patch index 757d28b023..e4b3dd5189 100644 --- a/patches/server/0213-Make-lightning-rod-range-configurable.patch +++ b/patches/server/0214-Make-lightning-rod-range-configurable.patch @@ -18,7 +18,7 @@ index 04b9a36d978b085d9cb35030c6e6395e41c8c758..c4d583c21cd95e02ff04dfa7cdd3ed1a return optional.map((blockposition1) -> { return blockposition1.above(1); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index cd5a0a47fe705b7ef9e257f9fd89d3a7b660af5c..4776955acf6770a5b5a8c783f68523a7c0d47483 100644 +index 75149211662984cd74b5ab3a5836c096dc2da0c3..e1d26386308dcac25a98f17ee3c640b42b3e41e8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -325,6 +325,7 @@ public class PurpurConfig { diff --git a/patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0215-Burp-after-eating-food-fills-hunger-bar-completely.patch similarity index 100% rename from patches/server/0214-Burp-after-eating-food-fills-hunger-bar-completely.patch rename to patches/server/0215-Burp-after-eating-food-fills-hunger-bar-completely.patch diff --git a/patches/server/0215-Allow-player-join-full-server-by-permission.patch b/patches/server/0216-Allow-player-join-full-server-by-permission.patch similarity index 93% rename from patches/server/0215-Allow-player-join-full-server-by-permission.patch rename to patches/server/0216-Allow-player-join-full-server-by-permission.patch index fc1ed14111..104413be96 100644 --- a/patches/server/0215-Allow-player-join-full-server-by-permission.patch +++ b/patches/server/0216-Allow-player-join-full-server-by-permission.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow player join full server by permission diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 340297eaa566480997aba5537c73134ec8b5111c..4040c7d0f660d8cf8df8649e993603a0dfafd915 100644 +index 3f5002c106ef251ed0c30e61a8726c1a35c51c21..1eddf43eae9a5302040129cbb1d1a3b2f84c2e98 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -757,7 +757,7 @@ public abstract class PlayerList { diff --git a/patches/server/0216-Populator-seed-controls.patch b/patches/server/0217-Populator-seed-controls.patch similarity index 100% rename from patches/server/0216-Populator-seed-controls.patch rename to patches/server/0217-Populator-seed-controls.patch diff --git a/patches/server/0217-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0218-Add-permission-bypass-for-portal-waiting.patch similarity index 100% rename from patches/server/0217-Add-permission-bypass-for-portal-waiting.patch rename to patches/server/0218-Add-permission-bypass-for-portal-waiting.patch diff --git a/patches/server/0218-Shulker-spawn-from-bullet-options.patch b/patches/server/0219-Shulker-spawn-from-bullet-options.patch similarity index 98% rename from patches/server/0218-Shulker-spawn-from-bullet-options.patch rename to patches/server/0219-Shulker-spawn-from-bullet-options.patch index 8698410d4a..ce5c2d89c7 100644 --- a/patches/server/0218-Shulker-spawn-from-bullet-options.patch +++ b/patches/server/0219-Shulker-spawn-from-bullet-options.patch @@ -61,7 +61,7 @@ index f812a75985d26785639491c9a980387a3f261f2d..b11fb39b69f5225ca7da72ca1a2200c7 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9c766351673b66f02db3b88ef7b1651e63779307..7d5668def342d87a645b95493a15d8b70981e4ed 100644 +index de47ddf70c993a1f8600062005eab6dd44475b56..fee63c51d52da28ca6c72216a95c874e8e55e52d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1697,6 +1697,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0219-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0220-Eating-glow-berries-adds-glow-effect.patch similarity index 100% rename from patches/server/0219-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0220-Eating-glow-berries-adds-glow-effect.patch diff --git a/patches/server/0220-Option-to-make-drowned-break-doors.patch b/patches/server/0221-Option-to-make-drowned-break-doors.patch similarity index 100% rename from patches/server/0220-Option-to-make-drowned-break-doors.patch rename to patches/server/0221-Option-to-make-drowned-break-doors.patch