diff --git a/gradle.properties b/gradle.properties index 619ccb667..de6b383ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19.2-R0.1-SNAPSHOT -paperCommit = 25cd3eee99a96b360ab947fb78459045f29b2b78 +paperCommit = aaf5e3997f5bba868834e990ebac7120ab31d0b8 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0005-Purpur-client-support.patch b/patches/server/0005-Purpur-client-support.patch index 27b1f38e6..191f6fb67 100644 --- a/patches/server/0005-Purpur-client-support.patch +++ b/patches/server/0005-Purpur-client-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 961d25bbf868438bf5e5257bad745c8208a01171..90845d1d930c43f9363c75629517322726a264a8 100644 +index 5819e8e5e3c6f87eb123cf16091ea74357d53b3b..a56e79c852eaec4fbd7e428076323b01fda3463b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -261,6 +261,7 @@ public class ServerPlayer extends Player { @@ -43,10 +43,10 @@ index 4e615e5d5b8d79f6eaac2136be03961415fd093e..42978e1ea82b4d6a740150893518c4f6 try { byte[] data = new byte[packet.data.readableBytes()]; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b1136b9c39b16cbb9dfe460f88000f74ccd4f571..622ec4316df5bae2466f28173c121634f73767d1 100644 +index 66830ccee464083879f79db4111e08fecee417ec..4708e516b0a4946b6e02ac4b3ba1c48ba3f8cd11 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2944,4 +2944,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2948,4 +2948,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.spigot; } // Spigot end diff --git a/patches/server/0008-Ridables.patch b/patches/server/0008-Ridables.patch index c4ade892e..55433db79 100644 --- a/patches/server/0008-Ridables.patch +++ b/patches/server/0008-Ridables.patch @@ -22,7 +22,7 @@ index 153451ecd5b3c8e8ecb2d5ec91ccd582d4300899..56536c39bccfe097f8227c74a0d16799 super(x, y, z); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 957587f5c3f9c26794c80146b4deb282af3469e8..7f0551e70c545f8e77d18b11e836233faeba9161 100644 +index 0eb4a5b18dcaccd37c2b2c71dbc000aeba559a1a..19b9b7deac4d8f125008526cc115375cceced369 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1517,6 +1517,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0e7dd081befe76e8c589f58e44f1aed76be312e6..a774e9a2ee85a8356fd9d39a8fbe98ff893f8f1f 100644 +index 46f7aa594ff43063d9e7066d5015611ba0fa90ea..3de05d160490ed373ee15f8724e9b1a46500f301 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -46,7 +46,7 @@ index 0e7dd081befe76e8c589f58e44f1aed76be312e6..a774e9a2ee85a8356fd9d39a8fbe98ff final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date()); io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index bcf056513eae366e47f6db3738a109eed97b320d..ba86728b28b4c1b6fdca7e8734e5967c3873416d 100644 +index 9091241c21715e2bbe43a11ba637ec7759e7a43a..c347e5df53355b88bf3f69c0d4e95b48678e95dc 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -674,6 +674,15 @@ public class ServerPlayer extends Player { @@ -79,7 +79,7 @@ index 42978e1ea82b4d6a740150893518c4f6bd1562eb..f8c0df22fec9ec08d7346c3d872fa53f if ((entity instanceof Bucketable && entity instanceof LivingEntity && 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 ClientboundAddEntityPacket(entity)); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 4f1ed7708311d8a8d63706592e9feed8de2a4aa2..7816aae4b7e1745f138cdcc12575eba32de2f562 100644 +index 42ae9216debeee149a2074d08d2c96d7c44901a0..2c62bfb41363f1f84c2aa922dde9e56153f1151c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -361,7 +361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -1373,7 +1373,7 @@ index 6a459435493295ee5bb44fe2ba79cba6acea2e35..041c2d330a245826fc2fa4c1327aeadd this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, false, false, Turtle.BABY_ON_LAND_SELECTOR)); } diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java -index 1494a3d5256f663b17617356d57d2e09aeec6189..46b3f0d26ef95eee43c68fb2829cc99a622d5852 100644 +index 87c9f1cba8eac70d54576d6ffb6f85fc5dcb8e8a..8f1b1fbfa76b8003126da7b5a8b5ce1a9cf647df 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java @@ -107,6 +107,32 @@ public class Panda extends Animal { @@ -1443,7 +1443,7 @@ index 1494a3d5256f663b17617356d57d2e09aeec6189..46b3f0d26ef95eee43c68fb2829cc99a } this.tryToSit(); -@@ -658,7 +686,7 @@ public class Panda extends Animal { +@@ -660,7 +688,7 @@ public class Panda extends Animal { return InteractionResult.SUCCESS; } else { @@ -1452,7 +1452,7 @@ index 1494a3d5256f663b17617356d57d2e09aeec6189..46b3f0d26ef95eee43c68fb2829cc99a } } -@@ -698,7 +726,7 @@ public class Panda extends Animal { +@@ -700,7 +728,7 @@ public class Panda extends Animal { return !this.isOnBack() && !this.isScared() && !this.isEating() && !this.isRolling() && !this.isSitting(); } @@ -1461,7 +1461,7 @@ index 1494a3d5256f663b17617356d57d2e09aeec6189..46b3f0d26ef95eee43c68fb2829cc99a private final Panda panda; -@@ -708,9 +736,9 @@ public class Panda extends Animal { +@@ -710,9 +738,9 @@ public class Panda extends Animal { } @Override @@ -2067,7 +2067,7 @@ index 559a4995d3530c0d402ab6306f9ac4c46b934c2b..cac2845978b9beebb4e1ed6fed3eb33a return "entity.minecraft.tropical_fish.predefined." + variant; } diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java -index 5575730aa6f77a91467c394fa8465c335d73db8e..b185a58c0adb9a0dde014dd7fdeb3bd465feb706 100644 +index 4764b975386f1c5629a59f762f7ba1c1ae2598c5..ec095421e4928489a4bebfbb212f1795b57341fc 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java @@ -82,6 +82,23 @@ public class Turtle extends Animal { @@ -4183,7 +4183,7 @@ index 524eed4042c7a83eb8b4a0769a66330dd141261d..7db7e4ae2ad164dd622ab9b803a5e395 public ShulkerLookControl(Mob entity) { super(entity); diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java -index 2dcda3b03796655da443e1b3dd68c6f6bca20d21..5f1f9ecb06555f15a464efa27f06a5dbdd255c1e 100644 +index 37d3b670a93c26b87ffc5c93ad7828f45b4b0217..07b134957b0d53841f2d4462f91fcf20fb9006fd 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java @@ -42,14 +42,33 @@ public class Silverfish extends Monster { diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0012-AFK-API.patch index c0ba21fe4..46e53d193 100644 --- a/patches/server/0012-AFK-API.patch +++ b/patches/server/0012-AFK-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 12e0308373684093736bd558606e5a46e159ca20..aa509809e88f85e28698bb22aed77169cbedfcf4 100644 +index c347e5df53355b88bf3f69c0d4e95b48678e95dc..9003c702af7763b7fcfea27b2caab1df16d4edc5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2006,8 +2006,58 @@ public class ServerPlayer extends Player { +@@ -2020,8 +2020,58 @@ public class ServerPlayer extends Player { public void resetLastActionTime() { this.lastActionTime = Util.getMillis(); @@ -68,7 +68,7 @@ index 12e0308373684093736bd558606e5a46e159ca20..aa509809e88f85e28698bb22aed77169 return this.stats; } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 37f7e6d4ab2c5a043b122b34a4a0e57465826740..821ceb1b14bd0cadab306e9ac3d9abdc9d345cf6 100644 +index f8c0df22fec9ec08d7346c3d872fa53ff0fa31eb..0d2b7ee97faf4751580eebbf3badbbfe2d0865d0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -342,6 +342,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -213,7 +213,7 @@ index 3f458ddd4dc04ed28510a212be76bb19e7f6a61e..a36469186f72eccf8c4428d920d0583b if (range < 0.0D || d < range * range) { return true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 622ec4316df5bae2466f28173c121634f73767d1..9a8c4da2151cf7bfeef545d754274bb92152e185 100644 +index 4708e516b0a4946b6e02ac4b3ba1c48ba3f8cd11..ce1111150c2e82ba5daa8783e18078e1a70988c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -522,10 +522,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -233,7 +233,7 @@ index 622ec4316df5bae2466f28173c121634f73767d1..9a8c4da2151cf7bfeef545d754274bb9 for (ServerPlayer player : (List) server.getHandle().players) { if (player.getBukkitEntity().canSee(this)) { player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle())); -@@ -2950,5 +2955,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2954,5 +2959,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public boolean usesPurpurClient() { return getHandle().purpurClient; } diff --git a/patches/server/0019-Player-invulnerabilities.patch b/patches/server/0019-Player-invulnerabilities.patch index eb4d05161..e07ae53c7 100644 --- a/patches/server/0019-Player-invulnerabilities.patch +++ b/patches/server/0019-Player-invulnerabilities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index aa509809e88f85e28698bb22aed77169cbedfcf4..671ef13c7abdd77ad49fc490c2117a224b701311 100644 +index 9003c702af7763b7fcfea27b2caab1df16d4edc5..6917b4352cacb9890273c9bf1ea5b8ccc7f069af 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -262,6 +262,7 @@ public class ServerPlayer extends Player { @@ -54,7 +54,7 @@ index aa509809e88f85e28698bb22aed77169cbedfcf4..671ef13c7abdd77ad49fc490c2117a22 return this; } } -@@ -1992,6 +2001,7 @@ public class ServerPlayer extends Player { +@@ -2006,6 +2015,7 @@ public class ServerPlayer extends Player { } public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) { @@ -62,7 +62,7 @@ index aa509809e88f85e28698bb22aed77169cbedfcf4..671ef13c7abdd77ad49fc490c2117a22 this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt)); } -@@ -2517,9 +2527,17 @@ public class ServerPlayer extends Player { +@@ -2531,9 +2541,17 @@ public class ServerPlayer extends Player { @Override public boolean isImmobile() { @@ -82,7 +82,7 @@ index aa509809e88f85e28698bb22aed77169cbedfcf4..671ef13c7abdd77ad49fc490c2117a22 public Scoreboard getScoreboard() { return this.getBukkitEntity().getScoreboard().getHandle(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 821ceb1b14bd0cadab306e9ac3d9abdc9d345cf6..49cce5ae2c7e9cbb11f85ed866951ab182367721 100644 +index 0d2b7ee97faf4751580eebbf3badbbfe2d0865d0..9330f5c0c6e1ff852d1446a551baee95fb41226d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2101,12 +2101,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -108,7 +108,7 @@ index 821ceb1b14bd0cadab306e9ac3d9abdc9d345cf6..49cce5ae2c7e9cbb11f85ed866951ab1 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 2da8186b5f34b5cce97512f50323bee091d380ab..e09cfac18f2b952bb54ec75b0450502433370819 100644 +index 36a2d51e29bd2d86632516abda56a2466c18e8f8..6fe35f10be757d043a289f85969e64fc03ec38d6 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1014,6 +1014,8 @@ public abstract class PlayerList { @@ -121,10 +121,10 @@ index 2da8186b5f34b5cce97512f50323bee091d380ab..e09cfac18f2b952bb54ec75b04505024 return entityplayer1; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9a8c4da2151cf7bfeef545d754274bb92152e185..7e81d442b3e304734ad9bc54065bea770885d705 100644 +index ce1111150c2e82ba5daa8783e18078e1a70988c7..78e36e1ac3e79ff4f01a3f5b3183956c9223f7e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2970,5 +2970,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2974,5 +2974,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void resetIdleTimer() { getHandle().resetLastActionTime(); } diff --git a/patches/server/0039-Cows-eat-mushrooms.patch b/patches/server/0038-Cows-eat-mushrooms.patch similarity index 98% rename from patches/server/0039-Cows-eat-mushrooms.patch rename to patches/server/0038-Cows-eat-mushrooms.patch index fa19588e8..8be59c91e 100644 --- a/patches/server/0039-Cows-eat-mushrooms.patch +++ b/patches/server/0038-Cows-eat-mushrooms.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cows eat mushrooms diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java -index dd4d5e2e7cbfed18cf3b4664dbe08eaf9d95f61e..732c560383da3b8a270139758f29734d73b775be 100644 +index b6af466d454ca7d4c0277d2d1db0e23b50677418..123aae4d17bc06317c872270e229f6e9c13953e1 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java @@ -1,6 +1,7 @@ diff --git a/patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch deleted file mode 100644 index aadeec5f0..000000000 --- a/patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Thu, 2 Jan 2020 01:23:22 -0600 -Subject: [PATCH] MC-147659 - Fix non black cats spawning in swamp huts - - -diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java -index f7e3ee98b006a53c3c6bf87fc90e5ef43e87bb74..fb29d7fd1f44235023bd5d734e784f498c8de9ff 100644 ---- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java -+++ b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java -@@ -94,8 +94,9 @@ public class CatSpawner implements CustomSpawner { - if (cat == null) { - return 0; - } else { -+ cat.moveTo(pos, 0.0F, 0.0F); // Purpur - cat.finalizeSpawn(world, world.getCurrentDifficultyAt(pos), MobSpawnType.NATURAL, (SpawnGroupData)null, (CompoundTag)null); -- cat.moveTo(pos, 0.0F, 0.0F); -+ // cat.moveTo(pos, 0.0F, 0.0F); // Purpur - move up - fixes non black cat types spawning inside swamp huts - world.addFreshEntityWithPassengers(cat); - return 1; - } diff --git a/patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0039-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 92% rename from patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0039-Fix-cow-rotation-when-shearing-mooshroom.patch index 0f75b6750..d7e2ca2ca 100644 --- a/patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch +++ b/patches/server/0039-Fix-cow-rotation-when-shearing-mooshroom.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java -index 380fe61157048da5df1781a0622af290f8adbf82..1bf3f1cf537c75aa32d1531ee77a4d08ad4b69bf 100644 +index 763a254d820cff3c776570248b9e905c052dd447..bdfca8501edb9209463b70db2d134b488a08e143 100644 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java @@ -202,7 +202,13 @@ public class MushroomCow extends Cow implements Shearable { diff --git a/patches/server/0041-Pigs-give-saddle-back.patch b/patches/server/0040-Pigs-give-saddle-back.patch similarity index 100% rename from patches/server/0041-Pigs-give-saddle-back.patch rename to patches/server/0040-Pigs-give-saddle-back.patch diff --git a/patches/server/0042-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0041-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/0041-Snowman-drop-and-put-back-pumpkin.patch diff --git a/patches/server/0043-Ender-dragon-always-drop-full-exp.patch b/patches/server/0042-Ender-dragon-always-drop-full-exp.patch similarity index 95% rename from patches/server/0043-Ender-dragon-always-drop-full-exp.patch rename to patches/server/0042-Ender-dragon-always-drop-full-exp.patch index 6feff3cdc..00339f3dd 100644 --- a/patches/server/0043-Ender-dragon-always-drop-full-exp.patch +++ b/patches/server/0042-Ender-dragon-always-drop-full-exp.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ender dragon always drop full exp diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java -index 1e3afa3d98e755b7a06dc6b90f90e2d41843a482..a2d7d2e1ea6596d0a3188169cf8d7295e888c20f 100644 +index 10294ba0f6fac4d0afebe22496d4020b975f1469..84b783862630a001db4a19fd2eceee4db5c51756 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java @@ -713,7 +713,7 @@ public class EnderDragon extends Mob implements Enemy { diff --git a/patches/server/0044-Signs-editable-on-right-click.patch b/patches/server/0043-Signs-editable-on-right-click.patch similarity index 100% rename from patches/server/0044-Signs-editable-on-right-click.patch rename to patches/server/0043-Signs-editable-on-right-click.patch diff --git a/patches/server/0045-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0044-Allow-soil-to-moisten-from-water-directly-under-it.patch similarity index 100% rename from patches/server/0045-Allow-soil-to-moisten-from-water-directly-under-it.patch rename to patches/server/0044-Allow-soil-to-moisten-from-water-directly-under-it.patch diff --git a/patches/server/0046-Minecart-settings-and-WASD-controls.patch b/patches/server/0045-Minecart-settings-and-WASD-controls.patch similarity index 99% rename from patches/server/0046-Minecart-settings-and-WASD-controls.patch rename to patches/server/0045-Minecart-settings-and-WASD-controls.patch index 9573a880c..2a7d62e09 100644 --- a/patches/server/0046-Minecart-settings-and-WASD-controls.patch +++ b/patches/server/0045-Minecart-settings-and-WASD-controls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Minecart settings and WASD controls diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a907475add800f1f47e647b169d6b709acefc785..4ff8022c0787575b215f03b142c908a8076618eb 100644 +index 6917b4352cacb9890273c9bf1ea5b8ccc7f069af..adb0f93122be4eb944824d90ed06553a246d7cb5 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1035,6 +1035,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0047-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch similarity index 100% rename from patches/server/0047-Disable-loot-drops-on-death-by-cramming.patch rename to patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch diff --git a/patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0047-Option-to-toggle-milk-curing-bad-omen.patch similarity index 100% rename from patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch rename to patches/server/0047-Option-to-toggle-milk-curing-bad-omen.patch diff --git a/patches/server/0049-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0048-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 91% rename from patches/server/0049-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0048-End-gateway-should-check-if-entity-can-use-portal.patch index 5afaab5e2..54aff5fc6 100644 --- a/patches/server/0049-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0048-End-gateway-should-check-if-entity-can-use-portal.patch @@ -5,7 +5,7 @@ Subject: [PATCH] End gateway should check if entity can use portal diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java -index 56d68b87287f0bb2c79ce0bed02fa333b85c4287..5c7e30eb5e8a2a1ab18750a2cd2ec7364e8c52e0 100644 +index 89bf5fc4fab2cf39378600aa8925ac4bb7707428..fb77d022ea872deb7f47d033df4a0f201da026c2 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java @@ -177,6 +177,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity { diff --git a/patches/server/0050-Skip-events-if-there-s-no-listeners.patch b/patches/server/0049-Skip-events-if-there-s-no-listeners.patch similarity index 100% rename from patches/server/0050-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0049-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0051-Add-permission-for-F3-N-debug.patch b/patches/server/0050-Add-permission-for-F3-N-debug.patch similarity index 89% rename from patches/server/0051-Add-permission-for-F3-N-debug.patch rename to patches/server/0050-Add-permission-for-F3-N-debug.patch index a8f75ab3a..25231a144 100644 --- a/patches/server/0051-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0050-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 dae6334ad480bc6323fa47421a22598e58e56684..69721d4facc90ae64d6a4e2f080bd80f4862874d 100644 +index 6fe35f10be757d043a289f85969e64fc03ec38d6..4dbc1744cb07899e6795d74d24c00bb72c7b0911 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1193,6 +1193,7 @@ public abstract class PlayerList { diff --git a/patches/server/0052-Configurable-TPS-Catchup.patch b/patches/server/0051-Configurable-TPS-Catchup.patch similarity index 95% rename from patches/server/0052-Configurable-TPS-Catchup.patch rename to patches/server/0051-Configurable-TPS-Catchup.patch index 35cd98f7d..9ffe53a6f 100644 --- a/patches/server/0052-Configurable-TPS-Catchup.patch +++ b/patches/server/0051-Configurable-TPS-Catchup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c1719af753e4efa8fcbd49a801ee86b307d27779..963a1998f808061c7e7fcd0d15725e38fe606ce7 100644 +index a02c6b61c93e79e5cdb5ee4679ae1a782c96e5a9..08d09784f168e39444f26aa068b160743c7fe872 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1177,7 +1177,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop implements EntityTypeTest { diff --git a/patches/server/0091-Stop-squids-floating-on-top-of-water.patch b/patches/server/0090-Stop-squids-floating-on-top-of-water.patch similarity index 97% rename from patches/server/0091-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0090-Stop-squids-floating-on-top-of-water.patch index b0653a3f3..c74261540 100644 --- a/patches/server/0091-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0090-Stop-squids-floating-on-top-of-water.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 7f1939cd6cd4e64c3085e6b24e1fe3d3719589f5..0a263c0d15611bcba46fec13a2ce2d32ee260d79 100644 +index 906d9482743dd718b34182fbc9263b365ad12609..de99843cf28a715e63696754d6bcf37ea8d38d84 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4075,6 +4075,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0092-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0091-Crying-obsidian-valid-for-portal-frames.patch similarity index 100% rename from patches/server/0092-Crying-obsidian-valid-for-portal-frames.patch rename to patches/server/0091-Crying-obsidian-valid-for-portal-frames.patch diff --git a/patches/server/0093-Entities-can-use-portals-configuration.patch b/patches/server/0092-Entities-can-use-portals-configuration.patch similarity index 96% rename from patches/server/0093-Entities-can-use-portals-configuration.patch rename to patches/server/0092-Entities-can-use-portals-configuration.patch index ae9868a87..971afe736 100644 --- a/patches/server/0093-Entities-can-use-portals-configuration.patch +++ b/patches/server/0092-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 0a263c0d15611bcba46fec13a2ce2d32ee260d79..8e5087ca2df8ca26f3cbfeacdb33d846628ca658 100644 +index de99843cf28a715e63696754d6bcf37ea8d38d84..fd3aee8e2d69487415a3a0c5725109fc29cc007c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2892,7 +2892,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0094-LivingEntity-broadcastItemBreak.patch b/patches/server/0093-LivingEntity-broadcastItemBreak.patch similarity index 91% rename from patches/server/0094-LivingEntity-broadcastItemBreak.patch rename to patches/server/0093-LivingEntity-broadcastItemBreak.patch index 967364356..c07547ac8 100644 --- a/patches/server/0094-LivingEntity-broadcastItemBreak.patch +++ b/patches/server/0093-LivingEntity-broadcastItemBreak.patch @@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 6ea7afee8df8ba80cd6a1fec64eecac4a2f98613..c5c718c30418f682826f83d6a254e926684d660d 100644 +index f4888fb501871afb2d9edff7cf1a36cb0c56ac6e..aec6f37ceac8ba9a987edf3eb24bbc06d3b1613a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -995,5 +995,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0095-Customizable-wither-health-and-healing.patch b/patches/server/0094-Customizable-wither-health-and-healing.patch similarity index 96% rename from patches/server/0095-Customizable-wither-health-and-healing.patch rename to patches/server/0094-Customizable-wither-health-and-healing.patch index 7284d2e1e..c2f6db5f9 100644 --- a/patches/server/0095-Customizable-wither-health-and-healing.patch +++ b/patches/server/0094-Customizable-wither-health-and-healing.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Customizable wither health and healing Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often. diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 80674ee4882d2d1c67f78c6bc627e34a78d0c4b0..9cf7cd70492c8769cd3dad1ed57eeff1150bc4e8 100644 +index 46593c26a7a167f22a728c8a87ebcb26ef7b4612..abf4490d8366ec6587178688228375093563b9b5 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -530,8 +530,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob diff --git a/patches/server/0096-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0095-Allow-toggling-special-MobSpawners-per-world.patch similarity index 98% rename from patches/server/0096-Allow-toggling-special-MobSpawners-per-world.patch rename to patches/server/0095-Allow-toggling-special-MobSpawners-per-world.patch index d47dfb58f..5a8e96d6f 100644 --- a/patches/server/0096-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0095-Allow-toggling-special-MobSpawners-per-world.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 558cd427e0b08a6b59b9851242386e89ca87b996..540c45189331a4af97c9dfe86524583a9e64d53c 100644 +index 0fb639ed10714a5bb83fa1f9901e50f45c69b6a2..444a8207fe3610f4cd5f975c5983efab43ccbfea 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -542,7 +542,24 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0097-Raid-cooldown-setting.patch b/patches/server/0096-Raid-cooldown-setting.patch similarity index 94% rename from patches/server/0097-Raid-cooldown-setting.patch rename to patches/server/0096-Raid-cooldown-setting.patch index 0685b1a6c..031a02aac 100644 --- a/patches/server/0097-Raid-cooldown-setting.patch +++ b/patches/server/0096-Raid-cooldown-setting.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Raid cooldown setting diff --git a/src/main/java/net/minecraft/world/entity/raid/Raids.java b/src/main/java/net/minecraft/world/entity/raid/Raids.java -index fa8fcdfea51a35e4a482d3d7b18159099da62706..6e2373a06ea4c048e5a6eebff19f924c3b106019 100644 +index feb89eb69994bdd1d2f95d2b9992e69251b2bee7..0670775c2de33e69c75644e5d2ff19db08444040 100644 --- a/src/main/java/net/minecraft/world/entity/raid/Raids.java +++ b/src/main/java/net/minecraft/world/entity/raid/Raids.java @@ -28,6 +28,7 @@ import net.minecraft.world.phys.Vec3; @@ -49,7 +49,7 @@ index fa8fcdfea51a35e4a482d3d7b18159099da62706..6e2373a06ea4c048e5a6eebff19f924c if (!this.raidMap.containsKey(raid.getId())) { this.raidMap.put(raid.getId(), raid); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 23899c81d555a78ef153fdf4dde2889d0fe2646b..d26316f75f634d539a4d0b66889c7c8af6205fec 100644 +index 04604557a57a09127e88a2119aa9a63c764de94a..3c8cb7c2e43a98e6bd1d65c119ae2e28d22e85d4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -112,6 +112,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0098-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0097-Despawn-rate-config-options-per-projectile-type.patch similarity index 97% rename from patches/server/0098-Despawn-rate-config-options-per-projectile-type.patch rename to patches/server/0097-Despawn-rate-config-options-per-projectile-type.patch index ef4e2503b..899a851af 100644 --- a/patches/server/0098-Despawn-rate-config-options-per-projectile-type.patch +++ b/patches/server/0097-Despawn-rate-config-options-per-projectile-type.patch @@ -34,7 +34,7 @@ index 5426e57ed67b0d144818a7e3b917c90d45f548ce..44ee788422cdf946be5f156e2a4662b0 private static boolean getBoolean(String key, boolean defaultValue, String... comment) { return getBoolean(key, null, defaultValue, comment); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d26316f75f634d539a4d0b66889c7c8af6205fec..69d31556151df6fc6e2c0a57bc8345b0433b56be 100644 +index 3c8cb7c2e43a98e6bd1d65c119ae2e28d22e85d4..6f4f71c9a27fa1c0ab354b9b410fba744787a51a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -293,6 +293,39 @@ public class PurpurWorldConfig { diff --git a/patches/server/0099-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0098-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 100% rename from patches/server/0099-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/server/0098-Add-option-to-disable-zombie-aggressiveness-towards-.patch diff --git a/patches/server/0100-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0099-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/server/0100-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/server/0099-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/server/0101-Flying-squids-Oh-my.patch b/patches/server/0100-Flying-squids-Oh-my.patch similarity index 100% rename from patches/server/0101-Flying-squids-Oh-my.patch rename to patches/server/0100-Flying-squids-Oh-my.patch diff --git a/patches/server/0102-Infinity-bow-settings.patch b/patches/server/0101-Infinity-bow-settings.patch similarity index 97% rename from patches/server/0102-Infinity-bow-settings.patch rename to patches/server/0101-Infinity-bow-settings.patch index fcd86bc11..6d517f19d 100644 --- a/patches/server/0102-Infinity-bow-settings.patch +++ b/patches/server/0101-Infinity-bow-settings.patch @@ -27,7 +27,7 @@ index 08d597db1a5345a343777a01427655e6bf2c926b..33df0ca406dc8321b76b393f317bbd1c } else { user.startUsingItem(hand); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8905ba0297d1e5294faeafbd425bd35c202ee025..f6f67bc6c6cc81c4d867ab6aaa23e263ef14ecf6 100644 +index 7b2a16c2d474b3931ff629ba58f6987f69fadfec..9a160cfffeb3049f256f56e9df8aab42ebe9ec2f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -143,6 +143,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0103-Configurable-daylight-cycle.patch b/patches/server/0102-Configurable-daylight-cycle.patch similarity index 96% rename from patches/server/0103-Configurable-daylight-cycle.patch rename to patches/server/0102-Configurable-daylight-cycle.patch index ed9afc928..990c4561a 100644 --- a/patches/server/0103-Configurable-daylight-cycle.patch +++ b/patches/server/0102-Configurable-daylight-cycle.patch @@ -18,7 +18,7 @@ index 689ad22925b2561f7c8db961743eb1f821dbb25f..fa3c960992cc240161817e54659d83fe public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) { this.gameTime = time % 192000; // Paper - fix guardian beam diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bc8152edd32238025321512cb72bbb62dd2175bc..68db8421f5e80301423c2f1d4394ef1f9cca38be 100644 +index 2e17a2c1b536715dd5a38e90615315b8670b1d8b..9b3717176ecb40f4c76a5191956f7d378f3f1478 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1511,7 +1511,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop packet) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7f123c203bc53582d71862c4630d63ba06779a8d..5d80cdc482a630bd7951ee8010b0be5d86a74d2f 100644 +index 78e36e1ac3e79ff4f01a3f5b3183956c9223f7e2..c82e2ce3f94f658a0cf66445a4507fc696760820 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1888,7 +1888,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1892,7 +1892,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public boolean canSee(org.bukkit.entity.Entity entity) { diff --git a/patches/server/0121-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0120-Configurable-chance-for-wolves-to-spawn-rabid.patch similarity index 100% rename from patches/server/0121-Configurable-chance-for-wolves-to-spawn-rabid.patch rename to patches/server/0120-Configurable-chance-for-wolves-to-spawn-rabid.patch diff --git a/patches/server/0122-Configurable-default-collar-color.patch b/patches/server/0121-Configurable-default-collar-color.patch similarity index 100% rename from patches/server/0122-Configurable-default-collar-color.patch rename to patches/server/0121-Configurable-default-collar-color.patch diff --git a/patches/server/0123-Phantom-flames-on-swoop.patch b/patches/server/0122-Phantom-flames-on-swoop.patch similarity index 95% rename from patches/server/0123-Phantom-flames-on-swoop.patch rename to patches/server/0122-Phantom-flames-on-swoop.patch index 6cebe0033..c735d7d2c 100644 --- a/patches/server/0123-Phantom-flames-on-swoop.patch +++ b/patches/server/0122-Phantom-flames-on-swoop.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Phantom flames on swoop diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java -index 77716d29aa50887bfa704ebafe2a304faddcc5c2..9858361d4dd5407b5d24bd5ac656c2ea3ba64dfa 100644 +index 11cbb89eb062de0cd30158dbfbef13554f81cf9f..162f8f6f368266ce238247901277f78cc1c9cfdf 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java @@ -244,6 +244,7 @@ public class Phantom extends FlyingMob implements Enemy { diff --git a/patches/server/0124-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0123-Option-for-chests-to-open-even-with-a-solid-block-on.patch similarity index 100% rename from patches/server/0124-Option-for-chests-to-open-even-with-a-solid-block-on.patch rename to patches/server/0123-Option-for-chests-to-open-even-with-a-solid-block-on.patch diff --git a/patches/server/0125-Implement-TPSBar.patch b/patches/server/0124-Implement-TPSBar.patch similarity index 97% rename from patches/server/0125-Implement-TPSBar.patch rename to patches/server/0124-Implement-TPSBar.patch index 29dde32e1..9bf6f658b 100644 --- a/patches/server/0125-Implement-TPSBar.patch +++ b/patches/server/0124-Implement-TPSBar.patch @@ -17,7 +17,7 @@ index ab0f00128f8c1b13c3eb5787df0c4e26372e0734..14b12cb6967c1c2735cf6a0eafdf6e23 if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 68db8421f5e80301423c2f1d4394ef1f9cca38be..03d0cc6c69164e196d5db2bf56a7136a9e4a5c79 100644 +index 9b3717176ecb40f4c76a5191956f7d378f3f1478..e03ce4bf00505f886e2b07c5b1e77214f7ba789d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1022,6 +1022,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8e5087ca2df8ca26f3cbfeacdb33d846628ca658..9276b51813e1e0ac6cf8cf9a295d92db2f52b11e 100644 +index fd3aee8e2d69487415a3a0c5725109fc29cc007c..92a04741779445bdccb6edafdff7209120507296 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1732,7 +1732,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0135-Fix-stuck-in-portals.patch b/patches/server/0134-Fix-stuck-in-portals.patch similarity index 94% rename from patches/server/0135-Fix-stuck-in-portals.patch rename to patches/server/0134-Fix-stuck-in-portals.patch index 7fcf776ef..cd96a954b 100644 --- a/patches/server/0135-Fix-stuck-in-portals.patch +++ b/patches/server/0134-Fix-stuck-in-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a82c8bf74a943adfd7ccf16b1c8787c31af060e6..83ab6eb805c5d6f2fff9da91e4e0d74f3d999f65 100644 +index 49a828e2c8859352a6a16b1ea43547dbcde1b9ba..52d0e1b5e461eaf5b1eb412e0adfb52e294af2be 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1188,6 +1188,7 @@ public class ServerPlayer extends Player { @@ -17,7 +17,7 @@ index a82c8bf74a943adfd7ccf16b1c8787c31af060e6..83ab6eb805c5d6f2fff9da91e4e0d74f // 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 9276b51813e1e0ac6cf8cf9a295d92db2f52b11e..6a914c3185bac2f3cce6c45d98012ed53fbdab24 100644 +index 92a04741779445bdccb6edafdff7209120507296..e03bc5bd30b8a8960159edc855f7493bb6afd755 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2889,12 +2889,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0136-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0135-Toggle-for-water-sensitive-mob-damage.patch similarity index 98% rename from patches/server/0136-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0135-Toggle-for-water-sensitive-mob-damage.patch index e4ba452c1..876e5b9f5 100644 --- a/patches/server/0136-Toggle-for-water-sensitive-mob-damage.patch +++ b/patches/server/0135-Toggle-for-water-sensitive-mob-damage.patch @@ -21,7 +21,7 @@ index b6df98797757462f35c306aa4c6ea1585a9a6ddc..506632a6b5107f5ef08cd87808b8c4be @Override diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java -index 007c945725721ddb8a3dc4b8085e8c68da741b93..53ef2004d1b6acaf27fef9a658fff99b7d343215 100644 +index 6a702b0dfd5e40d9f7abbbbf55c286492755e07c..16ab6feea4af65bfe9b0c6e6c586a9abf8790c94 100644 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java @@ -102,6 +102,11 @@ public class Bat extends AmbientCreature { @@ -37,7 +37,7 @@ index 007c945725721ddb8a3dc4b8085e8c68da741b93..53ef2004d1b6acaf27fef9a658fff99b @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index f2345d7ce5ba8b4bd3e44819fcf82cd46501e6e3..f012bee87c13d4ab8973127e77ed2eef8ab72d3f 100644 +index 8eef2c50ae38ab7ea0942d338d0918c8edbd42b0..ec13cbb89a794c3d279b33fa197f9f42d0b86b46 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -176,7 +176,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { @@ -110,7 +110,7 @@ index 861727f150f28a508d3b1c7067d410f0d696aa89..5b79d821e8b55c8876eadcbe811a2c05 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java -index b063a74327e51b3cd27427426b92ef687c59c94b..00eec3f51e62858e7b85b3340e76bf66bfd4370f 100644 +index 0da192e78865b50f87de0d61ce1b39b1899cc954..67a121269eccfcdb71d15e67eab567b488276d83 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java @@ -67,6 +67,11 @@ public class Cow extends Animal { @@ -142,7 +142,7 @@ index a8ca2d120a545d423fc00aef5299b66b1636b6d3..b0c933644c1f4b5aa142c7c4d26a9b81 @Nullable diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java -index d64deacacb64dc0572fc0b5d559ddd833397ed47..41690949a990a753a24e6c27595cb0b50a52e0a8 100644 +index 18cc92406057b3c47ba00ddfe7cebeb99f8a106d..7fdaba9bd61cf7f9954aa326517b4d075ae78c84 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java @@ -188,6 +188,11 @@ public class Fox extends Animal { @@ -174,7 +174,7 @@ index 4003e4f4128f14e0dffa666ed8f4447aadd1dede..e3d725e656bc5ffc5fc92133794a8079 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java -index 6cd1a173857b9815073d4bb5020ebe6582844418..86830a554c750114f5ea11cf19bda86d37e69ac2 100644 +index 74fa3278f39b2e55b7ee9b0c3088d02f44e71259..b63569653cdee914f6ecf79f305efc6a2ca9fc89 100644 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java @@ -89,6 +89,11 @@ public class MushroomCow extends Cow implements Shearable { @@ -206,7 +206,7 @@ index 25f01fe6bda429a13188e62aee68d242c9d5404b..7ddf1dbef2df9982bb0975918d336ef1 public boolean isTrusting() { diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java -index 260fb72d48e2e2c6d27ab21b8a5049235d51555c..72a510efeb885cd15f1d573aa94e14ecf51b66b3 100644 +index fcd6da91ba73fc2c6c2ad75ca17095dee02a98d7..35588589a62409a5edc5ea2416bfe8d9fce64a79 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java @@ -142,6 +142,11 @@ public class Panda extends Animal { @@ -379,7 +379,7 @@ index e439f0e24851697e663f783edf643d5b1602a0ff..77237646232cf3b7975c7a0c1d2b83d6 public static String getPredefinedName(int variant) { diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java -index 539777cb24e7427542ac43665585d3acea9f888c..67b92fd831cb87bf8a7c5b96f17c0d3557bf9c62 100644 +index e3c20db7bd003bb63d5b1b296c7aa9d7302548c8..d5a029db2831ea817071830ba30d0f50fd001f8d 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java @@ -107,6 +107,11 @@ public class Turtle extends Animal { @@ -427,7 +427,7 @@ index e68a40ec759925317a0db2087339cd29351dbeb4..858a5beea8b038822789e6daec956163 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java -index af6bc24065f0db7b12962b5b718b5fb82cf5fa22..c95126870665d3c456940a9d1d9f54d30d8d6cd4 100644 +index 9b7fce44c097b26b995aa2a0bc93915e77be8b96..02cd6e478e7e03a72affffe6e5904cd495d72257 100644 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java @@ -114,6 +114,11 @@ public class Goat extends Animal { @@ -475,7 +475,7 @@ index 6a7d8ff804b184005fda17f3d7a4b9750a7c2fe5..704e08b1ad0601e9b7f3b355214a8208 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java -index 91ec5c71c90496f79c80e42cfdd86e4eb5befddf..a83bc1451fe7895bba46aae2da2bc8cb29c7da04 100644 +index 7f47cc2caa22f31eb956ec4b7da69a62fa4e5899..43fa12c5e53cc4d1bb9a8c8603f389bc24177e53 100644 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java @@ -136,6 +136,11 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob { @@ -555,7 +555,7 @@ index a2636f6e4767d408ef9d2cda4c346abdaa88da37..6d1938f1cbad394f218b36ec8958d5e7 public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java -index 7cc0d8c9dbfe24de4fa2937db9fe6ef8e78bbef7..0363ba7cd8aa6c2f585355d2c8a86263277d6cfd 100644 +index 5b60abfb44640149e92ead0cda8c426484574fe2..89b2c4b2e7eb0479623b0aabbfa2f897a8a84b69 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java @@ -165,6 +165,11 @@ public class EnderDragon extends Mob implements Enemy { @@ -571,7 +571,7 @@ index 7cc0d8c9dbfe24de4fa2937db9fe6ef8e78bbef7..0363ba7cd8aa6c2f585355d2c8a86263 public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index ab3c741aa0894a9383833b3aa4a8d45ad46dd013..d5fc11b01fcd064562173fb35856686f6977144e 100644 +index 8278cb7b57a1910c822fa85cebec033b95725c03..9a4481b48edf666ede780a9d6f875d01f5b422f8 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -234,6 +234,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob @@ -695,7 +695,7 @@ index 9ed04c56e840992a084f77bd667027ef0f6bb184..3d554d0c6f371a10fa939f87893d7dd7 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java -index 1058897ab91e13884b480ad0e5028fb2a205fe05..df1d1085419b41920542260a75262b1a6ab3eb41 100644 +index 400045d30353899edc89907deab14943bc5c37eb..9b14ad63c2f2fea0e6c0e69a5632621c98b7a28f 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java @@ -57,6 +57,11 @@ public class Endermite extends Monster { @@ -823,7 +823,7 @@ index 69375fdb63b9edde3d161bac7a1946a36306f0c5..5311b26e56eac2a854e615a3e694eadd public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java -index 9858361d4dd5407b5d24bd5ac656c2ea3ba64dfa..93ce4f81ca03c003596f86810d4a869502c76242 100644 +index 162f8f6f368266ce238247901277f78cc1c9cfdf..6b7baf977972b624c5745820d5c3a4375c6854b0 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java @@ -151,6 +151,11 @@ public class Phantom extends FlyingMob implements Enemy { @@ -855,7 +855,7 @@ index 13c0c270dc56f0e3d6e60714a3b9abeb6413c74f..d2dc2b73692ddf28272b1196a6ed718f @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java -index 570b3cbfc66f762999eaec57109ec11c995707b2..ca14d2702f6a4b5c1be2a24a146723232a2d19ef 100644 +index f8867270a5eb705b60236abf3351c050f2e27c60..0e55d94669166ce37e054203d4723720049a940d 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java @@ -95,6 +95,11 @@ public class Ravager extends Raider { @@ -887,7 +887,7 @@ index 9cc44ccd584253cb16a19e7a4747ef39a3ae82f5..2abdeb351fbabec7490c1ce806cebf88 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java -index 45aab92a976ac4c7e1f9b066119f0b4a7188a8f7..6b418728d56f6a3f0dff669a115de49f942a5ce4 100644 +index 0803e461042ea43ea60f3c798f1e1dc871801783..c808bdf93697eaee30c86c6e41c62bc3fbef641b 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java @@ -62,6 +62,11 @@ public class Silverfish extends Monster { @@ -1133,7 +1133,7 @@ index c335a32832c6eef95658fbf632b943bb10ac44b0..68cb79ad43a11195eb2245f6d9081212 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java -index 592a1a95b4cdfd731574299d2096f279f99b59f7..52655c0e78673e8194276af665c13030f92201e2 100644 +index fb387956f1bb1b036558c82996c6880a130a0428..194e59074b72a56b2188a5ecacbc44d13c4a9021 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java @@ -115,6 +115,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento @@ -1181,7 +1181,7 @@ index 73bb73cf0f0a20d0218f4080f547e279613f14bf..373f74742323367c7fa1984313c99c42 @Override diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index 8756e0d8d0077308f5fb74bf45fe093d0f043c99..6dd8856816bebb2766203589048cc68b3f5c8f5c 100644 +index 6cdb81ef8ca385f4346fd875a21c20c8153cb47b..767ec15ee2dcb421946795c58c3c0b2e3fb86fd4 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java @@ -91,6 +91,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill diff --git a/patches/server/0137-Config-to-always-tame-in-Creative.patch b/patches/server/0136-Config-to-always-tame-in-Creative.patch similarity index 98% rename from patches/server/0137-Config-to-always-tame-in-Creative.patch rename to patches/server/0136-Config-to-always-tame-in-Creative.patch index 3615e6ee9..8c9a47537 100644 --- a/patches/server/0137-Config-to-always-tame-in-Creative.patch +++ b/patches/server/0136-Config-to-always-tame-in-Creative.patch @@ -59,7 +59,7 @@ index dd514cbf2f03b688eb4d8cd49052f1775d3adebb..ed33573a96e96d557156fbe2f725e3d6 this.navigation.stop(); this.setTarget((LivingEntity) null); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 74961f18a221031be6e677579fc83ddfb55ef555..702a2caacf1cee7cf057fad12a9a490fc7f84e69 100644 +index 7862f9ff2b5179751949a0efedc03087611a7219..94288b749f183b195ce5bd974ab770bc50d0721b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -120,6 +120,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0138-End-crystal-explosion-options.patch b/patches/server/0137-End-crystal-explosion-options.patch similarity index 100% rename from patches/server/0138-End-crystal-explosion-options.patch rename to patches/server/0137-End-crystal-explosion-options.patch diff --git a/patches/server/0139-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0138-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 95% rename from patches/server/0139-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0138-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch index 6a8828f09..b3604c048 100644 --- a/patches/server/0139-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch +++ b/patches/server/0138-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configs for if Wither/Ender Dragon can ride vehicles diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java -index 0363ba7cd8aa6c2f585355d2c8a86263277d6cfd..c77a9ce015cb219d9ecd68223858dbb775a4ea9b 100644 +index 89b2c4b2e7eb0479623b0aabbfa2f897a8a84b69..804fe378254db9f80c8924ae2b20aba03537013e 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java @@ -1155,6 +1155,7 @@ public class EnderDragon extends Mob implements Enemy { @@ -17,7 +17,7 @@ index 0363ba7cd8aa6c2f585355d2c8a86263277d6cfd..c77a9ce015cb219d9ecd68223858dbb7 } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index d5fc11b01fcd064562173fb35856686f6977144e..0c3fe609a9d4c4c485b1a11e6ec39c06464cda05 100644 +index 9a4481b48edf666ede780a9d6f875d01f5b422f8..98825928e957cadd1c263bfbee09a13733a0b853 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -748,6 +748,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob diff --git a/patches/server/0140-Dont-run-with-scissors.patch b/patches/server/0139-Dont-run-with-scissors.patch similarity index 98% rename from patches/server/0140-Dont-run-with-scissors.patch rename to patches/server/0139-Dont-run-with-scissors.patch index bb4a932d2..c1f8f7341 100644 --- a/patches/server/0140-Dont-run-with-scissors.patch +++ b/patches/server/0139-Dont-run-with-scissors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors! diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 41c21104c04cfb9aad8673c03348c09d3e08fbfd..d245c34f0641b0eb892fd807c2a3e21e39bdb505 100644 +index 8bfabb7cfad23f92156c0e216b75d26cf9120a08..7562e93a75183f09d227ea64b1bbddc59d10ce14 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1697,6 +1697,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0141-One-Punch-Man.patch b/patches/server/0140-One-Punch-Man.patch similarity index 100% rename from patches/server/0141-One-Punch-Man.patch rename to patches/server/0140-One-Punch-Man.patch diff --git a/patches/server/0142-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0141-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 98% rename from patches/server/0142-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0141-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch index a095e1c6c..8016fd140 100644 --- a/patches/server/0142-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch +++ b/patches/server/0141-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch @@ -43,7 +43,7 @@ index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f // Paper end if (user instanceof net.minecraft.server.level.ServerPlayer) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ec9c6cea5cdd4931ff75f8ceee1cd9592f04e9b3..0312fcb2889c2557c1693c52f3813afc4d38415c 100644 +index 76d0134835e2ec6747e41371f1f32f1a2cefabe6..63434a7e92dbc10ec957bd14a040997e56944f6e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -202,6 +202,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0142-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 96% rename from patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0142-Config-to-ignore-nearby-mobs-when-sleeping.patch index 813c3bf79..9cc621c42 100644 --- a/patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0142-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 83ab6eb805c5d6f2fff9da91e4e0d74f3d999f65..68a6d76edb9915c9bb8629cf90f323aed33c722c 100644 +index 52d0e1b5e461eaf5b1eb412e0adfb52e294af2be..5c094787a446b3947e10c126ef91ad43b78ec99f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1345,7 +1345,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0144-Add-back-player-spawned-endermite-API.patch b/patches/server/0143-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/server/0144-Add-back-player-spawned-endermite-API.patch rename to patches/server/0143-Add-back-player-spawned-endermite-API.patch diff --git a/patches/server/0145-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0144-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 100% rename from patches/server/0145-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0144-Config-Enderman-aggressiveness-towards-Endermites.patch diff --git a/patches/server/0146-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0145-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 100% rename from patches/server/0146-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0145-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch diff --git a/patches/server/0147-Tick-fluids-config.patch b/patches/server/0146-Tick-fluids-config.patch similarity index 97% rename from patches/server/0147-Tick-fluids-config.patch rename to patches/server/0146-Tick-fluids-config.patch index 1bd6e6018..d2c6f12a3 100644 --- a/patches/server/0147-Tick-fluids-config.patch +++ b/patches/server/0146-Tick-fluids-config.patch @@ -36,7 +36,7 @@ index 43e8ef1d6a65d4fd3fe53a587639ffb814368217..9c22a730772f71b34c63d1e43d48943f } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7747a92b15ee5282810180ef8dfa4bcae74ec836..a23158f7e766ff15b63f2950aec2f02a81674cee 100644 +index e07f75e38d012d5f266df7ac86f6239674d4281e..e62ebd4a24de2e5b231a4db21d25e4b01b5b0f02 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -132,6 +132,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0148-Config-to-disable-Llama-caravans.patch b/patches/server/0147-Config-to-disable-Llama-caravans.patch similarity index 100% rename from patches/server/0148-Config-to-disable-Llama-caravans.patch rename to patches/server/0147-Config-to-disable-Llama-caravans.patch diff --git a/patches/server/0149-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0148-Config-to-make-Creepers-explode-on-death.patch similarity index 100% rename from patches/server/0149-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0148-Config-to-make-Creepers-explode-on-death.patch diff --git a/patches/server/0150-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0149-Configurable-ravager-griefable-blocks-list.patch similarity index 96% rename from patches/server/0150-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0149-Configurable-ravager-griefable-blocks-list.patch index 11e6ae061..b35fc8fbd 100644 --- a/patches/server/0150-Configurable-ravager-griefable-blocks-list.patch +++ b/patches/server/0149-Configurable-ravager-griefable-blocks-list.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable ravager griefable blocks list diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java -index ca14d2702f6a4b5c1be2a24a146723232a2d19ef..1ca7058e59e42d58c5a670021f74546acf76ca36 100644 +index 0e55d94669166ce37e054203d4723720049a940d..51f6cdf23150402a59b4e5977850d52d07d92342 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java @@ -206,7 +206,7 @@ public class Ravager extends Raider { @@ -18,7 +18,7 @@ index ca14d2702f6a4b5c1be2a24a146723232a2d19ef..1ca7058e59e42d58c5a670021f74546a } } diff --git a/src/main/java/net/minecraft/world/level/block/CropBlock.java b/src/main/java/net/minecraft/world/level/block/CropBlock.java -index a68bf10353e5c19adfa86c2dd6290f2386af9a9d..38bc19edc2dcfa33b3191cfa3b69f00de13a5c4a 100644 +index 36ad7f33eacc63d84db04225fbffcc32abf24fdc..a6e03d12ecd85992215e1128cd6afd280e91b249 100644 --- a/src/main/java/net/minecraft/world/level/block/CropBlock.java +++ b/src/main/java/net/minecraft/world/level/block/CropBlock.java @@ -164,7 +164,7 @@ public class CropBlock extends BushBlock implements BonemealableBlock { diff --git a/patches/server/0151-Sneak-to-bulk-process-composter.patch b/patches/server/0150-Sneak-to-bulk-process-composter.patch similarity index 100% rename from patches/server/0151-Sneak-to-bulk-process-composter.patch rename to patches/server/0150-Sneak-to-bulk-process-composter.patch diff --git a/patches/server/0152-Config-for-skipping-night.patch b/patches/server/0151-Config-for-skipping-night.patch similarity index 96% rename from patches/server/0152-Config-for-skipping-night.patch rename to patches/server/0151-Config-for-skipping-night.patch index ed846cd93..2d47f8aea 100644 --- a/patches/server/0152-Config-for-skipping-night.patch +++ b/patches/server/0151-Config-for-skipping-night.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 95df1d7ff03a5e7c490b48fc14c1518e7f4cc3a0..2e8b8874106bb96f6a3ff9ff50e1c3ef41560615 100644 +index 656ea698078724362cd1a39d29d40ba763b1c12a..c96ce52b97881d48d81f0cbe6c44aa1c1505e43c 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -663,7 +663,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0153-Add-config-for-villager-trading.patch b/patches/server/0152-Add-config-for-villager-trading.patch similarity index 97% rename from patches/server/0153-Add-config-for-villager-trading.patch rename to patches/server/0152-Add-config-for-villager-trading.patch index 8494e96cc..87921d3cf 100644 --- a/patches/server/0153-Add-config-for-villager-trading.patch +++ b/patches/server/0152-Add-config-for-villager-trading.patch @@ -18,7 +18,7 @@ index 373f74742323367c7fa1984313c99c42c253cfa9..89435b0742064d77c7cc8bb871949acc } diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java -index 6dd8856816bebb2766203589048cc68b3f5c8f5c..8d6930868a42b9fc98d7672bff433ec50d36999e 100644 +index 767ec15ee2dcb421946795c58c3c0b2e3fb86fd4..7231230823573c7d00dd82bee480cc787270c383 100644 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java @@ -149,7 +149,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill diff --git a/patches/server/0154-Allow-infinity-on-crossbows.patch b/patches/server/0153-Allow-infinity-on-crossbows.patch similarity index 100% rename from patches/server/0154-Allow-infinity-on-crossbows.patch rename to patches/server/0153-Allow-infinity-on-crossbows.patch diff --git a/patches/server/0155-Drowning-Settings.patch b/patches/server/0154-Drowning-Settings.patch similarity index 100% rename from patches/server/0155-Drowning-Settings.patch rename to patches/server/0154-Drowning-Settings.patch diff --git a/patches/server/0156-Break-individual-slabs-when-sneaking.patch b/patches/server/0155-Break-individual-slabs-when-sneaking.patch similarity index 97% rename from patches/server/0156-Break-individual-slabs-when-sneaking.patch rename to patches/server/0155-Break-individual-slabs-when-sneaking.patch index ccab27443..6e1457790 100644 --- a/patches/server/0156-Break-individual-slabs-when-sneaking.patch +++ b/patches/server/0155-Break-individual-slabs-when-sneaking.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Break individual slabs when sneaking diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 8d3468353358e9f366db671090725d724bdf842f..7dcb7d5de7dc10666a40d03f39f3fb6f713fdcff 100644 +index e832bca50878a34339e142da5a9c765ae57eb3c8..47b43df836651ab94f7a64a9b22dad2357c0e0a6 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -389,6 +389,7 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0157-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0156-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 100% rename from patches/server/0157-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0156-Config-to-disable-hostile-mob-spawn-on-ice.patch diff --git a/patches/server/0158-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0157-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 92% rename from patches/server/0158-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0157-Config-to-show-Armor-Stand-arms-on-spawn.patch index d1c87e694..84ff653dc 100644 --- a/patches/server/0158-Config-to-show-Armor-Stand-arms-on-spawn.patch +++ b/patches/server/0157-Config-to-show-Armor-Stand-arms-on-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config to show Armor Stand arms on spawn diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index 6bd31ed84049bc36a060b5e01b0599bf5f47765c..bdb0efdcac171a92a0e05557db7d099fdb6497f2 100644 +index 6800d77262c244e5bb32535d920b025b279dd8e2..e9e50f353757340aee2196f2150dc7e49575b87c 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -113,6 +113,7 @@ public class ArmorStand extends LivingEntity { @@ -17,7 +17,7 @@ index 6bd31ed84049bc36a060b5e01b0599bf5f47765c..bdb0efdcac171a92a0e05557db7d099f public ArmorStand(Level world, double x, double y, double z) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 6bc5244fd4bf15544db099283613d9e6bb79e702..fb69f0d8797e37f2c934e6a148b2ec6d2eb242b1 100644 +index d866acee76f81954813daf2cc988cccaa83cb791..3427a092ee2ab58dfa9e8cec1d1ec77b85e45486 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -105,6 +105,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0159-Option-to-make-doors-require-redstone.patch b/patches/server/0158-Option-to-make-doors-require-redstone.patch similarity index 100% rename from patches/server/0159-Option-to-make-doors-require-redstone.patch rename to patches/server/0158-Option-to-make-doors-require-redstone.patch diff --git a/patches/server/0160-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0159-Config-to-allow-for-unsafe-enchants.patch similarity index 100% rename from patches/server/0160-Config-to-allow-for-unsafe-enchants.patch rename to patches/server/0159-Config-to-allow-for-unsafe-enchants.patch diff --git a/patches/server/0161-Configurable-sponge-absorption.patch b/patches/server/0160-Configurable-sponge-absorption.patch similarity index 100% rename from patches/server/0161-Configurable-sponge-absorption.patch rename to patches/server/0160-Configurable-sponge-absorption.patch diff --git a/patches/server/0162-Projectile-offset-config.patch b/patches/server/0161-Projectile-offset-config.patch similarity index 99% rename from patches/server/0162-Projectile-offset-config.patch rename to patches/server/0161-Projectile-offset-config.patch index 3695fb894..0697152a0 100644 --- a/patches/server/0162-Projectile-offset-config.patch +++ b/patches/server/0161-Projectile-offset-config.patch @@ -96,7 +96,7 @@ index 5beaafec0759543d3bddf99028c97d0d005be209..086f746cc632a90c67a6c30ea9197c5b entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 151a66be1dccef8891f2655c38e982821afac5be..02914dd4541772bfd7d659169b703725569bff05 100644 +index f5260bea7f54bd9f05099f6a34f582b1f69d3daf..00c1ff2cf7435ccc69df870ace00beeb2cd68bf5 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -425,6 +425,23 @@ public class PurpurWorldConfig { diff --git a/patches/server/0163-Config-for-powered-rail-activation-distance.patch b/patches/server/0162-Config-for-powered-rail-activation-distance.patch similarity index 100% rename from patches/server/0163-Config-for-powered-rail-activation-distance.patch rename to patches/server/0162-Config-for-powered-rail-activation-distance.patch diff --git a/patches/server/0164-Piglin-portal-spawn-modifier.patch b/patches/server/0163-Piglin-portal-spawn-modifier.patch similarity index 100% rename from patches/server/0164-Piglin-portal-spawn-modifier.patch rename to patches/server/0163-Piglin-portal-spawn-modifier.patch diff --git a/patches/server/0165-Config-to-change-max-number-of-bees.patch b/patches/server/0164-Config-to-change-max-number-of-bees.patch similarity index 100% rename from patches/server/0165-Config-to-change-max-number-of-bees.patch rename to patches/server/0164-Config-to-change-max-number-of-bees.patch diff --git a/patches/server/0166-Config-for-wither-explosion-radius.patch b/patches/server/0165-Config-for-wither-explosion-radius.patch similarity index 100% rename from patches/server/0166-Config-for-wither-explosion-radius.patch rename to patches/server/0165-Config-for-wither-explosion-radius.patch diff --git a/patches/server/0167-Gamemode-extra-permissions.patch b/patches/server/0166-Gamemode-extra-permissions.patch similarity index 100% rename from patches/server/0167-Gamemode-extra-permissions.patch rename to patches/server/0166-Gamemode-extra-permissions.patch diff --git a/patches/server/0168-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0167-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch similarity index 96% rename from patches/server/0168-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch rename to patches/server/0167-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch index 4bffbcfad..5651b4a5b 100644 --- a/patches/server/0168-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch +++ b/patches/server/0167-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch @@ -18,7 +18,7 @@ index c7195f2e12bbd6545f7bffcc2b4ba5cc3d48df20..5e730bc9c8ff94b16ac2bf8567dda8ae Runnable afterAction = null; // Paper if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 98f8de1af0985c49a47bb9083d1a21e2efed2598..c4e578bb502afdd46831269088127010dcbe1b33 100644 +index 87476d216f4e6ecfc3289fc6f5332187a0a2405a..f6f076b8e5231b8f68a121f9a432b74647cdde14 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -447,6 +447,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0169-Configurable-piston-push-limit.patch b/patches/server/0168-Configurable-piston-push-limit.patch similarity index 100% rename from patches/server/0169-Configurable-piston-push-limit.patch rename to patches/server/0168-Configurable-piston-push-limit.patch diff --git a/patches/server/0170-Configurable-broadcast-settings.patch b/patches/server/0169-Configurable-broadcast-settings.patch similarity index 97% rename from patches/server/0170-Configurable-broadcast-settings.patch rename to patches/server/0169-Configurable-broadcast-settings.patch index 74d05bb8f..88942f533 100644 --- a/patches/server/0170-Configurable-broadcast-settings.patch +++ b/patches/server/0169-Configurable-broadcast-settings.patch @@ -17,7 +17,7 @@ index 897e761be8c1f79562f54101173fbba7656a37ec..ce42e91a95ccd42deff65e1942b918e9 // Paper end } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 68a6d76edb9915c9bb8629cf90f323aed33c722c..b9112a8aa9f821e08e26941715cadc36672a5338 100644 +index 5c094787a446b3947e10c126ef91ad43b78ec99f..0645fcfa8dd201a41588af7a156a0df838ccb006 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -926,6 +926,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0171-Configurable-mob-blindness.patch b/patches/server/0170-Configurable-mob-blindness.patch similarity index 100% rename from patches/server/0171-Configurable-mob-blindness.patch rename to patches/server/0170-Configurable-mob-blindness.patch diff --git a/patches/server/0172-Hide-hidden-players-from-entity-selector.patch b/patches/server/0171-Hide-hidden-players-from-entity-selector.patch similarity index 100% rename from patches/server/0172-Hide-hidden-players-from-entity-selector.patch rename to patches/server/0171-Hide-hidden-players-from-entity-selector.patch diff --git a/patches/server/0173-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0172-Config-for-health-to-impact-Creeper-explosion-radius.patch similarity index 100% rename from patches/server/0173-Config-for-health-to-impact-Creeper-explosion-radius.patch rename to patches/server/0172-Config-for-health-to-impact-Creeper-explosion-radius.patch diff --git a/patches/server/0174-Iron-golem-calm-anger-options.patch b/patches/server/0173-Iron-golem-calm-anger-options.patch similarity index 100% rename from patches/server/0174-Iron-golem-calm-anger-options.patch rename to patches/server/0173-Iron-golem-calm-anger-options.patch diff --git a/patches/server/0175-Breedable-parrots.patch b/patches/server/0174-Breedable-parrots.patch similarity index 100% rename from patches/server/0175-Breedable-parrots.patch rename to patches/server/0174-Breedable-parrots.patch diff --git a/patches/server/0176-Configurable-powered-rail-boost-modifier.patch b/patches/server/0175-Configurable-powered-rail-boost-modifier.patch similarity index 100% rename from patches/server/0176-Configurable-powered-rail-boost-modifier.patch rename to patches/server/0175-Configurable-powered-rail-boost-modifier.patch diff --git a/patches/server/0177-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0176-Add-config-change-multiplier-critical-damage-value.patch similarity index 96% rename from patches/server/0177-Add-config-change-multiplier-critical-damage-value.patch rename to patches/server/0176-Add-config-change-multiplier-critical-damage-value.patch index 99a203c81..252de05e8 100644 --- a/patches/server/0177-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0176-Add-config-change-multiplier-critical-damage-value.patch @@ -18,7 +18,7 @@ index f10a048d962ff80f566db11a8490e725d4484cb1..45dc5eeb3794492324bd316719524ea7 f += f1; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d6b680924535ff43b6a6e078efedceda45131a53..b9040b9e965535db3431e794fe4bb0298146ddfc 100644 +index 9973dbee6ea493d7a4f70ac6627abd69123ab622..ef4c053236914f87c4ec48d1bfd0437ff75abd13 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -373,6 +373,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0178-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0177-Option-to-disable-dragon-egg-teleporting.patch similarity index 100% rename from patches/server/0178-Option-to-disable-dragon-egg-teleporting.patch rename to patches/server/0177-Option-to-disable-dragon-egg-teleporting.patch diff --git a/patches/server/0179-Config-for-unverified-username-message.patch b/patches/server/0178-Config-for-unverified-username-message.patch similarity index 97% rename from patches/server/0179-Config-for-unverified-username-message.patch rename to patches/server/0178-Config-for-unverified-username-message.patch index aadbba7dc..c4863a3d0 100644 --- a/patches/server/0179-Config-for-unverified-username-message.patch +++ b/patches/server/0178-Config-for-unverified-username-message.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for unverified username message diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java -index b607f5ccbce10570f827dd21eb38504f42781d2f..a0f34f6b4df45367a4bc740409eb704531fe821a 100644 +index ea9b56fd6ae1d5577da5bd3e0c38abfeec8f3646..d2c8e1e20eb44d4880b1a2beee6f04a7f505c491 100644 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java @@ -379,7 +379,7 @@ public class ServerLoginPacketListenerImpl implements TickablePacketListener, Se diff --git a/patches/server/0180-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0179-Make-anvil-cumulative-cost-configurable.patch similarity index 100% rename from patches/server/0180-Make-anvil-cumulative-cost-configurable.patch rename to patches/server/0179-Make-anvil-cumulative-cost-configurable.patch diff --git a/patches/server/0181-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0180-ShulkerBox-allow-oversized-stacks.patch similarity index 97% rename from patches/server/0181-ShulkerBox-allow-oversized-stacks.patch rename to patches/server/0180-ShulkerBox-allow-oversized-stacks.patch index 9e45d2969..2a53c4d36 100644 --- a/patches/server/0181-ShulkerBox-allow-oversized-stacks.patch +++ b/patches/server/0180-ShulkerBox-allow-oversized-stacks.patch @@ -9,7 +9,7 @@ creating an itemstack using the TileEntity's NBT data (how it handles it for creative players) instead of routing it through the LootableBuilder. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java -index 7dcb7d5de7dc10666a40d03f39f3fb6f713fdcff..bb2ccffa619356a57014436a17225a2de78f5b5a 100644 +index 47b43df836651ab94f7a64a9b22dad2357c0e0a6..61a4219f286a81af3e108f83658838c2464fdec7 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java @@ -420,7 +420,7 @@ public class ServerPlayerGameMode { diff --git a/patches/server/0182-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0181-Bee-can-work-when-raining-or-at-night.patch similarity index 97% rename from patches/server/0182-Bee-can-work-when-raining-or-at-night.patch rename to patches/server/0181-Bee-can-work-when-raining-or-at-night.patch index 3642e4809..c7443baa3 100644 --- a/patches/server/0182-Bee-can-work-when-raining-or-at-night.patch +++ b/patches/server/0181-Bee-can-work-when-raining-or-at-night.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bee can work when raining or at night diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java -index f012bee87c13d4ab8973127e77ed2eef8ab72d3f..e4f5fb665c891af7ac0aa2ee08af59f60cc75495 100644 +index ec13cbb89a794c3d279b33fa197f9f42d0b86b46..0e5988fc636cbd7a76cf73ed91d65f0f9571987a 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java @@ -410,7 +410,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal { diff --git a/patches/server/0183-API-for-any-mob-to-burn-daylight.patch b/patches/server/0182-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from patches/server/0183-API-for-any-mob-to-burn-daylight.patch rename to patches/server/0182-API-for-any-mob-to-burn-daylight.patch diff --git a/patches/server/0184-Config-MobEffect-by-world.patch b/patches/server/0183-Config-MobEffect-by-world.patch similarity index 98% rename from patches/server/0184-Config-MobEffect-by-world.patch rename to patches/server/0183-Config-MobEffect-by-world.patch index e3331d4a1..cbc8dfa9a 100644 --- a/patches/server/0184-Config-MobEffect-by-world.patch +++ b/patches/server/0183-Config-MobEffect-by-world.patch @@ -40,7 +40,7 @@ index 17ffab92f4ae2c06fa9f9249a474d4b6c9c55090..bb15cf2aa35ce8754bba56f5b312d92b ((ServerPlayer) entityhuman).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 07ff861240b5f76178f613986872685114d996a3..4710230baec5e13452f9c12f71de73a218c1f050 100644 +index 14eeef9823c1631d08d05fab579a18f72669dbfc..4a41e0c169d31ae29d1039f3c06691b941026f66 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -330,6 +330,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0185-Beacon-Activation-Range-Configurable.patch b/patches/server/0184-Beacon-Activation-Range-Configurable.patch similarity index 96% rename from patches/server/0185-Beacon-Activation-Range-Configurable.patch rename to patches/server/0184-Beacon-Activation-Range-Configurable.patch index b11eb026b..c5790381c 100644 --- a/patches/server/0185-Beacon-Activation-Range-Configurable.patch +++ b/patches/server/0184-Beacon-Activation-Range-Configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Beacon Activation Range Configurable diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index 5f6eeb36f57bd342b18590c8f0ffb668d2bf273c..59259dd3d8d8fd02c02d7435a4443779984fe33f 100644 +index bb4ab75ec0e7a5d71dafeeb55e26d2204455e7a1..b7f60bdbb4938e57220002a47c588982bfcf1e8b 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java @@ -82,6 +82,16 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider { diff --git a/patches/server/0186-Add-toggle-for-sand-duping-fix.patch b/patches/server/0185-Add-toggle-for-sand-duping-fix.patch similarity index 95% rename from patches/server/0186-Add-toggle-for-sand-duping-fix.patch rename to patches/server/0185-Add-toggle-for-sand-duping-fix.patch index 314625e8b..13fdb53e1 100644 --- a/patches/server/0186-Add-toggle-for-sand-duping-fix.patch +++ b/patches/server/0185-Add-toggle-for-sand-duping-fix.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add toggle for sand duping fix diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java -index ef07967b64180c54338b8fb2ba1780adec87f333..71e4178bf7d553141719c8a6cb7488d3aaca0f9f 100644 +index b2d1a17867cdbaad0c6e5c2376c716f9461af124..6943bf2bfa29bce3a1425d75c3ddf560438f5ea0 100644 --- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java @@ -128,7 +128,7 @@ public class FallingBlockEntity extends Entity { diff --git a/patches/server/0187-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0186-Add-toggle-for-end-portal-safe-teleporting.patch similarity index 97% rename from patches/server/0187-Add-toggle-for-end-portal-safe-teleporting.patch rename to patches/server/0186-Add-toggle-for-end-portal-safe-teleporting.patch index fcb024381..f26d66144 100644 --- a/patches/server/0187-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0186-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 c44392af107fe4f5e3a77d69067f49cba2eee771..de68663faebbfc019025d83d70b825ed6a6b8f11 100644 +index ce844dfc6f01f3aa6463054174a41f6f3161ad7a..333cb9aaf281822ed47443d54a27fe2fc438cd21 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2948,7 +2948,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0188-Flying-Fall-Damage-API.patch b/patches/server/0187-Flying-Fall-Damage-API.patch similarity index 92% rename from patches/server/0188-Flying-Fall-Damage-API.patch rename to patches/server/0187-Flying-Fall-Damage-API.patch index ce7f1d516..ba9ca04b3 100644 --- a/patches/server/0188-Flying-Fall-Damage-API.patch +++ b/patches/server/0187-Flying-Fall-Damage-API.patch @@ -26,10 +26,10 @@ index 45dc5eeb3794492324bd316719524ea797f7ef6a..bbfb5f8f88e972a770d0ce5373c67ffe } else { if (fallDistance >= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 60e586e10ba60192aaa87652629d69375ccdc85b..ae8b9dc19224c18177c3bf3490ba9470e832c85d 100644 +index d588f1b7670af21512295e446c15812cd9e2f6a2..26af7578809970e3073699db2c118872b05b512f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2995,5 +2995,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2999,5 +2999,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) { getHandle().spawnInvulnerableTime = spawnInvulnerableTime; } diff --git a/patches/server/0189-Make-lightning-rod-range-configurable.patch b/patches/server/0188-Make-lightning-rod-range-configurable.patch similarity index 96% rename from patches/server/0189-Make-lightning-rod-range-configurable.patch rename to patches/server/0188-Make-lightning-rod-range-configurable.patch index eca456898..4701eae3b 100644 --- a/patches/server/0189-Make-lightning-rod-range-configurable.patch +++ b/patches/server/0188-Make-lightning-rod-range-configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make lightning rod range configurable diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 2e8b8874106bb96f6a3ff9ff50e1c3ef41560615..becb357d64a4dc5783ff6b06eee1a4cb59e7688c 100644 +index c96ce52b97881d48d81f0cbe6c44aa1c1505e43c..f08262d7c8c0c7ebaafe5e9d946d6f5328896463 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -973,7 +973,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0190-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch b/patches/server/0189-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch similarity index 100% rename from patches/server/0190-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch rename to patches/server/0189-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch diff --git a/patches/server/0191-Allow-player-join-full-server-by-permission.patch b/patches/server/0190-Allow-player-join-full-server-by-permission.patch similarity index 93% rename from patches/server/0191-Allow-player-join-full-server-by-permission.patch rename to patches/server/0190-Allow-player-join-full-server-by-permission.patch index a81cebb52..7eba0e477 100644 --- a/patches/server/0191-Allow-player-join-full-server-by-permission.patch +++ b/patches/server/0190-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 3d777aae5a91190e1c3bde234bc53a56fdf3c414..9ed964da70a17afbe26c513f67b2d911f2c9e7c5 100644 +index 1d369d4a540f4b4731c3a07d2b70256462de34f3..eb3d0956a43f96d495ce6712f413e84acbc0fa1c 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -783,7 +783,7 @@ public abstract class PlayerList { diff --git a/patches/server/0192-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0191-Add-permission-bypass-for-portal-waiting.patch similarity index 94% rename from patches/server/0192-Add-permission-bypass-for-portal-waiting.patch rename to patches/server/0191-Add-permission-bypass-for-portal-waiting.patch index d544963f7..93ff12565 100644 --- a/patches/server/0192-Add-permission-bypass-for-portal-waiting.patch +++ b/patches/server/0191-Add-permission-bypass-for-portal-waiting.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add permission bypass for portal waiting diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index c726476e37e8eb6f15f8c05280deb3d0e797d109..281b7534a3f455b57cfe36c6d844f58c2efefd16 100644 +index 0bcb88b9fc4e7289153177bd71d8a72458af1dbe..a53b828a23de5cd008504441d1506b29d03261eb 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -189,6 +189,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0193-Shulker-spawn-from-bullet-options.patch b/patches/server/0192-Shulker-spawn-from-bullet-options.patch similarity index 100% rename from patches/server/0193-Shulker-spawn-from-bullet-options.patch rename to patches/server/0192-Shulker-spawn-from-bullet-options.patch diff --git a/patches/server/0194-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0193-Eating-glow-berries-adds-glow-effect.patch similarity index 97% rename from patches/server/0194-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0193-Eating-glow-berries-adds-glow-effect.patch index 8b7b2386b..84c4c9893 100644 --- a/patches/server/0194-Eating-glow-berries-adds-glow-effect.patch +++ b/patches/server/0193-Eating-glow-berries-adds-glow-effect.patch @@ -18,7 +18,7 @@ index e0a635d647113bb363df2ddc293f2495c56e5d3c..fcdd30f38bc57cc382a47d99e3c31f93 public static final Item SOUL_CAMPFIRE = registerBlock(Blocks.SOUL_CAMPFIRE, CreativeModeTab.TAB_DECORATIONS); public static final Item SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT, CreativeModeTab.TAB_DECORATIONS); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b1d092b53aaeb5e6a28aa7f87c23bd04cda314bb..ba1cdcd29aa7f1cbce02ef1d8a1d8f9e2173d5eb 100644 +index bd2c7b4b21c6c9812be930162856d72696faad76..bab901d7240163d586d9c5f0f10107e680841ea3 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -221,6 +221,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0195-Option-to-make-drowned-break-doors.patch b/patches/server/0194-Option-to-make-drowned-break-doors.patch similarity index 100% rename from patches/server/0195-Option-to-make-drowned-break-doors.patch rename to patches/server/0194-Option-to-make-drowned-break-doors.patch diff --git a/patches/server/0196-Configurable-hunger-starvation-damage.patch b/patches/server/0195-Configurable-hunger-starvation-damage.patch similarity index 100% rename from patches/server/0196-Configurable-hunger-starvation-damage.patch rename to patches/server/0195-Configurable-hunger-starvation-damage.patch diff --git a/patches/server/0197-Enhance-SysoutCatcher.patch b/patches/server/0196-Enhance-SysoutCatcher.patch similarity index 100% rename from patches/server/0197-Enhance-SysoutCatcher.patch rename to patches/server/0196-Enhance-SysoutCatcher.patch diff --git a/patches/server/0198-Armor-click-equip-options.patch b/patches/server/0197-Armor-click-equip-options.patch similarity index 100% rename from patches/server/0198-Armor-click-equip-options.patch rename to patches/server/0197-Armor-click-equip-options.patch diff --git a/patches/server/0199-Add-uptime-command.patch b/patches/server/0198-Add-uptime-command.patch similarity index 98% rename from patches/server/0199-Add-uptime-command.patch rename to patches/server/0198-Add-uptime-command.patch index 39a239fc5..569599c70 100644 --- a/patches/server/0199-Add-uptime-command.patch +++ b/patches/server/0198-Add-uptime-command.patch @@ -17,7 +17,7 @@ index 14b12cb6967c1c2735cf6a0eafdf6e23889a528c..6a044a9c97db9bba75f8dbbaa8515e31 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 03d0cc6c69164e196d5db2bf56a7136a9e4a5c79..fa2812d94045e5d49fdd9990eac918975c9fcee5 100644 +index e03ce4bf00505f886e2b07c5b1e77214f7ba789d..a513f1aa4372ff9c484f9a782b73cf7078c6ce72 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -281,6 +281,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop transaction = new java.util.ArrayList(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f3bbfc995366eb710082afe40b4d51533f6016ea..9c9826005a444f9877efe2b01a5ae9bd83578422 100644 +index e04f5101e22295088d972f51fbe51caa984401db..fd58d9e6a19fb04e1a93cd0aa0fa12a405abaee1 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1426,6 +1426,19 @@ public final class CraftServer implements Server { diff --git a/patches/server/0225-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0224-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch similarity index 97% rename from patches/server/0225-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch rename to patches/server/0224-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch index 13a9493f4..d92718eef 100644 --- a/patches/server/0225-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch +++ b/patches/server/0224-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index e2881584437c49e58f84236c372ef4c72f653ee0..31c802a2a7ebebbfb57af5ecb35ba91df58b12ea 100644 +index 38a2173688a4911fd62f7072acf6003bbbeabc13..f869fe906a5c65c1ef045f77cff894d005aad835 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1181,6 +1181,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0226-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0225-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch similarity index 100% rename from patches/server/0226-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch rename to patches/server/0225-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch diff --git a/patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0226-Shift-right-click-to-use-exp-for-mending.patch similarity index 98% rename from patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch rename to patches/server/0226-Shift-right-click-to-use-exp-for-mending.patch index d7ca90e62..4eaa2f01f 100644 --- a/patches/server/0227-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0226-Shift-right-click-to-use-exp-for-mending.patch @@ -36,7 +36,7 @@ index 9f8995c559b500415ec8d214f7c164707046f6ac..4816b5bd54ae6e080af4c19df43d57e8 + // Purpur end } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d245c34f0641b0eb892fd807c2a3e21e39bdb505..dc2a8863ede6899c428b895d90bed19a00ab8da7 100644 +index 7562e93a75183f09d227ea64b1bbddc59d10ce14..6e7b0d78a602e03c951bf14ed0b694b4b7ff203d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2096,6 +2096,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0228-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0227-Dolphins-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0228-Dolphins-naturally-aggressive-to-players-chance.patch rename to patches/server/0227-Dolphins-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0229-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0228-Cows-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0229-Cows-naturally-aggressive-to-players-chance.patch rename to patches/server/0228-Cows-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0230-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0229-Option-for-beds-to-explode-on-villager-sleep.patch similarity index 100% rename from patches/server/0230-Option-for-beds-to-explode-on-villager-sleep.patch rename to patches/server/0229-Option-for-beds-to-explode-on-villager-sleep.patch diff --git a/patches/server/0231-Halloween-options-and-optimizations.patch b/patches/server/0230-Halloween-options-and-optimizations.patch similarity index 98% rename from patches/server/0231-Halloween-options-and-optimizations.patch rename to patches/server/0230-Halloween-options-and-optimizations.patch index 104cfcd2b..e73acc159 100644 --- a/patches/server/0231-Halloween-options-and-optimizations.patch +++ b/patches/server/0230-Halloween-options-and-optimizations.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Halloween options and optimizations diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java -index 53ef2004d1b6acaf27fef9a658fff99b7d343215..a851aaf84085c9bd79e933246bb2c79e435ab0f1 100644 +index 16ab6feea4af65bfe9b0c6e6c586a9abf8790c94..7da1becafd551fcf89b2a2eecd6e2cbe18af1fe8 100644 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java @@ -316,7 +316,7 @@ public class Bat extends AmbientCreature { diff --git a/patches/server/0232-Config-for-grindstones.patch b/patches/server/0231-Config-for-grindstones.patch similarity index 98% rename from patches/server/0232-Config-for-grindstones.patch rename to patches/server/0231-Config-for-grindstones.patch index 67d7411cd..cfaa87e11 100644 --- a/patches/server/0232-Config-for-grindstones.patch +++ b/patches/server/0231-Config-for-grindstones.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for grindstones diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java -index 740b778ce14f241e509f17c3a84b9ed47cdeeebe..36a6db1752fbde0e071af0da8c212c5c834b5b2e 100644 +index 447f0f5f37e445a350d06deeac326feab2d66999..eb70286262fd8c3b4efb614cf62c5e3bf4b00640 100644 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java @@ -130,7 +130,7 @@ public class GrindstoneMenu extends AbstractContainerMenu { diff --git a/patches/server/0233-UPnP-Port-Forwarding.patch b/patches/server/0232-UPnP-Port-Forwarding.patch similarity index 95% rename from patches/server/0233-UPnP-Port-Forwarding.patch rename to patches/server/0232-UPnP-Port-Forwarding.patch index e2323daa6..87f8488c6 100644 --- a/patches/server/0233-UPnP-Port-Forwarding.patch +++ b/patches/server/0232-UPnP-Port-Forwarding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fa2812d94045e5d49fdd9990eac918975c9fcee5..2030779f7c430a6d30679935c108d2deb21a1cef 100644 +index a513f1aa4372ff9c484f9a782b73cf7078c6ce72..11bc98a1c9306f553c6034ed0c1ce7f586b6b21b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -296,6 +296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> { diff --git a/patches/server/0259-Configurable-minimum-demand-for-trades.patch b/patches/server/0258-Configurable-minimum-demand-for-trades.patch similarity index 100% rename from patches/server/0259-Configurable-minimum-demand-for-trades.patch rename to patches/server/0258-Configurable-minimum-demand-for-trades.patch diff --git a/patches/server/0260-Lobotomize-stuck-villagers.patch b/patches/server/0259-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/server/0260-Lobotomize-stuck-villagers.patch rename to patches/server/0259-Lobotomize-stuck-villagers.patch diff --git a/patches/server/0261-Option-for-villager-display-trade-item.patch b/patches/server/0260-Option-for-villager-display-trade-item.patch similarity index 100% rename from patches/server/0261-Option-for-villager-display-trade-item.patch rename to patches/server/0260-Option-for-villager-display-trade-item.patch diff --git a/patches/server/0262-Fill-command-max-area-option.patch b/patches/server/0261-Fill-command-max-area-option.patch similarity index 100% rename from patches/server/0262-Fill-command-max-area-option.patch rename to patches/server/0261-Fill-command-max-area-option.patch diff --git a/patches/server/0263-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0262-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch similarity index 100% rename from patches/server/0263-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch rename to patches/server/0262-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch diff --git a/patches/server/0264-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0263-Config-for-mob-last-hurt-by-player-time.patch similarity index 100% rename from patches/server/0264-Config-for-mob-last-hurt-by-player-time.patch rename to patches/server/0263-Config-for-mob-last-hurt-by-player-time.patch diff --git a/patches/server/0265-Anvil-repair-damage-options.patch b/patches/server/0264-Anvil-repair-damage-options.patch similarity index 100% rename from patches/server/0265-Anvil-repair-damage-options.patch rename to patches/server/0264-Anvil-repair-damage-options.patch diff --git a/patches/server/0266-Fix-legacy-colors-in-console.patch b/patches/server/0265-Fix-legacy-colors-in-console.patch similarity index 100% rename from patches/server/0266-Fix-legacy-colors-in-console.patch rename to patches/server/0265-Fix-legacy-colors-in-console.patch diff --git a/patches/server/0267-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0266-Option-to-disable-turtle-egg-trampling-with-feather-.patch similarity index 100% rename from patches/server/0267-Option-to-disable-turtle-egg-trampling-with-feather-.patch rename to patches/server/0266-Option-to-disable-turtle-egg-trampling-with-feather-.patch diff --git a/patches/server/0268-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0267-Add-toggle-for-enchant-level-clamping.patch similarity index 100% rename from patches/server/0268-Add-toggle-for-enchant-level-clamping.patch rename to patches/server/0267-Add-toggle-for-enchant-level-clamping.patch diff --git a/patches/server/0269-Config-to-prevent-horses-from-standing-when-hurt.patch b/patches/server/0268-Config-to-prevent-horses-from-standing-when-hurt.patch similarity index 100% rename from patches/server/0269-Config-to-prevent-horses-from-standing-when-hurt.patch rename to patches/server/0268-Config-to-prevent-horses-from-standing-when-hurt.patch diff --git a/patches/server/0270-Drop-incompatible-tests.patch b/patches/server/0269-Drop-incompatible-tests.patch similarity index 100% rename from patches/server/0270-Drop-incompatible-tests.patch rename to patches/server/0269-Drop-incompatible-tests.patch diff --git a/patches/server/0271-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0270-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0271-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0270-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0272-Stonecutter-damage.patch b/patches/server/0271-Stonecutter-damage.patch similarity index 100% rename from patches/server/0272-Stonecutter-damage.patch rename to patches/server/0271-Stonecutter-damage.patch diff --git a/patches/server/0273-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0272-Configurable-damage-settings-for-magma-blocks.patch similarity index 100% rename from patches/server/0273-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0272-Configurable-damage-settings-for-magma-blocks.patch diff --git a/patches/server/0274-Add-config-for-snow-on-blue-ice.patch b/patches/server/0273-Add-config-for-snow-on-blue-ice.patch similarity index 100% rename from patches/server/0274-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0273-Add-config-for-snow-on-blue-ice.patch diff --git a/patches/server/0275-Add-log-suppression-for-sent-expired-chat.patch b/patches/server/0274-Add-log-suppression-for-sent-expired-chat.patch similarity index 100% rename from patches/server/0275-Add-log-suppression-for-sent-expired-chat.patch rename to patches/server/0274-Add-log-suppression-for-sent-expired-chat.patch diff --git a/patches/server/0276-Skeletons-eat-wither-roses.patch b/patches/server/0275-Skeletons-eat-wither-roses.patch similarity index 100% rename from patches/server/0276-Skeletons-eat-wither-roses.patch rename to patches/server/0275-Skeletons-eat-wither-roses.patch diff --git a/patches/server/0277-Enchantment-Table-Persists-Lapis.patch b/patches/server/0276-Enchantment-Table-Persists-Lapis.patch similarity index 100% rename from patches/server/0277-Enchantment-Table-Persists-Lapis.patch rename to patches/server/0276-Enchantment-Table-Persists-Lapis.patch diff --git a/patches/server/0278-Spark-Profiler.patch b/patches/server/0277-Spark-Profiler.patch similarity index 96% rename from patches/server/0278-Spark-Profiler.patch rename to patches/server/0277-Spark-Profiler.patch index 29ef45067..807d8f66b 100644 --- a/patches/server/0278-Spark-Profiler.patch +++ b/patches/server/0277-Spark-Profiler.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spark Profiler diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 67bde88d7921248a1dd6f36386a290e7ac1e9ecc..2e257704af6dc016303876cf39de971982b21db2 100644 +index fd58d9e6a19fb04e1a93cd0aa0fa12a405abaee1..39126cfe915c5e5777813b14ceab6427205b2a76 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -420,7 +420,38 @@ public final class CraftServer implements Server { diff --git a/patches/server/0279-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0278-Option-to-disable-kick-for-out-of-order-chat.patch similarity index 95% rename from patches/server/0279-Option-to-disable-kick-for-out-of-order-chat.patch rename to patches/server/0278-Option-to-disable-kick-for-out-of-order-chat.patch index 1673d1fbc..45af52c99 100644 --- a/patches/server/0279-Option-to-disable-kick-for-out-of-order-chat.patch +++ b/patches/server/0278-Option-to-disable-kick-for-out-of-order-chat.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to disable kick for out of order chat diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 25a5c9f6432a80705bf56d32519127aa6095531d..584744eed27dd3e7f20f4c6d88e931935ecc837b 100644 +index 32c0c403f44ccfe215a0003c060b131edae72a7c..799c279e63f23227cb473f7828aeaf7afb0de355 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2453,7 +2453,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0280-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0279-Config-for-sculk-shrieker-can_summon-state.patch similarity index 100% rename from patches/server/0280-Config-for-sculk-shrieker-can_summon-state.patch rename to patches/server/0279-Config-for-sculk-shrieker-can_summon-state.patch diff --git a/patches/server/0281-Config-to-not-let-coral-die.patch b/patches/server/0280-Config-to-not-let-coral-die.patch similarity index 100% rename from patches/server/0281-Config-to-not-let-coral-die.patch rename to patches/server/0280-Config-to-not-let-coral-die.patch diff --git a/patches/server/0282-Add-local-difficulty-api.patch b/patches/server/0281-Add-local-difficulty-api.patch similarity index 91% rename from patches/server/0282-Add-local-difficulty-api.patch rename to patches/server/0281-Add-local-difficulty-api.patch index a75d9bf51..8eb14ef58 100644 --- a/patches/server/0282-Add-local-difficulty-api.patch +++ b/patches/server/0281-Add-local-difficulty-api.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add local difficulty api diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 72ed25022d5ea1074304be3c72b23882b8f0f88a..68eb990c7d461c611310419c1eefaed79a7c8538 100644 +index 81ab184cb5235913ef43ae4d7f1ac82bce927519..0462ed0da625b3d1ee6f5fb6c219a593309f4f9e 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2234,6 +2234,12 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0283-Add-toggle-for-RNG-manipulation.patch b/patches/server/0282-Add-toggle-for-RNG-manipulation.patch similarity index 96% rename from patches/server/0283-Add-toggle-for-RNG-manipulation.patch rename to patches/server/0282-Add-toggle-for-RNG-manipulation.patch index 02b6d575a..822f13cdc 100644 --- a/patches/server/0283-Add-toggle-for-RNG-manipulation.patch +++ b/patches/server/0282-Add-toggle-for-RNG-manipulation.patch @@ -7,7 +7,7 @@ Paper patches RNG maniplulation by using a shared (and locked) random source. This comes with a performance gain, but technical players may prefer the ability to manipulate RNG. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index c0ad8f069d78719e01d92c42a190a4e57d6b6d67..0ffaccb3e6ae2a400f1def283b62024e8bfc05e4 100644 +index f9cf68820e01619a4ec319f18583a24115bfe112..cd97d28e85a6795099ec314e9574aa413ff93156 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -576,7 +576,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { diff --git a/patches/server/0284-Send-client-custom-name-of-BE.patch b/patches/server/0283-Send-client-custom-name-of-BE.patch similarity index 100% rename from patches/server/0284-Send-client-custom-name-of-BE.patch rename to patches/server/0283-Send-client-custom-name-of-BE.patch diff --git a/patches/server/0285-PaperPR-Fix-exact-choice-recipe-book-clicks.patch b/patches/server/0284-PaperPR-Fix-exact-choice-recipe-book-clicks.patch similarity index 100% rename from patches/server/0285-PaperPR-Fix-exact-choice-recipe-book-clicks.patch rename to patches/server/0284-PaperPR-Fix-exact-choice-recipe-book-clicks.patch diff --git a/patches/server/0286-Allow-custom-ChatDecorators.patch b/patches/server/0285-Allow-custom-ChatDecorators.patch similarity index 94% rename from patches/server/0286-Allow-custom-ChatDecorators.patch rename to patches/server/0285-Allow-custom-ChatDecorators.patch index e8d55f034..8eea51778 100644 --- a/patches/server/0286-Allow-custom-ChatDecorators.patch +++ b/patches/server/0285-Allow-custom-ChatDecorators.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow custom ChatDecorators Requires NMS to utilize. I'll write an API for this once our upstreams calm down with the changes. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7836fe7ec1afde26989451e51a7ab63195e5af87..832218df741197b6f15746b1d683ce1d3a16a03f 100644 +index 274ee228669973d3e0667a09ed05316006b01ad1..57ec5a9eda9c539f2b50dc4a7894b5352a63b6d4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2627,6 +2627,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop