diff --git a/gradle.properties b/gradle.properties index 4ef4800d..89f67862 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=org.leavesmc.leaves version=1.21.9-R0.1-SNAPSHOT mcVersion=1.21.9 -paperRef=311810fa82df6e86dec6e26a72d1a629bda19d09 +paperRef=5e42ae950c7449cbf0909aeb99161b1d3571a080 preVersion=true paper.runDisableWatchdog=true diff --git a/leaves-server/minecraft-patches/features/0034-Item-overstack-util.patch b/leaves-server/minecraft-patches/features/0034-Item-overstack-util.patch index e512ed4d..7fa14033 100644 --- a/leaves-server/minecraft-patches/features/0034-Item-overstack-util.patch +++ b/leaves-server/minecraft-patches/features/0034-Item-overstack-util.patch @@ -39,7 +39,7 @@ index 4f56cdcf658234b1ca92d38c3df3d31e9be34a15..f6e18d62db18616a422ae74d6f329d1b if (count > i) { source.sendFailure(Component.translatable("commands.give.failed.toomanyitems", i, itemStack.getDisplayName())); diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 11d55309f3030399386b4deeab58d5f760b3574d..0708331ed67723b6d9aef0486b7d89771e07a60a 100644 +index 7f6cc8f111f6f5df311397a7e31e25fa2c93c685..827fa1551235954d8d9b0894465f885d98d1c0ba 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2997,7 +2997,7 @@ public class ServerGamePacketListenerImpl @@ -60,7 +60,7 @@ index 11d55309f3030399386b4deeab58d5f760b3574d..0708331ed67723b6d9aef0486b7d8977 // As of 1.5, this is result slots only action = InventoryAction.PICKUP_ALL; } -@@ -3244,6 +3244,7 @@ public class ServerGamePacketListenerImpl +@@ -3250,6 +3250,7 @@ public class ServerGamePacketListenerImpl this.player.containerMenu.broadcastFullState(); } else { this.player.containerMenu.broadcastChanges(); @@ -68,7 +68,7 @@ index 11d55309f3030399386b4deeab58d5f760b3574d..0708331ed67723b6d9aef0486b7d8977 } if (packet.buttonNum() == Inventory.SLOT_OFFHAND && this.player.containerMenu != this.player.inventoryMenu) this.player.containerSynchronizer.sendOffHandSlotChange(); // Paper - update offhand data when the player is clicking in an inventory not their own as the sychronizer does not include offhand slots if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.updateEquipmentOnPlayerActions) this.player.detectEquipmentUpdates(); // Paper - Force update attributes. -@@ -3355,7 +3356,7 @@ public class ServerGamePacketListenerImpl +@@ -3361,7 +3362,7 @@ public class ServerGamePacketListenerImpl } boolean flag1 = packet.slotNum() >= 1 && packet.slotNum() <= 45; @@ -77,7 +77,7 @@ index 11d55309f3030399386b4deeab58d5f760b3574d..0708331ed67723b6d9aef0486b7d8977 if (flag || (flag1 && !ItemStack.matches(this.player.inventoryMenu.getSlot(packet.slotNum()).getItem(), packet.itemStack()))) { // Insist on valid slot // CraftBukkit start - Call click event org.bukkit.inventory.InventoryView inventory = this.player.inventoryMenu.getBukkitView(); -@@ -3397,6 +3398,7 @@ public class ServerGamePacketListenerImpl +@@ -3403,6 +3404,7 @@ public class ServerGamePacketListenerImpl this.player.inventoryMenu.getSlot(packet.slotNum()).setByPlayer(itemStack); this.player.inventoryMenu.setRemoteSlot(packet.slotNum(), itemStack); this.player.inventoryMenu.broadcastChanges(); diff --git a/leaves-server/minecraft-patches/features/0043-Disable-packet-limit.patch b/leaves-server/minecraft-patches/features/0043-Disable-packet-limit.patch index 497b7faa..94340ab9 100644 --- a/leaves-server/minecraft-patches/features/0043-Disable-packet-limit.patch +++ b/leaves-server/minecraft-patches/features/0043-Disable-packet-limit.patch @@ -20,7 +20,7 @@ index d36a33a9ea2cc262f746314eda9770e19e328ddd..39a703a95cf3e80f8be24514aa7216d6 synchronized (PACKET_LIMIT_LOCK) { if (this.allPacketCounts != null) { diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index bec2943bf4535dee57490423c91924e2c2b905d6..d2693b19a8bffd598188fa821771350660c6a98e 100644 +index a7696c735686a2b4fa8f511dab880528dc31e592..1295306865264071c46c1d8d007fb0d787863c6c 100644 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -827,7 +827,7 @@ public class ServerGamePacketListenerImpl @@ -48,7 +48,7 @@ index bec2943bf4535dee57490423c91924e2c2b905d6..d2693b19a8bffd598188fa8217713506 // CraftBukkit start - replaced with thread safe throttle if (org.spigotmc.SpigotConfig.enableSpamExclusions) { for (String exclude : org.spigotmc.SpigotConfig.spamExclusions) { -@@ -3256,7 +3258,7 @@ public class ServerGamePacketListenerImpl +@@ -3262,7 +3264,7 @@ public class ServerGamePacketListenerImpl @Override public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) { // Paper start - auto recipe limit diff --git a/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch b/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch index b9818311..1f37f1f4 100644 --- a/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch +++ b/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch @@ -44,7 +44,7 @@ index a760b60f6e46fa0dc3293014c979d19f59ea6511..674523b0e2d08b73d10f3bc64c22588c if (nmsEntity.level() != this.getHandle().getLevel()) { nmsEntity = nmsEntity.teleport(new TeleportTransition(this.getHandle().getLevel(), nmsEntity, TeleportTransition.DO_NOTHING)); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 7438e23268d2e06bb8d6b1c65f9a49e6d808de24..08962ee55d127efd746c7d86fea2cd7f70703bb5 100644 +index f45321ec434becfb2b45b28a479b819176690e3a..77459f5a37c4388aee5600dd3bf35682a2e70928 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -304,6 +304,7 @@ public final class CraftServer implements Server { @@ -150,10 +150,10 @@ index 316302320b6b4b1b3d0e9545f37dbc5656dc6676..98f48d3119fcf2350c8714ad2598a334 if (entity instanceof EnderDragonPart complexPart) { if (complexPart.parentMob instanceof EnderDragon) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e16a347e673cdb431c18010e6a01eacfc674c09f..31e695fba6e97bfb14bda36202268b20090c2a01 100644 +index 6744a9f4cfe813a2593bad67b433bfb2c774a636..a507446aa11c5ba71b02ab553753fe1a00896fa7 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -887,7 +887,11 @@ public class CraftEventFactory { +@@ -889,7 +889,11 @@ public class CraftEventFactory { event.setKeepInventory(keepInventory); event.setKeepLevel(victim.keepLevel); // SPIGOT-2222: pre-set keepLevel populateFields(victim, event); // Paper - make cancellable diff --git a/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch b/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch index f8ea5383..762837da 100644 --- a/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch +++ b/leaves-server/paper-patches/features/0014-Fix-SculkCatalyst-exp-skip.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix SculkCatalyst exp skip diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 31e695fba6e97bfb14bda36202268b20090c2a01..6bb11b32eea1f36e1845aab9e256f386f324c480 100644 +index a507446aa11c5ba71b02ab553753fe1a00896fa7..c3acfe47d3b272b07cab41739f18e936854da232 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -853,7 +853,7 @@ public class CraftEventFactory { +@@ -855,7 +855,7 @@ public class CraftEventFactory { CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity(); CraftDamageSource bukkitDamageSource = new CraftDamageSource(damageSource); CraftWorld world = (CraftWorld) entity.getWorld(); @@ -17,7 +17,7 @@ index 31e695fba6e97bfb14bda36202268b20090c2a01..6bb11b32eea1f36e1845aab9e256f386 populateFields(victim, event); // Paper - make cancellable Bukkit.getServer().getPluginManager().callEvent(event); -@@ -864,6 +864,7 @@ public class CraftEventFactory { +@@ -866,6 +866,7 @@ public class CraftEventFactory { playDeathSound(victim, event, damageSource); // Paper end victim.expToDrop = event.getDroppedExp(); @@ -25,7 +25,7 @@ index 31e695fba6e97bfb14bda36202268b20090c2a01..6bb11b32eea1f36e1845aab9e256f386 lootCheck.run(); // Paper - advancement triggers before destroying items // Paper start - Restore vanilla drops behavior -@@ -903,6 +904,7 @@ public class CraftEventFactory { +@@ -905,6 +906,7 @@ public class CraftEventFactory { victim.newLevel = event.getNewLevel(); victim.newTotalExp = event.getNewTotalExp(); victim.expToDrop = event.getDroppedExp();