diff --git a/gradle.properties b/gradle.properties index 2ba030130..1b92eda4c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19.3-R0.1-SNAPSHOT -paperCommit = b1b19b67f255bb586cc36337946bd4d24d9c9b6f +paperCommit = 4da844f1e3e375a24a0e518b0787ae909fa0e247 org.gradle.caching = true org.gradle.parallel = true 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 b2b2b5928..1314c4545 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 cf5c7e8557b0084039a94ef881a36aa9e3f58daf..e3148983e1bf6f7c972a5794d99c03f7 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 8450a22b0fc6e8dc5cad0f61ac52a82b3cd3791e..6538405cae3b601dd19254a0b59c37f9e54f74c8 100644 +index 6860096cb8c0deecc9c1d87543d1128fb95fd2d4..16fb80fba4cd7dc72ffd985530f2b8ed2dcc8330 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -543,6 +543,16 @@ public final class ItemStack { +@@ -544,6 +544,16 @@ public final class ItemStack { return this.isDamageableItem() && this.getDamageValue() > 0; } @@ -73,7 +73,7 @@ index 064783822333d11120daa28f3be5099e10510b72..659cd2d43d3cabc9bcc50857d6de858f 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 4cc496fb8d2947a71e0e294e94cb4a251f563da4..69b1b87bf38577a78a6cf3f3925bf04b653d63ea 100644 +index d209b34225d3cb7bf4cb6346aa31ea738c321bfc..ee80adb562a1cdc7b0cc47ef156f5c42fe20ae9c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -98,6 +98,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0063-Implement-elytra-settings.patch b/patches/server/0063-Implement-elytra-settings.patch index c2caf9f17..39aa679f3 100644 --- a/patches/server/0063-Implement-elytra-settings.patch +++ b/patches/server/0063-Implement-elytra-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 406f067011dd46696564214d2afd76460ee22384..039212093b5e2671fb6d53371bfe48da4d0c116b 100644 +index 3a60ff6ef2dfbc0b4c5d81c629e555f4a612a02a..e7f94a0684e4b38543ac34ffb3b8bed8ace551b1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3515,7 +3515,16 @@ public abstract class LivingEntity extends Entity { @@ -54,10 +54,10 @@ index 783791cf501d6ed3975aa82b958d7437158909ba..eb093b151e2d04476e38e3e066688823 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 6538405cae3b601dd19254a0b59c37f9e54f74c8..7d721cf67b688dfd05d8d847c47626de1f6f3392 100644 +index 16fb80fba4cd7dc72ffd985530f2b8ed2dcc8330..6acd0002a29a698ef5f993bad28bbe8e646eed48 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -572,7 +572,7 @@ public final class ItemStack { +@@ -573,7 +573,7 @@ public final class ItemStack { int j; if (amount > 0) { @@ -66,7 +66,7 @@ index 6538405cae3b601dd19254a0b59c37f9e54f74c8..7d721cf67b688dfd05d8d847c47626de int k = 0; for (int l = 0; j > 0 && l < amount; ++l) { -@@ -627,6 +627,12 @@ public final class ItemStack { +@@ -628,6 +628,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 69b1b87bf38577a78a6cf3f3925bf04b653d63ea..41d0db18b0358061c5b6e12118619a4128f16273 100644 +index ee80adb562a1cdc7b0cc47ef156f5c42fe20ae9c..e00b3d564416917e6b6cd0de4eb2281754b763a2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -115,6 +115,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 3035dcfb9..3e4fb3356 100644 --- a/patches/server/0156-Config-to-allow-for-unsafe-enchants.patch +++ b/patches/server/0156-Config-to-allow-for-unsafe-enchants.patch @@ -27,7 +27,7 @@ index e639c0ec642910e66b1d68ae0b9208ef58d91fce..24c4ad919eeb9c5e15572ee32b0895c9 ++i; } else if (targets.size() == 1) { diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -index d39b86b90aefab85b92e980f56f690bdfb9da82f..eb942aa4cea106f2cd5eaf1e55f96373fe7bea8d 100644 +index 1608c1462ad7aff04530d94c1d206a550f18e625..b271879e345e0ed77c63de58af44d5f681f3fe1a 100644 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java @@ -209,7 +209,8 @@ public class AnvilMenu extends ItemCombinerMenu { @@ -70,10 +70,10 @@ index d39b86b90aefab85b92e980f56f690bdfb9da82f..eb942aa4cea106f2cd5eaf1e55f96373 ((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 7d721cf67b688dfd05d8d847c47626de1f6f3392..7fff7d366a7f75e2fdd7e5f739976bb0fd0ba725 100644 +index 6acd0002a29a698ef5f993bad28bbe8e646eed48..ee267a0e23c09e2ee4dd176ee92f571afd50271b 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -1164,6 +1164,12 @@ public final class ItemStack { +@@ -1165,6 +1165,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/0196-Store-placer-on-Block-when-placed.patch b/patches/server/0196-Store-placer-on-Block-when-placed.patch index 1f2df1299..026dbf51b 100644 --- a/patches/server/0196-Store-placer-on-Block-when-placed.patch +++ b/patches/server/0196-Store-placer-on-Block-when-placed.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Store placer on Block when placed diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 7fff7d366a7f75e2fdd7e5f739976bb0fd0ba725..ceac1de7dedf5702f2eb49e489790d24490722db 100644 +index ee267a0e23c09e2ee4dd176ee92f571afd50271b..6a1bf2e4f6241a405f0c7d7e0d6b6f57082160ff 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -412,6 +412,7 @@ public final class ItemStack { +@@ -413,6 +413,7 @@ public final class ItemStack { world.preventPoiUpdated = true; // CraftBukkit - SPIGOT-5710 for (BlockState blockstate : blocks) { blockstate.update(true, false); @@ -16,7 +16,7 @@ index 7fff7d366a7f75e2fdd7e5f739976bb0fd0ba725..ceac1de7dedf5702f2eb49e489790d24 } world.preventPoiUpdated = false; -@@ -441,6 +442,7 @@ public final class ItemStack { +@@ -442,6 +443,7 @@ public final class ItemStack { if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically block.getBlock().onPlace(block, world, newblockposition, oldBlock, true, itemactioncontext); // Paper - pass itemactioncontext } diff --git a/patches/server/0260-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0260-Add-toggle-for-enchant-level-clamping.patch index 6248f68d4..e0a4ba2d5 100644 --- a/patches/server/0260-Add-toggle-for-enchant-level-clamping.patch +++ b/patches/server/0260-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 ceac1de7dedf5702f2eb49e489790d24490722db..dd61a3971d9cd77fc31aadce7dfeceec68b2a157 100644 +index 6a1bf2e4f6241a405f0c7d7e0d6b6f57082160ff..45f3e082a241841800ed8c100a37af93b798255f 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -1158,7 +1158,7 @@ public final class ItemStack { +@@ -1159,7 +1159,7 @@ public final class ItemStack { ListTag nbttaglist = this.tag.getList("Enchantments", 10);