diff --git a/gradle.properties b/gradle.properties index 84ca4e453..57fb3c2b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19.4-R0.1-SNAPSHOT -paperCommit = 9b77660f070a0ea2c0d82293d731ff19f60e9787 +paperCommit = ad6c14c62ea4756c6a5a7f9752131a3b90a5cd96 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 8efcb18ea..ae2a304cc 100644 --- a/patches/server/0005-Purpur-client-support.patch +++ b/patches/server/0005-Purpur-client-support.patch @@ -43,10 +43,10 @@ index b357953dedc2af39673ad4ef78fed14d5e7235bb..ed6631d2b104542465d28683cd4fd322 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 589783e93785196eb9f7ff6890c03e84f3102d93..722ba7f34d4f6c0d470f6a933da61837442e1c68 100644 +index 8dbba0e1fe1baa3fa7f3d69c8f28e87e39a2d7a5..1ebb96da67c874d3194c314237e1d8c05b5323e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3161,4 +3161,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3167,4 +3167,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 d767e7371..6608ad476 100644 --- a/patches/server/0012-AFK-API.patch +++ b/patches/server/0012-AFK-API.patch @@ -218,7 +218,7 @@ 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 722ba7f34d4f6c0d470f6a933da61837442e1c68..10d52b858be9ab93bd934bf9ca35f272410c3c96 100644 +index 1ebb96da67c874d3194c314237e1d8c05b5323e4..354ee1f6e56413e270ec1a94c156b849e9e8e2a7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -528,10 +528,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -238,7 +238,7 @@ index 722ba7f34d4f6c0d470f6a933da61837442e1c68..10d52b858be9ab93bd934bf9ca35f272 for (ServerPlayer player : (List) server.getHandle().players) { if (player.getBukkitEntity().canSee(this)) { player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle())); -@@ -3167,5 +3172,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3173,5 +3178,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 a668f39ca..90a9666f1 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0018-Player-invulnerabilities.patch @@ -108,7 +108,7 @@ index 951dfa2b71695d2cf3dd3c14a9f7c9165e5c5a4d..470f44cd4627ab48573a22714ccd088b 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 3af2e1eabfa3e49f2aad676fe1516f749f289285..f50689f9a9e74856725f92817892c1af0edf340d 100644 +index 6bd992fd206673cc1c9150f25f27715d261f31d0..4e808684dc7fef577718f63d5ca303e838ea6195 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -966,6 +966,8 @@ public abstract class PlayerList { @@ -121,10 +121,10 @@ index 3af2e1eabfa3e49f2aad676fe1516f749f289285..f50689f9a9e74856725f92817892c1af 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 10d52b858be9ab93bd934bf9ca35f272410c3c96..6ad913ee78570db794fd2953cc1320905fa557de 100644 +index 354ee1f6e56413e270ec1a94c156b849e9e8e2a7..78c9113885052ce04cbc6481d777e9177dab09d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3187,5 +3187,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3193,5 +3193,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void resetIdleTimer() { getHandle().resetLastActionTime(); } @@ -146,7 +146,7 @@ index 10d52b858be9ab93bd934bf9ca35f272410c3c96..6ad913ee78570db794fd2953cc132090 // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 21a33a7952ea9d70df45a99e82286713fd939696..786c1e30c56dfe28d00a9727c97d837cf7310ad3 100644 +index cbb750eabb892348b3b6632782e9eef9b125d16d..5bda6411f4c419cf6c0f8b6e498ec22f3f34da3a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -97,6 +97,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0061-Mending-mends-most-damages-equipment-first.patch b/patches/server/0061-Mending-mends-most-damages-equipment-first.patch index cf2606c40..ad257fc07 100644 --- a/patches/server/0061-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0061-Mending-mends-most-damages-equipment-first.patch @@ -18,10 +18,10 @@ index 2d3994de8e40eedc78c27ea842b6265b1c5ea822..7043f15f84d6c847bf376025c8e2150b if (entry != null) { ItemStack itemstack = (ItemStack) entry.getValue(); diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index d690b8d0c1da1f56b226376df8c76c34375e3c73..b7f234011011f8d74a65c2501c5855994bb70c3a 100644 +index 3bfef8ed7dd73f603aef06172f362bb0ed0a5c83..ea5baa4d99028feb94ccc3ce988257e56263b3c6 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -559,6 +559,16 @@ public final class ItemStack { +@@ -553,6 +553,16 @@ public final class ItemStack { return this.isDamageableItem() && this.getDamageValue() > 0; } @@ -73,7 +73,7 @@ index ecf640b00007a386290f8dfe9935a8aa610079fd..2048899f8e4c8211e8dde0d11148d647 public static Map.Entry getRandomItemWith(Enchantment enchantment, LivingEntity entity) { return getRandomItemWith(enchantment, entity, (stack) -> { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8f1b86b3511615281aca45cf7ffba506bbd09e0d..b36b6e836c5f221434f58143265bd36687b02b75 100644 +index 06f0e13063fc8e5438bce551c88b8d3b7b12d6d9..d1c45c19697408fd97448953bada1de1edc67b1d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -97,6 +97,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0062-Add-5-second-tps-average-in-tps.patch b/patches/server/0062-Add-5-second-tps-average-in-tps.patch index 0d079dd31..e70a1dde3 100644 --- a/patches/server/0062-Add-5-second-tps-average-in-tps.patch +++ b/patches/server/0062-Add-5-second-tps-average-in-tps.patch @@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216 setListData(vector); } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ffc045d1bf40e620fb8364ac8694f39afdb9067b..585b5cd7361c01157ba279f21fea05e990738e34 100644 +index ceaafede643bac0b6714df3d5475b4cb03b2eaed..65ba915d3644b638ce3b5314c0aed5b2018f67e0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -305,7 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0 && args[0].equals("mem") && sender.hasPermission("bukkit.command.tpsmemory")) { - sender.sendMessage(net.kyori.adventure.text.Component.text() - .append(net.kyori.adventure.text.Component.text("Current Memory Usage: ", net.kyori.adventure.text.format.NamedTextColor.GOLD)) diff --git a/patches/server/0063-Implement-elytra-settings.patch b/patches/server/0063-Implement-elytra-settings.patch index faef2ca54..3962394b6 100644 --- a/patches/server/0063-Implement-elytra-settings.patch +++ b/patches/server/0063-Implement-elytra-settings.patch @@ -54,10 +54,10 @@ index 82b0bda3e35ec2157a477e1a17b2b46baadc97d9..0fc45b1048a1c4e0dc2bd1ae0437eecb itemStack.shrink(1); } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory(); diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index b7f234011011f8d74a65c2501c5855994bb70c3a..a6a54269a1a6028a730b56e964a465452f70ec86 100644 +index ea5baa4d99028feb94ccc3ce988257e56263b3c6..cdadba82f91c599aef557b808ad4184506a6f632 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -588,7 +588,7 @@ public final class ItemStack { +@@ -582,7 +582,7 @@ public final class ItemStack { int j; if (amount > 0) { @@ -66,7 +66,7 @@ index b7f234011011f8d74a65c2501c5855994bb70c3a..a6a54269a1a6028a730b56e964a46545 int k = 0; for (int l = 0; j > 0 && l < amount; ++l) { -@@ -643,6 +643,12 @@ public final class ItemStack { +@@ -637,6 +637,12 @@ public final class ItemStack { if (this.hurt(amount, entity.getRandom(), entity /*instanceof ServerPlayer ? (ServerPlayer) entity : null*/)) { // Paper - pass LivingEntity for EntityItemDamageEvent breakCallback.accept(entity); Item item = this.getItem(); @@ -99,7 +99,7 @@ index 9365f886a23a71c41091b22d46896ff18a5a0635..41bd45c0720751f348b5cf6eaecac439 entityhuman.startAutoSpinAttack(20); if (entityhuman.isOnGround()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b36b6e836c5f221434f58143265bd36687b02b75..7a20e3b127edf85de93d1ea0d1dbee3a06f11e43 100644 +index d1c45c19697408fd97448953bada1de1edc67b1d..67ffbf096e4fcd29266eb329451213c72415e439 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -114,6 +114,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0156-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0156-Config-to-allow-for-unsafe-enchants.patch index a957a5139..a389d738d 100644 --- a/patches/server/0156-Config-to-allow-for-unsafe-enchants.patch +++ b/patches/server/0156-Config-to-allow-for-unsafe-enchants.patch @@ -70,10 +70,10 @@ index 2281dba58d32b6314a7abcdb103c03c7056c24e9..37c79c0e13e6d7b6b03ebdf57bebf124 ((ServerPlayer) player).connection.send(new ClientboundContainerSetDataPacket(containerId, 0, cost.get())); } diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index a6a54269a1a6028a730b56e964a465452f70ec86..a4d5f08da2a2082d2e2c56fa3e8e825a6ba5707c 100644 +index cdadba82f91c599aef557b808ad4184506a6f632..94c4a410651564e2103454b26fd0e1f4e430cc74 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -1189,6 +1189,12 @@ public final class ItemStack { +@@ -1183,6 +1183,12 @@ public final class ItemStack { return this.tag != null && this.tag.contains("Enchantments", 9) ? !this.tag.getList("Enchantments", 10).isEmpty() : false; } diff --git a/patches/server/0215-Extended-OfflinePlayer-API.patch b/patches/server/0215-Extended-OfflinePlayer-API.patch index cd6b563b1..36beb9bda 100644 --- a/patches/server/0215-Extended-OfflinePlayer-API.patch +++ b/patches/server/0215-Extended-OfflinePlayer-API.patch @@ -223,10 +223,10 @@ index 714afc98b5150907b45a00060be4e41582333204..312a6d90c0a09570aef24c205dc2ff27 + // 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 37865836db462b365c1fd5cb43f610295b80cf84..85f89f26a65d659976eef400713541058f23de31 100644 +index 2844755e15620c6c58421240b723cf2ce9ecfe7f..e2ab9dab3584763a1b4c73da33d0208cd9a88270 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2378,6 +2378,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2384,6 +2384,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.getHandle().getAbilities().walkingSpeed * 2f; } diff --git a/patches/server/0245-Allow-void-trading.patch b/patches/server/0245-Allow-void-trading.patch index ad2e0f92b..f212a9b92 100644 --- a/patches/server/0245-Allow-void-trading.patch +++ b/patches/server/0245-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 88722e911bb342d989c0d750f90bc4224351d0ed..b58c07f454fa0b6911f344899c414983fda4b115 100644 +index 169eb774eea589cab7daec9fe5764a639ecd8ed4..3bf150a5f9ce1d497bf80174b80eca82c5fe06b5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2685,7 +2685,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -2687,7 +2687,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 @@ -18,7 +18,7 @@ index 88722e911bb342d989c0d750f90bc4224351d0ed..b58c07f454fa0b6911f344899c414983 } // Paper end diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 904849c26b8ef5197500a45b371f49411e415100..8ab5e0ec388f18196242c8fa1672a4729019bdbe 100644 +index a7f2ae2ff3f1ad928768851dc286687d28748bc3..915099ab343d1fd65ba779ef70ebc704612f246a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -425,6 +425,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0258-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0258-Add-toggle-for-enchant-level-clamping.patch index 925e5a75c..071b1a3a3 100644 --- a/patches/server/0258-Add-toggle-for-enchant-level-clamping.patch +++ b/patches/server/0258-Add-toggle-for-enchant-level-clamping.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for enchant level clamping diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 6dcddac2bce3d3689f580906288e2e6f1d679da4..bd577a09169791aab81c65f498aac29e9fcb06b1 100644 +index 4881a62cb4735b76c304e9290a7341dca98f22bc..cc75080762e117b799a804cd7e8a3e223611e574 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -1183,7 +1183,7 @@ public final class ItemStack { +@@ -1177,7 +1177,7 @@ public final class ItemStack { ListTag nbttaglist = this.tag.getList("Enchantments", 10); diff --git a/patches/server/0280-Debug-Marker-API.patch b/patches/server/0280-Debug-Marker-API.patch index 245e8e978..79c59563a 100644 --- a/patches/server/0280-Debug-Marker-API.patch +++ b/patches/server/0280-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 9b06d1fbad26abb2daf9d9034239ffa28bd42952..b16437c40a5e9b329efc1c41cb5e1c348b35aae8 100644 +index 09c827d21581318f282a9a17a8f8f95d26d4d1d0..5e7162866530c323f50ea99183757622cc6b2b97 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1446,6 +1446,42 @@ public final class CraftServer implements Server { @@ -99,10 +99,10 @@ index 24b390702d6abc256aee4a282cca64a654b95bd8..c6a3b59c65466f9f2b16cefe0059a6e5 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 85f89f26a65d659976eef400713541058f23de31..e45dc7306bfbc0516995104005e6564ec4b1a797 100644 +index e2ab9dab3584763a1b4c73da33d0208cd9a88270..d27d31233a937f4e2e6e7486594f665b107f12c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3228,5 +3228,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3234,5 +3234,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) { getHandle().spawnInvulnerableTime = spawnInvulnerableTime; } diff --git a/patches/server/0284-Add-death-screen-API.patch b/patches/server/0284-Add-death-screen-API.patch index 891e3826b..11636fabb 100644 --- a/patches/server/0284-Add-death-screen-API.patch +++ b/patches/server/0284-Add-death-screen-API.patch @@ -30,10 +30,10 @@ index 53b75f5737a910ffc5448cd9a85eae57f9c1488f..ea95873dd034779e56a8b924cd27f937 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index e45dc7306bfbc0516995104005e6564ec4b1a797..b7f1382d48a66f78c4492b0f8b90c16116a90220 100644 +index d27d31233a937f4e2e6e7486594f665b107f12c6..264660979ead8b523248f0828591531105b8d143 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -3271,5 +3271,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3277,5 +3277,18 @@ 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()))); }