diff --git a/gradle.properties b/gradle.properties index 10f4f2b8b..3a4b5af8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.20.4-R0.1-SNAPSHOT mcVersion = 1.20.4 -paperCommit = 930a24f965d02250fa58436c019a4d5eb7e5f607 +paperCommit = 9051fc347c428500090e814c98e9d8503dc7a205 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0003-Purpur-client-support.patch b/patches/api/0003-Purpur-client-support.patch index cfbee023b..33d2b0679 100644 --- a/patches/api/0003-Purpur-client-support.patch +++ b/patches/api/0003-Purpur-client-support.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 962283d336e6d53941cebbc3a995d403ff989f66..f866628e5d9e8edccab657f86f60f911c2e3fb06 100644 +index a8d3451ccfcd21a9e80adc2feab8fc9c2926c753..271b3ee810f9689dab223eb0e6b51eef358ee38d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3414,4 +3414,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3484,4 +3484,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Override Spigot spigot(); // Spigot end diff --git a/patches/api/0008-AFK-API.patch b/patches/api/0008-AFK-API.patch index c661ab8ac..31e1ce5d3 100644 --- a/patches/api/0008-AFK-API.patch +++ b/patches/api/0008-AFK-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] AFK API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f866628e5d9e8edccab657f86f60f911c2e3fb06..e3a6289547ff378fecf97b20ab08c8b36fe9cfa6 100644 +index 271b3ee810f9689dab223eb0e6b51eef358ee38d..31b086d944fd06a518c49da84cbc58744591a2f9 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3422,5 +3422,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3492,5 +3492,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @return True if Player uses Purpur Client */ public boolean usesPurpurClient(); diff --git a/patches/api/0042-Debug-Marker-API.patch b/patches/api/0042-Debug-Marker-API.patch index c2f5e66f9..5693253bc 100644 --- a/patches/api/0042-Debug-Marker-API.patch +++ b/patches/api/0042-Debug-Marker-API.patch @@ -260,10 +260,10 @@ index 26fe07a4429e40da1ce4a0433ae184f594ddb473..405d60bd2c99ba741d2614b16f4bda5d /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e3a6289547ff378fecf97b20ab08c8b36fe9cfa6..617d1ff6cfe1113668f4f91b5ed83016ad48c3f7 100644 +index 31b086d944fd06a518c49da84cbc58744591a2f9..2587fa1f34eb8ed6c50e500531d07f9325d91f16 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3442,5 +3442,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3512,5 +3512,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @deprecated Use {@link #resetIdleDuration()} instead */ void resetIdleTimer(); diff --git a/patches/api/0043-Add-death-screen-API.patch b/patches/api/0043-Add-death-screen-API.patch index 97bd3725e..7dc8a33c1 100644 --- a/patches/api/0043-Add-death-screen-API.patch +++ b/patches/api/0043-Add-death-screen-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 617d1ff6cfe1113668f4f91b5ed83016ad48c3f7..498f9d8bbda8ab248ec520d850c9169da4b00327 100644 +index 2587fa1f34eb8ed6c50e500531d07f9325d91f16..c70af6fb5789974b1f302d408021df6284f014a1 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3512,5 +3512,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3582,5 +3582,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Clears all debug block highlights */ void clearBlockHighlights(); diff --git a/patches/server/0003-Purpur-client-support.patch b/patches/server/0003-Purpur-client-support.patch index 8600c66b6..a88398ac6 100644 --- a/patches/server/0003-Purpur-client-support.patch +++ b/patches/server/0003-Purpur-client-support.patch @@ -17,7 +17,7 @@ index 8efbbd379244e3ed54d4aba199037cc20ccd096a..86cf69de7a35f1ac8e2c56f988e74832 // Paper start - replace player chunk loader private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 77cd2b73e4d499beca16962a6b3d1fefe279cd87..13e064451c4d48e873061b6dea431a6b101de2ee 100644 +index 4a712f5fc4f0b4a4434ae808c989113bee8d8634..fb03498b355a86e156ed26ee903ba93c03365dcb 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -55,6 +55,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -43,10 +43,10 @@ index 77cd2b73e4d499beca16962a6b3d1fefe279cd87..13e064451c4d48e873061b6dea431a6b try { String channels = payload.toString(com.google.common.base.Charsets.UTF_8); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ed41decbf0522c516b3608569d5719687105e25b..67bb2541fff19f0a48c7b1289e34749ece632d56 100644 +index 036b31cbfda8bac02205d99c1eff8a08f4da1250..ef9b8e50522583aa9675ab4d15fc8285a311e2ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3315,4 +3315,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3293,4 +3293,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.spigot; } // Spigot end diff --git a/patches/server/0004-Fix-decompile-errors.patch b/patches/server/0004-Fix-decompile-errors.patch index 3157b4565..f89a4b10b 100644 --- a/patches/server/0004-Fix-decompile-errors.patch +++ b/patches/server/0004-Fix-decompile-errors.patch @@ -4,6 +4,19 @@ Date: Sun, 12 Jun 2022 06:20:21 -0500 Subject: [PATCH] Fix decompile errors +diff --git a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java +index 89f0f68b3e2be64bcbf8b173a51d56ea3a3fb4ea..05e1c94268cf5c6897807cd7acced652856a09ea 100644 +--- a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java ++++ b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java +@@ -94,7 +94,7 @@ public class BuildContexts> { + + if (list.isEmpty()) { + if (chainModifiers.isReturn()) { +- context.queueNext(new CommandQueueEntry<>(frame, FallthroughTask.instance())); ++ context.queueNext(new CommandQueueEntry<>(frame, (EntryAction) FallthroughTask.instance())); // Purpur - decompile error + } + + } else { diff --git a/src/main/java/net/minecraft/world/entity/decoration/Painting.java b/src/main/java/net/minecraft/world/entity/decoration/Painting.java index d9016807bc21c38a5c38170e1335c79b39355bcb..03c065d0ad97d29f3586ba2bf3cd207b867ed634 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/Painting.java @@ -30,6 +43,19 @@ index b79c86272f12c4b1173ea494cbe09e1ecdc23533..11275a9ec6faa69c9f054683cb47312e } protected void updateActivity() { +diff --git a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java +index 0b8992a9aea781470ab3b1880cf041972a20089d..ab183a7d94a27d5235ff33ce7784c92d66d40b89 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java ++++ b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java +@@ -59,7 +59,7 @@ public class Breeze extends Monster { + + @Override + public Brain getBrain() { +- return super.getBrain(); ++ return (Brain) super.getBrain(); // Purpur - decompile error + } + + @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java index d02ee11066fc4f07ccb110b09b86d895ff90d4f2..e1be4a77fae0b9120781f460079269b85c993930 100644 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch index a4898a25a..359e81728 100644 --- a/patches/server/0006-Ridables.patch +++ b/patches/server/0006-Ridables.patch @@ -34,7 +34,7 @@ index 88b79cd90e936e1c48b84d7f762f425e1ae09259..81e4b7254e1c3cb714a9c37d941ff1b5 this.profiler.push(() -> { return worldserver + " " + worldserver.dimension().location(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index f4d53d9bfe5b060158f69b5d9e4533a5b9869eed..35cc427755cccb123a866220bd2a72cdbd723465 100644 +index b78a9628a88f2a495ef6de74446a02a14d41a1f6..d328cc90fc6e333ea3079e462046a017a6cfc6f8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -225,6 +225,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -66,10 +66,10 @@ index b0e698b2532ed6af84ca2dd0d8b1c795921c5823..d5940e560ea890f7f017ff9c37939a48 public void doTick() { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9a94249834f8b0b8d3f6aeaf0c859ba875079250..0ade0256c3a227ea6a2971b2c5889b9935d52259 100644 +index 9073db9ad3627633f46314ae936d584fa400a9ce..41f3415c6c1b7a3ee2c733445bfefdc51089ecb5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2720,6 +2720,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2714,6 +2714,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event); diff --git a/patches/server/0010-AFK-API.patch b/patches/server/0010-AFK-API.patch index 3410e9046..218814b89 100644 --- a/patches/server/0010-AFK-API.patch +++ b/patches/server/0010-AFK-API.patch @@ -78,7 +78,7 @@ index d5940e560ea890f7f017ff9c37939a485be94540..f862bd65b535fc9e289b31260af69907 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 0ade0256c3a227ea6a2971b2c5889b9935d52259..34a369dd615c4701d1bfb66a51623eab8e0b3080 100644 +index 41f3415c6c1b7a3ee2c733445bfefdc51089ecb5..de9d79c5e83ccce5f6fc585435e18a481d790f38 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -326,6 +326,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -223,10 +223,10 @@ index aaa07fcd4b32fe0de88142ab30378327a01f1729..bc8555d21d418f9da37cc089904f7cb0 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 67bb2541fff19f0a48c7b1289e34749ece632d56..62e5bdd889392f6e2da73d093ff77ac355a4ea3c 100644 +index ef9b8e50522583aa9675ab4d15fc8285a311e2ec..54e2b4b116eadb1fdce15e4aee8e97d60fa2c8db 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -531,10 +531,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -527,10 +527,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setPlayerListName(String name) { @@ -243,7 +243,7 @@ index 67bb2541fff19f0a48c7b1289e34749ece632d56..62e5bdd889392f6e2da73d093ff77ac3 for (ServerPlayer player : (List) this.server.getHandle().players) { if (player.getBukkitEntity().canSee(this)) { player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle())); -@@ -3321,5 +3326,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3299,5 +3304,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public boolean usesPurpurClient() { return getHandle().purpurClient; } diff --git a/patches/server/0070-Entity-lifespan.patch b/patches/server/0070-Entity-lifespan.patch index 527592431..096a3e99c 100644 --- a/patches/server/0070-Entity-lifespan.patch +++ b/patches/server/0070-Entity-lifespan.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 2d29caa16c754b06cbfe91038b673668a1b61d02..c58ede27583fa14fffcc8554d58bb47a94886e40 100644 +index 22e0370498dac0f56e29ae483097bf453a277450..224e0453fc51224e8a4937a1d089053e54b6f9e0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2747,6 +2747,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2741,6 +2741,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl AABB axisalignedbb = entity.getBoundingBox(); if (axisalignedbb.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) { diff --git a/patches/server/0090-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0090-Add-option-to-disable-zombie-aggressiveness-towards-.patch index 7f6e878c5..a981b1550 100644 --- a/patches/server/0090-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/server/0090-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -index a08c00b8c0488d18be5e182f7892e5ab71d12247..338f693d098b6ab507c30f6411c9a952c34ba8e3 100644 +index cfe6a6f6bcfd7a3b29ab25f5a6745d31c18f338d..c168658d4d4ec1ddd80425e786d4435fd6576637 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -@@ -136,6 +136,10 @@ public class MobGoalHelper { +@@ -137,6 +137,10 @@ public class MobGoalHelper { static { // TODO these kinda should be checked on each release, in case obfuscation changes deobfuscationMap.put("abstract_skeleton_1", "abstract_skeleton_melee"); diff --git a/patches/server/0122-Add-EntityTeleportHinderedEvent.patch b/patches/server/0122-Add-EntityTeleportHinderedEvent.patch index 4d0909fc1..ce3e3d2e3 100644 --- a/patches/server/0122-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0122-Add-EntityTeleportHinderedEvent.patch @@ -55,7 +55,7 @@ index ee998d06804e344ea9d5b84ef0074b84aaba04c2..c51ac562d642061ce60db66ae9a86eec EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ())); world.getCraftServer().getPluginManager().callEvent(event); 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 9717b37aef9f487502e696c209ae209ab3b8f000..7291e4056b8e46ab59b71818388ac55fbb12993f 100644 +index 2e264b8b13df9da9163a80b3dd4345af3cff431c..7b27852682909b7d19942bbb517e6107534f61c2 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 @@ -178,6 +178,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity { @@ -89,10 +89,10 @@ index fed6671e518b2f1601bbf4154195a844fc3b0fd1..669405e0a38adc5336aa004011544346 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 62e5bdd889392f6e2da73d093ff77ac355a4ea3c..6413d01dbdabb2f9d9507403dca92391e9dc08bc 100644 +index 54e2b4b116eadb1fdce15e4aee8e97d60fa2c8db..f4f6a04144139491f0b051dd33e256df5e3c368c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1375,6 +1375,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1371,6 +1371,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API diff --git a/patches/server/0206-Extended-OfflinePlayer-API.patch b/patches/server/0206-Extended-OfflinePlayer-API.patch index c57eac638..57fdc89b4 100644 --- a/patches/server/0206-Extended-OfflinePlayer-API.patch +++ b/patches/server/0206-Extended-OfflinePlayer-API.patch @@ -223,10 +223,10 @@ index 2bbc39c257965ad91ee360cdfcd3538a0f041c7e..91fbc0cfc84045e32a4ee16fba8164de + // Purpur end - OfflinePlayer API } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6413d01dbdabb2f9d9507403dca92391e9dc08bc..0df4d72d82a4f047c6272af664ad61ee0117cf67 100644 +index f4f6a04144139491f0b051dd33e256df5e3c368c..f34b24ff4a5afade707206b74b0cf4a3f2f913de 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2547,6 +2547,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2565,6 +2565,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().getAbilities().walkingSpeed * 2f; } diff --git a/patches/server/0236-Allow-void-trading.patch b/patches/server/0236-Allow-void-trading.patch index e23a7dff5..8092f7222 100644 --- a/patches/server/0236-Allow-void-trading.patch +++ b/patches/server/0236-Allow-void-trading.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow void trading diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5db8e4c8879d355843c196b17b8f39e9fe5d9a6a..cc45c828775ac8551fb1efa208f8acc9a79e7f49 100644 +index 9418734ca37ccf79dd28b9aacf6f107511131d09..90328eec0aefa1447e03e0003f43f2a27959cab0 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2902,7 +2902,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2908,7 +2908,7 @@ public class ServerLevel extends Level implements WorldGenLevel { // Spigot Start if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message // Paper start diff --git a/patches/server/0263-Remove-Timings.patch b/patches/server/0263-Remove-Timings.patch index 6e3f3b87c..0058a1ad9 100644 --- a/patches/server/0263-Remove-Timings.patch +++ b/patches/server/0263-Remove-Timings.patch @@ -448,7 +448,7 @@ index 6e212f672579a3e08dc362c287be59ca5170d717..3c16bf34a63ca1391268da3678ea3b59 gameprofilerfiller.pop(); gameprofilerfiller.pop(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index cc45c828775ac8551fb1efa208f8acc9a79e7f49..7673c3be73a5e6527f04333047839edbaa778e8c 100644 +index 90328eec0aefa1447e03e0003f43f2a27959cab0..3c0b3db58f31c7b63ab798a7be6076c6cee5f9f6 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -867,7 +867,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -631,10 +631,10 @@ index cc45c828775ac8551fb1efa208f8acc9a79e7f49..7673c3be73a5e6527f04333047839edb } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 70c8b4ac1d1a06af280dcecafa6ccf4093b69c13..7865288eee0950c346801cc20aea9071a31fc6dc 100644 +index 417dd74c422411e9f85694e3a1a1e31024f5b55e..823f513f19dd5399b84342e2a860c3637bbf0516 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2458,7 +2458,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2452,7 +2452,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl public void handleCommand(String s) { // Paper - private -> public org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + s); // Paper - Add async catcher @@ -643,7 +643,7 @@ index 70c8b4ac1d1a06af280dcecafa6ccf4093b69c13..7865288eee0950c346801cc20aea9071 if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s); -@@ -2468,7 +2468,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2462,7 +2462,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl this.cserver.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -652,7 +652,7 @@ index 70c8b4ac1d1a06af280dcecafa6ccf4093b69c13..7865288eee0950c346801cc20aea9071 return; } -@@ -2481,7 +2481,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -2475,7 +2475,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); return; } finally { diff --git a/patches/server/0264-Remove-Mojang-Profiler.patch b/patches/server/0264-Remove-Mojang-Profiler.patch index 244cd67f4..a32fc0583 100644 --- a/patches/server/0264-Remove-Mojang-Profiler.patch +++ b/patches/server/0264-Remove-Mojang-Profiler.patch @@ -37,6 +37,56 @@ index 428dd75450bdd5daf902a1fbaca7031a9bc585a8..c1202a56b560269e132eafd8bb123834 + //commandlistenerwrapper.getServer().getProfiler().pop(); // Purpur } + } +diff --git a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java +index 05e1c94268cf5c6897807cd7acced652856a09ea..d1c7effca3592a234925657136f750717d696873 100644 +--- a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java ++++ b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java +@@ -43,9 +43,9 @@ public class BuildContexts> { + ChainModifiers chainModifiers = flags; + List list = sources; + if (contextChain.getStage() != Stage.EXECUTE) { +- context.profiler().push(() -> { ++ /*context.profiler().push(() -> { // Purpur + return "prepare " + this.commandInput; +- }); ++ });*/ // Purpur + + try { + for(int i = context.forkLimit(); contextChain.getStage() != Stage.EXECUTE; contextChain = contextChain.nextStage()) { +@@ -88,7 +88,7 @@ public class BuildContexts> { + } + } + } finally { +- context.profiler().pop(); ++ // context.profiler().pop(); // Purpur + } + } + +diff --git a/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java b/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java +index 821dc4aeaf48460000682604fba51b340b9738e7..3aa2ce6a2a3d3cdfc372a60419a09f49002339da 100644 +--- a/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java ++++ b/src/main/java/net/minecraft/commands/execution/tasks/ExecuteCommand.java +@@ -23,9 +23,9 @@ public class ExecuteCommand> implements Unbo + + @Override + public void execute(T executionCommandSource, ExecutionContext executionContext, Frame frame) { +- executionContext.profiler().push(() -> { ++ /*executionContext.profiler().push(() -> { // Purpur + return "execute " + this.commandInput; +- }); ++ });*/ // Purpur + + try { + executionContext.incrementCost(); +@@ -37,7 +37,7 @@ public class ExecuteCommand> implements Unbo + } catch (CommandSyntaxException var9) { + executionCommandSource.handleError(var9, this.modifiers.isForked(), executionContext.tracer()); + } finally { +- executionContext.profiler().pop(); ++ // executionContext.profiler().pop(); // Purpur + } + } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index f1037c50605f1bf0f5dad383e245d93a8bcf6f8b..e764ad7096852d8905422e8d0f140ed16c5b4498 100644 @@ -563,7 +613,7 @@ index 3c16bf34a63ca1391268da3678ea3b59fa5d4190..1a22b58e2ce7a4e7034898e9fe24f238 } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7673c3be73a5e6527f04333047839edbaa778e8c..124868caa3c809875571f2c4a2ad0b7051dfd457 100644 +index 3c0b3db58f31c7b63ab798a7be6076c6cee5f9f6..90fd350cec2ca726ff6707ab2cd3c7afb28def7f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -825,16 +825,16 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -812,7 +862,7 @@ index 1093ef4e97d3bc84802d4fc96a6f95a5a24624b9..adbce4f4334c8857f0ab2fec910ba388 this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities())); playerlist.sendLevelInfo(this, worldserver); diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java -index 04b9f56134a24385468c16c61cf84327263dcb88..83b79a93acb8387d6d432f8e816acf50bfb89832 100644 +index 470b34ace7dc356ce59af11962f232466685eb0a..7372713dc195582f9cc994063541a45988b6b457 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java @@ -209,7 +209,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack @@ -1038,7 +1088,7 @@ index 2e6e8eac987c4ef6b2dcd3de592d8a51d2b29792..863343a87fe34d72f04af89d75268b47 }; } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 61aaf79bb631c37680d04168519a4e2e6af1ccc0..82f649715a566a5bbbbc175877bd344d96e41a2d 100644 +index c2dd8373108d46bfdba2bc1fea7c60ce02a303e4..381ca3207b4d7b7ca3b30e0ba2d0834dd69d1d0e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -835,7 +835,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S @@ -1629,6 +1679,24 @@ index 15fd1af0773ba1254a429240444f48e68e29ee74..1d36459ee10da702d65b4a6d139a05fd this.updateActivity(); } +diff --git a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java +index ab183a7d94a27d5235ff33ce7784c92d66d40b89..94431d5c789a9f558c16c0d1fc8f1f7463421ec6 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java ++++ b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java +@@ -200,10 +200,10 @@ public class Breeze extends Monster { + + @Override + protected void customServerAiStep() { +- this.level().getProfiler().push("breezeBrain"); ++ // this.level().getProfiler().push("breezeBrain"); // Purpur + this.getBrain().tick((ServerLevel)this.level(), this); +- this.level().getProfiler().popPush("breezeActivityUpdate"); +- this.level().getProfiler().pop(); ++ // this.level().getProfiler().popPush("breezeActivityUpdate"); // Purpur ++ // this.level().getProfiler().pop(); // Purpur + super.customServerAiStep(); + } + diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java index a3a21f0c102cadcbe5882de716e90272fddd7f8c..468351b78af72c5ce998f9179f14d53951e95e46 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -1719,7 +1787,7 @@ index a46fc13b3072b65dc9284ece6cbf63a743b5c1a7..fe68013f8efa35e6dfcf658df3b33d9d this.assignProfessionWhenSpawned = false; } diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index c790418ff4584af20db006a3e8770f261bab271e..370952a7be8df3ea00c0816235d84927df4ed79d 100644 +index 9442f58dff89ec843c321533965fbee2727d02f8..17abd085b3faf88e10a44a6c98af996892cc4e58 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -659,7 +659,7 @@ public class Explosion { diff --git a/patches/server/0267-Debug-Marker-API.patch b/patches/server/0267-Debug-Marker-API.patch index f796cb495..656e53a4d 100644 --- a/patches/server/0267-Debug-Marker-API.patch +++ b/patches/server/0267-Debug-Marker-API.patch @@ -99,10 +99,10 @@ index 648be304b99793fcec850ee6f3965baf1cd679d8..14df9ede813b64f87d97a1ffa9602436 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 0df4d72d82a4f047c6272af664ad61ee0117cf67..ece49c9be55d4f356bf1ea53ec06cd60e02b7eae 100644 +index f34b24ff4a5afade707206b74b0cf4a3f2f913de..1475964d04ebdcc08b4f67a516216162d8f8db2e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3367,5 +3367,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3345,5 +3345,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void resetIdleTimer() { getHandle().resetLastActionTime(); } diff --git a/patches/server/0271-Add-death-screen-API.patch b/patches/server/0271-Add-death-screen-API.patch index 72e111531..eb8ffa019 100644 --- a/patches/server/0271-Add-death-screen-API.patch +++ b/patches/server/0271-Add-death-screen-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ece49c9be55d4f356bf1ea53ec06cd60e02b7eae..6f52c5f94a8ac8c04c61c551d2345ad72272942e 100644 +index 1475964d04ebdcc08b4f67a516216162d8f8db2e..c0780208bbdcb7a4c67ce107312e57c3de681a5a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3405,5 +3405,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3383,5 +3383,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (this.getHandle().connection == null) return; this.getHandle().connection.send(new net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket(new net.minecraft.network.protocol.common.custom.GameTestClearMarkersDebugPayload())); } diff --git a/patches/server/0273-Add-item-packet-serialize-event.patch b/patches/server/0273-Add-item-packet-serialize-event.patch index 76908d388..aa323dbd6 100644 --- a/patches/server/0273-Add-item-packet-serialize-event.patch +++ b/patches/server/0273-Add-item-packet-serialize-event.patch @@ -48,10 +48,10 @@ index e764ad7096852d8905422e8d0f140ed16c5b4498..39ecb12d4296852ee5865dcfa2b8b6c3 while (iterator.hasNext()) { ServerLevel worldserver = (ServerLevel) iterator.next(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d651b8c6254a28fc55f9a9c3f264f83a265bf316..f6752e45902ecb4219d27a2a2f2668a40d4f54f8 100644 +index 22020b5746988cf30385cc075c8e0b1309c99d69..6c5f5c19048ec52c088044f2bc34f54b937b1912 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3378,6 +3378,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl +@@ -3372,6 +3372,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl } } } diff --git a/patches/server/0297-Explorer-Map-API.patch b/patches/server/0297-Explorer-Map-API.patch index b1f59284b..0e5c4da40 100644 --- a/patches/server/0297-Explorer-Map-API.patch +++ b/patches/server/0297-Explorer-Map-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Explorer Map API diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java -index cd841f027edbe7e000d633034a2aa6a214c20b5b..ad90732cd424d4a1b569f708a6719a9934dee6dc 100644 +index 797415866a7f182d804f6b8e57ceb07a6ac2a20a..6cfd169c2c32b644d70907358c2d4a2087c00a68 100644 --- a/src/main/java/net/minecraft/world/item/MapItem.java +++ b/src/main/java/net/minecraft/world/item/MapItem.java -@@ -243,6 +243,7 @@ public class MapItem extends ComplexItem { +@@ -235,6 +235,7 @@ public class MapItem extends ComplexItem { MapItemSavedData worldmap = MapItem.getSavedData(map, world); if (worldmap != null) {