diff --git a/gradle.properties b/gradle.properties index 48cb673cd..3e204e1fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.20.1-R0.1-SNAPSHOT mcVersion = 1.20.1 -paperCommit = 9bc70e6888c670750547caf0f9d692c011111d26 +paperCommit = 23c44c2b8d88b287060cc61be58e8d86f1ee5c54 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0005-Purpur-client-support.patch b/patches/api/0005-Purpur-client-support.patch index 0d4d63b3d..f95d2d8a1 100644 --- a/patches/api/0005-Purpur-client-support.patch +++ b/patches/api/0005-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 14c92390aeaeee518f43778ccd5fc820fdc62689..34f3fed298840b4e1bf8ec787999bdd1d7cc1d82 100644 +index e3a6c9fc63b36663d33c6a1513e7dc1522790d85..62075eed2bdcd1611414fa969832d9706a1b186e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3241,4 +3241,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3245,4 +3245,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Override Spigot spigot(); // Spigot end diff --git a/patches/api/0010-AFK-API.patch b/patches/api/0010-AFK-API.patch index 5e113fab4..ca3b9e6bf 100644 --- a/patches/api/0010-AFK-API.patch +++ b/patches/api/0010-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 34f3fed298840b4e1bf8ec787999bdd1d7cc1d82..e595d8f4858c70e6ad1a9cbcd4c48276a9652036 100644 +index 62075eed2bdcd1611414fa969832d9706a1b186e..42624ec551509e565f6c0c0b4cc5b4c7ba1f1575 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3249,5 +3249,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3253,5 +3253,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @return True if Player uses Purpur Client */ public boolean usesPurpurClient(); diff --git a/patches/api/0016-Player-invulnerabilities.patch b/patches/api/0016-Player-invulnerabilities.patch index 64515f93b..931b15de9 100644 --- a/patches/api/0016-Player-invulnerabilities.patch +++ b/patches/api/0016-Player-invulnerabilities.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e595d8f4858c70e6ad1a9cbcd4c48276a9652036..c5ed6ced17316c0af396520f7f1fa25bdc1a944d 100644 +index 42624ec551509e565f6c0c0b4cc5b4c7ba1f1575..43448b96b5261e11bfb284e1efe726eb3e9cbeee 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3268,5 +3268,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3272,5 +3272,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Reset the idle timer back to 0 */ void resetIdleTimer(); diff --git a/patches/api/0045-Debug-Marker-API.patch b/patches/api/0045-Debug-Marker-API.patch index b8c3cdc62..970b0daa3 100644 --- a/patches/api/0045-Debug-Marker-API.patch +++ b/patches/api/0045-Debug-Marker-API.patch @@ -260,10 +260,10 @@ index 1fba792419ea6b5e8c640a2599e4b2dd16ee87d0..bf39c6602cfca70a6352519fa26059cd /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c5ed6ced17316c0af396520f7f1fa25bdc1a944d..3e826f0be104d98c2676b429a5a9b66ca437f681 100644 +index 43448b96b5261e11bfb284e1efe726eb3e9cbeee..d48ec786ed86bdffdf7fe0320967e11b7af78bd5 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3289,5 +3289,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3293,5 +3293,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param invulnerableTicks Invulnerable ticks remaining */ void setSpawnInvulnerableTicks(int invulnerableTicks); diff --git a/patches/api/0046-Add-death-screen-API.patch b/patches/api/0046-Add-death-screen-API.patch index cb11b8ef3..414e951a2 100644 --- a/patches/api/0046-Add-death-screen-API.patch +++ b/patches/api/0046-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 3e826f0be104d98c2676b429a5a9b66ca437f681..fb99e05b4769af604f41d81f036cee3b8a6ec197 100644 +index d48ec786ed86bdffdf7fe0320967e11b7af78bd5..2e41fad4c033de003f89ab4ab549d2bf47ad7d4f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3359,5 +3359,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3363,5 +3363,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Clears all debug block highlights */ void clearBlockHighlights(); diff --git a/patches/server/0005-Purpur-client-support.patch b/patches/server/0005-Purpur-client-support.patch index caa70217b..92ec408a3 100644 --- a/patches/server/0005-Purpur-client-support.patch +++ b/patches/server/0005-Purpur-client-support.patch @@ -43,10 +43,10 @@ index f2e71c26c889bdee2cd2b86dcde9d4c35a3574bd..e7f05af80292b7e60018a9b1d83616cf 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 5bbded65095dccfadaf7576fc41b5f62974878b4..bb3ed33e20feebe3b36e24708496adf46c381525 100644 +index 9273d21d59bfd93d6480e57b83ebc4b8df2cc758..519bd3e027c9a78c81d129f44affa0aabaeea220 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3212,4 +3212,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3227,4 +3227,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.spigot; } // Spigot end diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0012-AFK-API.patch index d85835ac2..39c4ad892 100644 --- a/patches/server/0012-AFK-API.patch +++ b/patches/server/0012-AFK-API.patch @@ -224,10 +224,10 @@ index 3b959f42d958bf0f426853aee56753d6c455fcdb..d17abb283ea818244df0379d6b57fc63 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 bb3ed33e20feebe3b36e24708496adf46c381525..673ac3704eee0b2aa576fe197abb8af5d8986e7e 100644 +index 519bd3e027c9a78c81d129f44affa0aabaeea220..0281285ef491ef0abc1266601420345ba679a3be 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -510,10 +510,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -509,10 +509,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public void setPlayerListName(String name) { @@ -244,7 +244,7 @@ index bb3ed33e20feebe3b36e24708496adf46c381525..673ac3704eee0b2aa576fe197abb8af5 for (ServerPlayer player : (List) server.getHandle().players) { if (player.getBukkitEntity().canSee(this)) { player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle())); -@@ -3218,5 +3223,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3233,5 +3238,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public boolean usesPurpurClient() { return getHandle().purpurClient; } diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch index 97189bfb4..291e89d34 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0018-Player-invulnerabilities.patch @@ -121,10 +121,10 @@ index 1abb122a33eaf55de752d3d91bca8c1ee888dfd4..1897c0e8922aa654f03267cb8ad1a06a 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 673ac3704eee0b2aa576fe197abb8af5d8986e7e..19e970bea9424deb69120b382190d194bb20a130 100644 +index 0281285ef491ef0abc1266601420345ba679a3be..4a775ffe8880c90def23e421fd3de17f9440f728 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3238,5 +3238,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3253,5 +3253,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void resetIdleTimer() { getHandle().resetLastActionTime(); } diff --git a/patches/server/0105-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0105-Apply-display-names-from-item-forms-of-entities-to-e.patch index e58df10cc..79399e4c6 100644 --- a/patches/server/0105-Apply-display-names-from-item-forms-of-entities-to-e.patch +++ b/patches/server/0105-Apply-display-names-from-item-forms-of-entities-to-e.patch @@ -19,10 +19,10 @@ index 5524a69952130ec38e151509ba7733459146d1b0..76222084727c269d376d0df5702204c0 } diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -index 955316687e2e29ad75a0052317a7b0f89034c82a..19fa9b30768e1d3d095b5efdde1399d5ac7df821 100644 +index 759ecd79534a7706f7d4a63eb9dacbefcfe54674..182faba889dc15a3500c5919cad8a5483a53033a 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java -@@ -272,7 +272,13 @@ public class ItemFrame extends HangingEntity { +@@ -273,7 +273,13 @@ public class ItemFrame extends HangingEntity { } if (alwaysDrop) { diff --git a/patches/server/0126-Add-EntityTeleportHinderedEvent.patch b/patches/server/0126-Add-EntityTeleportHinderedEvent.patch index 3604798bc..3ee4ff584 100644 --- a/patches/server/0126-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0126-Add-EntityTeleportHinderedEvent.patch @@ -89,10 +89,10 @@ index 7d744d5b6a9e593e657233b2192f2837bf360deb..98f7d917f8377927472414bee79d2de4 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 19e970bea9424deb69120b382190d194bb20a130..674d836966f0657120d65aa4fae09f202f13dd09 100644 +index 4a775ffe8880c90def23e421fd3de17f9440f728..ee2ce224defb5174f112ab25d7f470e2ce02a605 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1348,6 +1348,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1347,6 +1347,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API diff --git a/patches/server/0212-Extended-OfflinePlayer-API.patch b/patches/server/0212-Extended-OfflinePlayer-API.patch index 4b46a5999..fdf24fa15 100644 --- a/patches/server/0212-Extended-OfflinePlayer-API.patch +++ b/patches/server/0212-Extended-OfflinePlayer-API.patch @@ -223,10 +223,10 @@ index c6129dc565b8f874b73e2fefcabd4be1c221fd73..07050f97621c0cb68b48bf39fb9c9067 + // 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 674d836966f0657120d65aa4fae09f202f13dd09..eee650dc8ea13657d6be2530d8f637522a2e1303 100644 +index ee2ce224defb5174f112ab25d7f470e2ce02a605..2a0c5b3dc171705d09aa1eccb094d2792d7332f2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2450,6 +2450,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2465,6 +2465,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().getAbilities().walkingSpeed * 2f; } diff --git a/patches/server/0274-Debug-Marker-API.patch b/patches/server/0274-Debug-Marker-API.patch index 7e3d431c6..7ffe5cb0c 100644 --- a/patches/server/0274-Debug-Marker-API.patch +++ b/patches/server/0274-Debug-Marker-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Debug Marker API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d84e3e0f24c553acdbc71d096e1f000c669313cc..1f70b0e41915516a4826ad3ffb05876325ad941a 100644 +index 77d80968f684947290044e8686132d2e4d4fcb8a..89f4e1146a22ee9dc610b67d0316dd9412e33a24 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1566,6 +1566,42 @@ public final class CraftServer implements Server { @@ -52,7 +52,7 @@ index d84e3e0f24c553acdbc71d096e1f000c669313cc..1f70b0e41915516a4826ad3ffb058763 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 4720939d138300ed410871e40d3d2800224a7987..f30c6e09adb3a6aa485357f859fc2a22227350c9 100644 +index a2e852adf47261b1b2eb9734cc90f4676ed58126..1392e483c363e25d1f16465d876cb7d7c70afa68 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2294,6 +2294,42 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -99,10 +99,10 @@ index 4720939d138300ed410871e40d3d2800224a7987..f30c6e09adb3a6aa485357f859fc2a22 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index eee650dc8ea13657d6be2530d8f637522a2e1303..7c2848019f4829754156d2a163d7974d9390d75f 100644 +index 2a0c5b3dc171705d09aa1eccb094d2792d7332f2..71532b6ffed71a4e4f77ba1bb6d90abb0ff583b7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3279,5 +3279,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3294,5 +3294,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) { getHandle().spawnInvulnerableTime = spawnInvulnerableTime; } diff --git a/patches/server/0278-Add-death-screen-API.patch b/patches/server/0278-Add-death-screen-API.patch index 698558ecb..f2853c6a2 100644 --- a/patches/server/0278-Add-death-screen-API.patch +++ b/patches/server/0278-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 7c2848019f4829754156d2a163d7974d9390d75f..cdbbdb3f5a8b43811c564d1444a2b102add3ba72 100644 +index 71532b6ffed71a4e4f77ba1bb6d90abb0ff583b7..8b808264b8f3cc2ceb794fdd8aef7792bd18b269 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3322,5 +3322,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3337,5 +3337,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (this.getHandle().connection == null) return; this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket(ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_CLEAR, new FriendlyByteBuf(io.netty.buffer.Unpooled.buffer()))); }