diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch index d82022467e..c9e666738c 100644 --- a/patches/api/0006-Adventure.patch +++ b/patches/api/0006-Adventure.patch @@ -4817,7 +4817,7 @@ index bd512a7840d4686759097ee4cbd8b375c530956b..f2242ddc4085f7e7cdd748d860857822 + // Paper end - adventure } diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java -index 9679cc595b5009990d8441a6344505eef1f5d265..f973f0f3925819765412f6f134e553d7d74f1467 100644 +index 7736ef1020b658206056af02fdb8c04de2d55541..4e84e3c5d0fa23bbb063d8429c18abcd7ee6b82a 100644 --- a/src/main/java/org/bukkit/map/MapCursor.java +++ b/src/main/java/org/bukkit/map/MapCursor.java @@ -12,7 +12,7 @@ public final class MapCursor { diff --git a/patches/api/0171-Fix-Spigot-annotation-mistakes.patch b/patches/api/0171-Fix-Spigot-annotation-mistakes.patch index 7509e7982b..0f7be3c617 100644 --- a/patches/api/0171-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0171-Fix-Spigot-annotation-mistakes.patch @@ -1677,7 +1677,7 @@ index edef478786bb7456af29ca960009873095830050..e8ac449e6280827beb6d2699df75b1d5 /** diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java -index f973f0f3925819765412f6f134e553d7d74f1467..1afa33ca0d900d9301d52ace3ddb0bd50b5ce4e8 100644 +index 4e84e3c5d0fa23bbb063d8429c18abcd7ee6b82a..a17b755da4eca0370680a9777ff3c7de422f5079 100644 --- a/src/main/java/org/bukkit/map/MapCursor.java +++ b/src/main/java/org/bukkit/map/MapCursor.java @@ -158,9 +158,9 @@ public final class MapCursor { @@ -1702,8 +1702,8 @@ index f973f0f3925819765412f6f134e553d7d74f1467..1afa33ca0d900d9301d52ace3ddb0bd5 - @Deprecated + @Deprecated(forRemoval = true, since = "1.20.2") // Paper public void setRawType(byte type) { - if (type < 0 || type > 26) { - throw new IllegalArgumentException("Type must be in the range 0-26"); + if (type < 0 || type > 34) { + throw new IllegalArgumentException("Type must be in the range 0-34"); @@ -339,9 +339,9 @@ public final class MapCursor { * Gets the internal value of the cursor. * diff --git a/patches/api/0437-add-missing-Experimental-annotations.patch b/patches/api/0437-add-missing-Experimental-annotations.patch index 9cd3d827a6..b21d99ebd5 100644 --- a/patches/api/0437-add-missing-Experimental-annotations.patch +++ b/patches/api/0437-add-missing-Experimental-annotations.patch @@ -81,7 +81,7 @@ index e404cd1e2ba44e4c2d09524bc7cf730d8ffbdabd..cea0ebf50876dd32ab7fba6025b30f29 public interface BundleMeta extends ItemMeta { diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java -index 1afa33ca0d900d9301d52ace3ddb0bd50b5ce4e8..65133e057690eba612520cce6ef9e45312258066 100644 +index a17b755da4eca0370680a9777ff3c7de422f5079..aa3b84ef523cd493b89159ed9d81fc19c2285709 100644 --- a/src/main/java/org/bukkit/map/MapCursor.java +++ b/src/main/java/org/bukkit/map/MapCursor.java @@ -311,12 +311,25 @@ public final class MapCursor { diff --git a/patches/api/0479-Allow-to-define-new-map-cursor-types.patch b/patches/api/0479-Allow-to-define-new-map-cursor-types.patch index d80375bc03..4d94dad296 100644 --- a/patches/api/0479-Allow-to-define-new-map-cursor-types.patch +++ b/patches/api/0479-Allow-to-define-new-map-cursor-types.patch @@ -5,15 +5,15 @@ Subject: [PATCH] Allow to define new map cursor types diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java -index 65133e057690eba612520cce6ef9e45312258066..21bc42ea602c7cc4eab5f9ac59a7e539131a2254 100644 +index aa3b84ef523cd493b89159ed9d81fc19c2285709..21bc42ea602c7cc4eab5f9ac59a7e539131a2254 100644 --- a/src/main/java/org/bukkit/map/MapCursor.java +++ b/src/main/java/org/bukkit/map/MapCursor.java @@ -221,8 +221,8 @@ public final class MapCursor { */ @Deprecated(forRemoval = true, since = "1.20.2") // Paper public void setRawType(byte type) { -- if (type < 0 || type > 26) { -- throw new IllegalArgumentException("Type must be in the range 0-26"); +- if (type < 0 || type > 34) { +- throw new IllegalArgumentException("Type must be in the range 0-34"); + if (type < 0 || type > Type.UPPER_MAP_CURSOR_TYPE_BOUND) { // Paper + throw new IllegalArgumentException("Type must be in the range 0-" + Type.UPPER_MAP_CURSOR_TYPE_BOUND); // Paper } diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch index 476ed061c5..111c5469d4 100644 --- a/patches/server/0009-MC-Utils.patch +++ b/patches/server/0009-MC-Utils.patch @@ -6932,7 +6932,7 @@ index 9d11fcb3df12182ae00ce73f7e30091fd199a341..eea8bafd98e3a8d82b3216488537ab89 public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { // IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess(); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index e2eb76e8993dd556606b5bb38814fe848fbf01a6..5f8adf662e5ab9114e2891cfacb8db5d4d40a297 100644 +index f6e28e64024549f4562ec4a4ba46a0429d9a9d52..d02e958d74fe4bb97ce36ca04a36bcf7e73de016 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -280,6 +280,8 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch index 1a30a65a7a..2f8513c1e5 100644 --- a/patches/server/0010-Adventure.patch +++ b/patches/server/0010-Adventure.patch @@ -2689,7 +2689,7 @@ index b1325e090f2c7aff31d27fc38ca7173efe31ed7c..0742aaf07f37e51d24295e7819ac6cec public boolean logIPs() { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 5f8adf662e5ab9114e2891cfacb8db5d4d40a297..a8a7f1fcf235508d9437ec7c550c3a3853321b78 100644 +index d02e958d74fe4bb97ce36ca04a36bcf7e73de016..dc92e1cd0a10ec4e6b4ad6145d5fc0a4ef199365 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -171,6 +171,7 @@ import net.minecraft.world.item.trading.MerchantOffers; @@ -4616,7 +4616,7 @@ index 5725b0281ac53a2354b233223259d6784353bc6e..9ef939b76d06874b856e0c850addb364 @Override public int getLineWidth() { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 02b52e182ce89d20a873076ca3180ff6f68219d3..968c5588659990d1e29252413881cf6dd867b984 100644 +index 889af27e3fe5ce98b68b3177639c338ca287b024..a29dfbe7aa06113358a2078d927fc53662a5f91f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -907,7 +907,7 @@ public class CraftEventFactory { diff --git a/patches/server/0042-Configurable-end-credits.patch b/patches/server/0042-Configurable-end-credits.patch index 7d2becba09..2ec0a7d4e3 100644 --- a/patches/server/0042-Configurable-end-credits.patch +++ b/patches/server/0042-Configurable-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable end credits diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a8a7f1fcf235508d9437ec7c550c3a3853321b78..2022667e631d0ae1c7e7ffcfeca81091aa7c57c7 100644 +index dc92e1cd0a10ec4e6b4ad6145d5fc0a4ef199365..9f38010f247694e1014c9c93bfcf46d103d8fd20 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1164,6 +1164,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0049-Implement-PlayerLocaleChangeEvent.patch b/patches/server/0049-Implement-PlayerLocaleChangeEvent.patch index 79548ab0a3..4178880dc7 100644 --- a/patches/server/0049-Implement-PlayerLocaleChangeEvent.patch +++ b/patches/server/0049-Implement-PlayerLocaleChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2022667e631d0ae1c7e7ffcfeca81091aa7c57c7..de55fbbc92d180ca49427b134e6fc8e20f52607c 100644 +index 9f38010f247694e1014c9c93bfcf46d103d8fd20..48cb8a211ab45d072c440dbfaa66ff83112d375c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -236,7 +236,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0051-Configurable-container-update-tick-rate.patch b/patches/server/0051-Configurable-container-update-tick-rate.patch index 9a0819ff78..42226708f4 100644 --- a/patches/server/0051-Configurable-container-update-tick-rate.patch +++ b/patches/server/0051-Configurable-container-update-tick-rate.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable container update tick rate diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index de55fbbc92d180ca49427b134e6fc8e20f52607c..916ba7c09b077bc3c9ed9fad579e607e4c065e06 100644 +index 48cb8a211ab45d072c440dbfaa66ff83112d375c..03ad47b96fe8ed37bb855a8bdc1513e7ff67c62d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -267,6 +267,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0072-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0072-Configurable-Non-Player-Arrow-Despawn-Rate.patch index 35928fa7bc..d5af9016ea 100644 --- a/patches/server/0072-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/patches/server/0072-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate Can set a much shorter despawn rate for arrows that players can not pick up. diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 65ad1166d3cc85bfe65170c55fd0b4300efcb9a3..686237a21eccb43ee9f0b659915c141d6ad49f28 100644 +index 5c906d7e611e6148cb68413421490f71ac1fafd8..2783c60dee6ddb3fddfd86b72bdb57552c7a3e45 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -349,7 +349,7 @@ public abstract class AbstractArrow extends Projectile { +@@ -356,7 +356,7 @@ public abstract class AbstractArrow extends Projectile { protected void tickDespawn() { ++this.life; diff --git a/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch index 30123a34c9..37a2ba872a 100644 --- a/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch +++ b/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch @@ -59,10 +59,10 @@ index f9050a1d255780d5131200e8b31bd91154907af6..fc196fc89502b8006dba0f15380d8668 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 968c5588659990d1e29252413881cf6dd867b984..09b6cfd22673d338c5d16162bafeac2ae0b3074a 100644 +index a29dfbe7aa06113358a2078d927fc53662a5f91f..5ea0b9f215dcb457d9e34fe5e3b074843e034b0f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1859,4 +1859,13 @@ public class CraftEventFactory { +@@ -1861,4 +1861,13 @@ public class CraftEventFactory { Bukkit.getPluginManager().callEvent(new EntityRemoveEvent(entity.getBukkitEntity(), cause)); } diff --git a/patches/server/0109-Add-EntityZapEvent.patch b/patches/server/0109-Add-EntityZapEvent.patch index 9ab32961e6..c7a81aa78a 100644 --- a/patches/server/0109-Add-EntityZapEvent.patch +++ b/patches/server/0109-Add-EntityZapEvent.patch @@ -28,10 +28,10 @@ index 63c10be6eacd7108b8b4795d76bf624e0614440a..243eb1e54293c763a06febff551c0513 entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null); entitywitch.setNoAi(this.isNoAi()); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 09b6cfd22673d338c5d16162bafeac2ae0b3074a..72eb4ddf05e43dd2da6bfdc6987a9218fcf1171a 100644 +index 5ea0b9f215dcb457d9e34fe5e3b074843e034b0f..8071c04be18b67a9f12fb92154c0fd19769972ab 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1196,6 +1196,14 @@ public class CraftEventFactory { +@@ -1198,6 +1198,14 @@ public class CraftEventFactory { return !event.isCancelled(); } diff --git a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch index e51c621f01..45e4d30d6a 100644 --- a/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch +++ b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch @@ -18,10 +18,10 @@ index 56402312e44d12c859e2c4b39902d31b7cfd1573..25a45e680f9fdea90f43d59de87a3a50 --this.count; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 72eb4ddf05e43dd2da6bfdc6987a9218fcf1171a..81fb6a8499f57ed1931bcd562ead20e27bdfa99b 100644 +index 8071c04be18b67a9f12fb92154c0fd19769972ab..ad799d1d0f46663d5bc850763629f430d00b58fe 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1149,6 +1149,17 @@ public class CraftEventFactory { +@@ -1151,6 +1151,17 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0114-Add-ProjectileCollideEvent.patch b/patches/server/0114-Add-ProjectileCollideEvent.patch index 1ed4bcc563..0ace0199a8 100644 --- a/patches/server/0114-Add-ProjectileCollideEvent.patch +++ b/patches/server/0114-Add-ProjectileCollideEvent.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add ProjectileCollideEvent Deprecated now and replaced with ProjectileHitEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 81fb6a8499f57ed1931bcd562ead20e27bdfa99b..000a95dfd5c83b84fcd973a388a705d9470a4fe0 100644 +index ad799d1d0f46663d5bc850763629f430d00b58fe..a4060019e30f6fc64e10494ed41d6613d1b894d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1293,6 +1293,17 @@ public class CraftEventFactory { +@@ -1295,6 +1295,17 @@ public class CraftEventFactory { return CraftItemStack.asNMSCopy(bitem); } @@ -27,7 +27,7 @@ index 81fb6a8499f57ed1931bcd562ead20e27bdfa99b..000a95dfd5c83b84fcd973a388a705d9 public static ProjectileLaunchEvent callProjectileLaunchEvent(Entity entity) { Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); -@@ -1317,8 +1328,15 @@ public class CraftEventFactory { +@@ -1319,8 +1330,15 @@ public class CraftEventFactory { if (position.getType() == HitResult.Type.ENTITY) { hitEntity = ((EntityHitResult) position).getEntity().getBukkitEntity(); } diff --git a/patches/server/0121-Properly-fix-item-duplication-bug.patch b/patches/server/0121-Properly-fix-item-duplication-bug.patch index 01d6cf8f24..4642efa846 100644 --- a/patches/server/0121-Properly-fix-item-duplication-bug.patch +++ b/patches/server/0121-Properly-fix-item-duplication-bug.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 916ba7c09b077bc3c9ed9fad579e607e4c065e06..813c3bc9943e2700d2e4ad2335b7d235d21610fa 100644 +index 03ad47b96fe8ed37bb855a8bdc1513e7ff67c62d..7b09fc5d9039d792d3cfdf8152c947ba6842b87b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2624,7 +2624,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0123-PlayerTeleportEndGatewayEvent.patch b/patches/server/0123-PlayerTeleportEndGatewayEvent.patch index 7943af1159..25eeb62bd9 100644 --- a/patches/server/0123-PlayerTeleportEndGatewayEvent.patch +++ b/patches/server/0123-PlayerTeleportEndGatewayEvent.patch @@ -7,7 +7,7 @@ Allows you to access the Gateway being used in a teleport event Fix the offset used for player teleportation diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 813c3bc9943e2700d2e4ad2335b7d235d21610fa..a2d35f7066d89f861c1b75ec8a62f03ed6f65dd8 100644 +index 7b09fc5d9039d792d3cfdf8152c947ba6842b87b..5cb79e38ce7b28e7575b8a8a92786415ee6a4dec 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1195,11 +1195,22 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0132-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0132-provide-a-configurable-option-to-disable-creeper-lin.patch index a9a07893c4..ecfd29e5c4 100644 --- a/patches/server/0132-provide-a-configurable-option-to-disable-creeper-lin.patch +++ b/patches/server/0132-provide-a-configurable-option-to-disable-creeper-lin.patch @@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java -index c7ca5af731e0b92a511b90cba2047b1ed7d4e144..92384c2da9a15a781794e16176349eb39d012696 100644 +index 918051756c9adf8c01ddbbc5298269419d7f23ba..57e758616b0a82113168a3bd9f46efd353707a11 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java @@ -287,7 +287,7 @@ public class Creeper extends Monster implements PowerableMob { diff --git a/patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch index f15f332210..6395e69f7e 100644 --- a/patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch +++ b/patches/server/0165-PlayerNaturallySpawnCreaturesEvent.patch @@ -60,7 +60,7 @@ index c0808b6026b94676c1c6457e4bb44dcbc5e2a55b..6e941ca68c2ca9d7753358f738704c4d boolean flag1 = this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && this.level.getLevelData().getGameTime() % this.level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit Iterator iterator1 = list.iterator(); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a2d35f7066d89f861c1b75ec8a62f03ed6f65dd8..71eca7032aa2482bde7a2a00163f5547f3487b5e 100644 +index 5cb79e38ce7b28e7575b8a8a92786415ee6a4dec..ebedd613fa243c2caa4c3783b2bd3a7ad9c6644f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -286,6 +286,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0193-WitchReadyPotionEvent.patch b/patches/server/0193-WitchReadyPotionEvent.patch index ac1aec8076..fbda7c03d7 100644 --- a/patches/server/0193-WitchReadyPotionEvent.patch +++ b/patches/server/0193-WitchReadyPotionEvent.patch @@ -22,10 +22,10 @@ index a14e00d55930628333cc63b18727ea56dbdc4ee3..f6d01d21745391595d61b191832be4c2 this.setUsingItem(true); if (!this.isSilent()) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 000a95dfd5c83b84fcd973a388a705d9470a4fe0..4e0db83bb6a4529b6e0727ea181bf79e06c2025a 100644 +index a4060019e30f6fc64e10494ed41d6613d1b894d7..587437f995dd411c051f2125202f1a48cfc1bb1b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1905,4 +1905,14 @@ public class CraftEventFactory { +@@ -1907,4 +1907,14 @@ public class CraftEventFactory { ).callEvent(); } // Paper end - PlayerUseUnknownEntityEvent diff --git a/patches/server/0196-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0196-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch index 4927ef8d76..803e8f5087 100644 --- a/patches/server/0196-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch +++ b/patches/server/0196-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event Otherwise the creeper infinite explodes diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java -index 92384c2da9a15a781794e16176349eb39d012696..6b57500b2265be637c8d21807867341202305d59 100644 +index 57e758616b0a82113168a3bd9f46efd353707a11..36505d8c66f63191574b5a79b8ee15071587a931 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java @@ -278,6 +278,7 @@ public class Creeper extends Monster implements PowerableMob { diff --git a/patches/server/0203-Add-entity-knockback-events.patch b/patches/server/0203-Add-entity-knockback-events.patch index 7c47d80340..72f99637c6 100644 --- a/patches/server/0203-Add-entity-knockback-events.patch +++ b/patches/server/0203-Add-entity-knockback-events.patch @@ -224,10 +224,10 @@ index d20389c6d73114810ab8dc20a02b09db4f1971f1..d4077e88910347fb332996ce88262a1a // CraftBukkit end Level world = this.level(); diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 686237a21eccb43ee9f0b659915c141d6ad49f28..a2617881999ea61bf132ff75fb36e783261e5835 100644 +index 2783c60dee6ddb3fddfd86b72bdb57552c7a3e45..1e2d4af56ed7b3fece353b3031a965ff5798f4c5 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -512,7 +512,7 @@ public abstract class AbstractArrow extends Projectile { +@@ -519,7 +519,7 @@ public abstract class AbstractArrow extends Projectile { Vec3 vec3d = this.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D).normalize().scale(d0 * 0.6D * d1); if (vec3d.lengthSqr() > 0.0D) { @@ -272,10 +272,10 @@ index d93ed33d5ae72e9dd3e6cf044ef79e4b9689dc1c..512d79b66fed3d1bef645c3ecb59bda0 // CraftBukkit end entity.setDeltaMovement(entity.getDeltaMovement().add(vec3d1)); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 4e0db83bb6a4529b6e0727ea181bf79e06c2025a..d625fd361c94c89749a6f41d9783f3864ed5e027 100644 +index 587437f995dd411c051f2125202f1a48cfc1bb1b..86bddb9c39d8487f050d126dbb479315cb8a2818 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1867,19 +1867,33 @@ public class CraftEventFactory { +@@ -1869,19 +1869,33 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0209-InventoryCloseEvent-Reason-API.patch b/patches/server/0209-InventoryCloseEvent-Reason-API.patch index 838f24a751..8972b2bb78 100644 --- a/patches/server/0209-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0209-InventoryCloseEvent-Reason-API.patch @@ -29,7 +29,7 @@ index 5bf18ab5c397b32d880ea1827f62945d8d0e80ce..ce6be7aed7b392c3e0c851f3f6e1e216 } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 71eca7032aa2482bde7a2a00163f5547f3487b5e..2758f4fc1c230c0029ece90718057a7b111909f0 100644 +index ebedd613fa243c2caa4c3783b2bd3a7ad9c6644f..16f7278ce8d5b8c45026baeb017fdce1ed5945c8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -707,7 +707,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -178,10 +178,10 @@ index 27298cd0558b1ff2ab2ca341d62da2922507414b..38bc1747d2010b9233c64de81eb1c042 // Check if the fromWorld and toWorld are the same. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d625fd361c94c89749a6f41d9783f3864ed5e027..23d57911616de1df1442d26ec31a187a5f70ed11 100644 +index 86bddb9c39d8487f050d126dbb479315cb8a2818..8d86649579cb7eb90e3866ed81f2ba4f342f8b1c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1262,7 +1262,7 @@ public class CraftEventFactory { +@@ -1264,7 +1264,7 @@ public class CraftEventFactory { public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) { if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open @@ -190,7 +190,7 @@ index d625fd361c94c89749a6f41d9783f3864ed5e027..23d57911616de1df1442d26ec31a187a } CraftServer server = player.level().getCraftServer(); -@@ -1449,8 +1449,18 @@ public class CraftEventFactory { +@@ -1451,8 +1451,18 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0218-Vanished-players-don-t-have-rights.patch b/patches/server/0218-Vanished-players-don-t-have-rights.patch index 9ba61fa965..bad792a73b 100644 --- a/patches/server/0218-Vanished-players-don-t-have-rights.patch +++ b/patches/server/0218-Vanished-players-don-t-have-rights.patch @@ -89,10 +89,10 @@ index 16c244f56813479b2e51f1d883ff739949fc86e3..c0b0a9328faf93b85ceaf6cc9989f1a5 public boolean isClientSide() { return this.isClientSide; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 23d57911616de1df1442d26ec31a187a5f70ed11..dae99885916e6e913a23a79feccee7d86d98b611 100644 +index 8d86649579cb7eb90e3866ed81f2ba4f342f8b1c..635982e7c9bb650f72a987e2f866d6f91b75efcf 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1299,6 +1299,14 @@ public class CraftEventFactory { +@@ -1301,6 +1301,14 @@ public class CraftEventFactory { Projectile projectile = (Projectile) entity.getBukkitEntity(); org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity(); com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided); diff --git a/patches/server/0239-Add-More-Creeper-API.patch b/patches/server/0239-Add-More-Creeper-API.patch index cbd08c4569..5333854e85 100644 --- a/patches/server/0239-Add-More-Creeper-API.patch +++ b/patches/server/0239-Add-More-Creeper-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java -index 6b57500b2265be637c8d21807867341202305d59..b3dd475b1c6cd10f89760e59cbba219df19948b6 100644 +index 36505d8c66f63191574b5a79b8ee15071587a931..acc844c10db9cb42c0e70f3b467e620906b739f0 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java @@ -134,7 +134,7 @@ public class Creeper extends Monster implements PowerableMob { diff --git a/patches/server/0244-Improve-death-events.patch b/patches/server/0244-Improve-death-events.patch index a2242da65c..f111a7550c 100644 --- a/patches/server/0244-Improve-death-events.patch +++ b/patches/server/0244-Improve-death-events.patch @@ -19,7 +19,7 @@ public net.minecraft.world.entity.LivingEntity getDeathSound()Lnet/minecraft/sou public net.minecraft.world.entity.LivingEntity getSoundVolume()F diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2758f4fc1c230c0029ece90718057a7b111909f0..a75b325111c1c6ff2686854d43a2f68423c3fca8 100644 +index 16f7278ce8d5b8c45026baeb017fdce1ed5945c8..508de7064c08eb22cd66658a98f9833ddc030618 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -268,6 +268,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -443,7 +443,7 @@ index c0b92358c03d1724e8c134563f9ca98e69081c6a..a33fc9288165ec013cef6b90d72871f0 public void injectScaledMaxHealth(Collection collection, boolean force) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index dae99885916e6e913a23a79feccee7d86d98b611..3405d27c360cde4e735aef1d5a01a53bbd00b0e0 100644 +index 635982e7c9bb650f72a987e2f866d6f91b75efcf..5254a97f94d24717bdbba1768fffc3d8d292f0fe 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -893,9 +893,16 @@ public class CraftEventFactory { diff --git a/patches/server/0257-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0257-Call-player-spectator-target-events-and-improve-impl.patch index 1b8a47771b..ee6807c9db 100644 --- a/patches/server/0257-Call-player-spectator-target-events-and-improve-impl.patch +++ b/patches/server/0257-Call-player-spectator-target-events-and-improve-impl.patch @@ -19,7 +19,7 @@ spectate the target entity. Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a75b325111c1c6ff2686854d43a2f68423c3fca8..476476058fb3025306321343f4d33f2f3a8553bb 100644 +index 508de7064c08eb22cd66658a98f9833ddc030618..8c671f5ba49a1dde9a59c0db7fa979055e031713 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2186,6 +2186,21 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0261-Reset-players-airTicks-on-respawn.patch b/patches/server/0261-Reset-players-airTicks-on-respawn.patch index 6e4651957d..8b7a8fb5c8 100644 --- a/patches/server/0261-Reset-players-airTicks-on-respawn.patch +++ b/patches/server/0261-Reset-players-airTicks-on-respawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset players airTicks on respawn diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 476476058fb3025306321343f4d33f2f3a8553bb..8de0b92285fe2413a4e2fb52fc7bc7a13dad5e90 100644 +index 8c671f5ba49a1dde9a59c0db7fa979055e031713..661e4a2611b42624606e0d985f98451f63bc3164 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2700,6 +2700,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0269-force-entity-dismount-during-teleportation.patch b/patches/server/0269-force-entity-dismount-during-teleportation.patch index 867ea5e33e..5e76183f9e 100644 --- a/patches/server/0269-force-entity-dismount-during-teleportation.patch +++ b/patches/server/0269-force-entity-dismount-during-teleportation.patch @@ -20,7 +20,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8de0b92285fe2413a4e2fb52fc7bc7a13dad5e90..fcbb0b64feb8d5624de3805d4db6d489110b4e69 100644 +index 661e4a2611b42624606e0d985f98451f63bc3164..8f484d78145ed4057967ac059d32762eb00f9892 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2519,9 +2519,15 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0273-Replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0273-Replace-OfflinePlayer-getLastPlayed.patch index 65dd0a1d0f..0facc6efeb 100644 --- a/patches/server/0273-Replace-OfflinePlayer-getLastPlayed.patch +++ b/patches/server/0273-Replace-OfflinePlayer-getLastPlayed.patch @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index fcbb0b64feb8d5624de3805d4db6d489110b4e69..a2adbad6382276b149c41ff422e4aa9baba2ba1f 100644 +index 8f484d78145ed4057967ac059d32762eb00f9892..f8b00e44f621580e61f72c3d5af592d46fa24c27 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -268,6 +268,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0274-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0274-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index 81b3dd82d3..cd60a09f97 100644 --- a/patches/server/0274-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/patches/server/0274-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a2adbad6382276b149c41ff422e4aa9baba2ba1f..dfa3542035924ed53a1fafb032334b0bffbe0282 100644 +index f8b00e44f621580e61f72c3d5af592d46fa24c27..e56f9295e8624d1d73443f8f2178c2bc177f3f9f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1836,6 +1836,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0287-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0287-PlayerDeathEvent-getItemsToKeep.patch index 46c4139bb0..8f4476007f 100644 --- a/patches/server/0287-PlayerDeathEvent-getItemsToKeep.patch +++ b/patches/server/0287-PlayerDeathEvent-getItemsToKeep.patch @@ -11,7 +11,7 @@ Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 public net.minecraft.world.entity.player.Inventory compartments diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index dfa3542035924ed53a1fafb032334b0bffbe0282..f92ff999422ffc1833a26afb80c11ba5156b8679 100644 +index e56f9295e8624d1d73443f8f2178c2bc177f3f9f..8209b4d0edf9b9d47d6496c6695c426b26e19e3a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -899,6 +899,46 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0305-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0305-PlayerDeathEvent-shouldDropExperience.patch index 8bbdfe2174..1a66c5b39e 100644 --- a/patches/server/0305-PlayerDeathEvent-shouldDropExperience.patch +++ b/patches/server/0305-PlayerDeathEvent-shouldDropExperience.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f92ff999422ffc1833a26afb80c11ba5156b8679..5fea622d5fc7fc4bcdd0c1010936736c8fcb213f 100644 +index 8209b4d0edf9b9d47d6496c6695c426b26e19e3a..6c98221619611028e5a5ebd2c18c5128dc2ede7d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1020,7 +1020,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0323-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0323-add-hand-to-BlockMultiPlaceEvent.patch index 8936160004..3a4d8cf5a7 100644 --- a/patches/server/0323-add-hand-to-BlockMultiPlaceEvent.patch +++ b/patches/server/0323-add-hand-to-BlockMultiPlaceEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 3405d27c360cde4e735aef1d5a01a53bbd00b0e0..a073dd7a0d8440aa00f0f02dc02187b4ff48bc7f 100644 +index 5254a97f94d24717bdbba1768fffc3d8d292f0fe..6e9f0fdbfffe7a08185a125e2ad0f2227d25cc07 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -402,13 +402,18 @@ public class CraftEventFactory { diff --git a/patches/server/0332-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0332-Pillager-patrol-spawn-settings-and-per-player-option.patch index 5d935bce8f..de75d23830 100644 --- a/patches/server/0332-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/patches/server/0332-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 5fea622d5fc7fc4bcdd0c1010936736c8fcb213f..ee1bf0b2346f1b5d2dfaacca8db7033e0dc322ba 100644 +index 6c98221619611028e5a5ebd2c18c5128dc2ede7d..d63c940012a04fcf7a45804ce2b77293d5d194ce 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -269,6 +269,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0336-Don-t-tick-dead-players.patch b/patches/server/0336-Don-t-tick-dead-players.patch index 8f980193ad..9518759981 100644 --- a/patches/server/0336-Don-t-tick-dead-players.patch +++ b/patches/server/0336-Don-t-tick-dead-players.patch @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ee1bf0b2346f1b5d2dfaacca8db7033e0dc322ba..c1a09c0f9ce8f9c89df2291dd3cde56b435d89f3 100644 +index d63c940012a04fcf7a45804ce2b77293d5d194ce..dfc7f6c15951dc3dfdfadba67b949cd265abc4ca 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -767,7 +767,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0338-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0338-Don-t-move-existing-players-to-world-spawn.patch index 413accc6a8..0d6a54edf0 100644 --- a/patches/server/0338-Don-t-move-existing-players-to-world-spawn.patch +++ b/patches/server/0338-Don-t-move-existing-players-to-world-spawn.patch @@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start. public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c1a09c0f9ce8f9c89df2291dd3cde56b435d89f3..7fc681cd64f508d1a833255654d526c133f98269 100644 +index dfc7f6c15951dc3dfdfadba67b949cd265abc4ca..28057fad5e8add292a8bd40d027132bef03a6156 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -358,7 +358,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0342-Prevent-opening-inventories-when-frozen.patch b/patches/server/0342-Prevent-opening-inventories-when-frozen.patch index 9f579a9987..9059ad6ae7 100644 --- a/patches/server/0342-Prevent-opening-inventories-when-frozen.patch +++ b/patches/server/0342-Prevent-opening-inventories-when-frozen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 7fc681cd64f508d1a833255654d526c133f98269..a5291e17ab08d1ceeca0bb73f4c8fe433fcbd536 100644 +index 28057fad5e8add292a8bd40d027132bef03a6156..79006a6d2be528184d1699e75465b68f2a6107d4 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -712,7 +712,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0344-Implement-Player-Client-Options-API.patch b/patches/server/0344-Implement-Player-Client-Options-API.patch index 9f6f9f80b8..eb3723e537 100644 --- a/patches/server/0344-Implement-Player-Client-Options-API.patch +++ b/patches/server/0344-Implement-Player-Client-Options-API.patch @@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a5291e17ab08d1ceeca0bb73f4c8fe433fcbd536..8110cdcdcf9513a71caae38abd235b690c64af2c 100644 +index 79006a6d2be528184d1699e75465b68f2a6107d4..6664cee716e078272df1039d72840cb2f97187d3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -359,7 +359,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0346-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0346-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch index 76421f2a1a..df0ac59424 100644 --- a/patches/server/0346-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch +++ b/patches/server/0346-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch @@ -43,7 +43,7 @@ index 5732aded2e4dbeea84dbe6ebac71c2ad5ce4729a..d1247df5c51b0d377a27ea7cc5b5a2d1 EntityType entitytypes = entity.getType(); int i = entitytypes.clientTrackingRange() * 16; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8110cdcdcf9513a71caae38abd235b690c64af2c..21cb50ebcdd58a8c27a2f4277b6471ca63eaf971 100644 +index 6664cee716e078272df1039d72840cb2f97187d3..be2a0eef9b6a0c7ec5e56bda2a80a05fe597aacb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -288,6 +288,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0351-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0351-Fix-item-duplication-and-teleport-issues.patch index 2a7ff6fe57..66b9f096ef 100644 --- a/patches/server/0351-Fix-item-duplication-and-teleport-issues.patch +++ b/patches/server/0351-Fix-item-duplication-and-teleport-issues.patch @@ -124,7 +124,7 @@ index 92bb0c63330ad3a4cb13b2dc655020714e9b1ffd..cc1189c2d7dc57ba8f29aad4ba5d2a07 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index a073dd7a0d8440aa00f0f02dc02187b4ff48bc7f..4552a77e84d3c957431a918ca78dcf2e06f2e74c 100644 +index 6e9f0fdbfffe7a08185a125e2ad0f2227d25cc07..720ea811407b4288b9923cf7db0ac44ad1a086e0 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -895,6 +895,11 @@ public class CraftEventFactory { diff --git a/patches/server/0359-ExperienceOrb-merging-stacking-API-and-fixes.patch b/patches/server/0359-ExperienceOrb-merging-stacking-API-and-fixes.patch index 33954bb4a2..fb7613e2f0 100644 --- a/patches/server/0359-ExperienceOrb-merging-stacking-API-and-fixes.patch +++ b/patches/server/0359-ExperienceOrb-merging-stacking-API-and-fixes.patch @@ -77,7 +77,7 @@ index 5a7d314ec0562e472f5dc45924a7b24841cff126..650e4a01cecc4cc08e7ff9ebcc4c3670 public java.util.UUID getTriggerEntityId() { return getHandle().triggerEntityId; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 4552a77e84d3c957431a918ca78dcf2e06f2e74c..805aec84b57f0a426c1337445dfdd084cb0a0507 100644 +index 720ea811407b4288b9923cf7db0ac44ad1a086e0..82f7a36e71ed17d44ad0e5be99f8f6fc450d0732 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -704,15 +704,29 @@ public class CraftEventFactory { diff --git a/patches/server/0386-Add-PrepareResultEvent.patch b/patches/server/0386-Add-PrepareResultEvent.patch index 9dd5d5231f..e49f683638 100644 --- a/patches/server/0386-Add-PrepareResultEvent.patch +++ b/patches/server/0386-Add-PrepareResultEvent.patch @@ -94,10 +94,10 @@ index 04d9793a83c724350f74616558f650082f9805d9..bb29107cb15e2ec644a14cabb3cf91f4 private static SingleRecipeInput createRecipeInput(Container inventory) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 805aec84b57f0a426c1337445dfdd084cb0a0507..5cd934897dde1fc54bfe93e8d585ff05bb9293c3 100644 +index 82f7a36e71ed17d44ad0e5be99f8f6fc450d0732..679098ee1e0117c5786ddcf10540f09ae4ca3946 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1651,6 +1651,12 @@ public class CraftEventFactory { +@@ -1653,6 +1653,12 @@ public class CraftEventFactory { } public static PrepareAnvilEvent callPrepareAnvilEvent(InventoryView view, ItemStack item) { @@ -110,7 +110,7 @@ index 805aec84b57f0a426c1337445dfdd084cb0a0507..5cd934897dde1fc54bfe93e8d585ff05 PrepareAnvilEvent event = new PrepareAnvilEvent(view, CraftItemStack.asCraftMirror(item).clone()); event.getView().getPlayer().getServer().getPluginManager().callEvent(event); event.getInventory().setItem(2, event.getResult()); -@@ -1658,6 +1664,12 @@ public class CraftEventFactory { +@@ -1660,6 +1666,12 @@ public class CraftEventFactory { } public static PrepareGrindstoneEvent callPrepareGrindstoneEvent(InventoryView view, ItemStack item) { @@ -123,7 +123,7 @@ index 805aec84b57f0a426c1337445dfdd084cb0a0507..5cd934897dde1fc54bfe93e8d585ff05 PrepareGrindstoneEvent event = new PrepareGrindstoneEvent(view, CraftItemStack.asCraftMirror(item).clone()); event.getView().getPlayer().getServer().getPluginManager().callEvent(event); event.getInventory().setItem(2, event.getResult()); -@@ -1665,12 +1677,39 @@ public class CraftEventFactory { +@@ -1667,12 +1679,39 @@ public class CraftEventFactory { } public static PrepareSmithingEvent callPrepareSmithingEvent(InventoryView view, ItemStack item) { diff --git a/patches/server/0388-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0388-Fix-arrows-never-despawning-MC-125757.patch index 1ff81316ae..21d9b7def7 100644 --- a/patches/server/0388-Fix-arrows-never-despawning-MC-125757.patch +++ b/patches/server/0388-Fix-arrows-never-despawning-MC-125757.patch @@ -9,10 +9,10 @@ instead of getting stuck in a never despawn state (bubble columns, etc). diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index a2617881999ea61bf132ff75fb36e783261e5835..1f881f71d5698bc7b36bc029287ac8e873a46107 100644 +index 1e2d4af56ed7b3fece353b3031a965ff5798f4c5..e8004c0689918a81369b404ab2a4143c26aa2b07 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -231,6 +231,7 @@ public abstract class AbstractArrow extends Projectile { +@@ -238,6 +238,7 @@ public abstract class AbstractArrow extends Projectile { ++this.inGroundTime; } else { diff --git a/patches/server/0396-Brand-support.patch b/patches/server/0396-Brand-support.patch index 7b80e9b402..4a54b0e16d 100644 --- a/patches/server/0396-Brand-support.patch +++ b/patches/server/0396-Brand-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Brand support diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 21cb50ebcdd58a8c27a2f4277b6471ca63eaf971..c6b2ea4eeb2d1e20266ff63c46aca0d0503f9b62 100644 +index be2a0eef9b6a0c7ec5e56bda2a80a05fe597aacb..cdfc7a229129fc66caaec50f2d613f7178d1f3da 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -294,6 +294,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0403-Add-BellRingEvent.patch b/patches/server/0403-Add-BellRingEvent.patch index 877e586128..9ac85f17e9 100644 --- a/patches/server/0403-Add-BellRingEvent.patch +++ b/patches/server/0403-Add-BellRingEvent.patch @@ -7,7 +7,7 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a village bell. Passes along the bell block and the player who rang it. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 5cd934897dde1fc54bfe93e8d585ff05bb9293c3..b0497ecb6d0963104ef178ede62dbc630059ad8d 100644 +index 679098ee1e0117c5786ddcf10540f09ae4ca3946..4679e1399288db68ae0325cf62ea1a8fb6d6c80b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -368,10 +368,11 @@ public class CraftEventFactory { diff --git a/patches/server/0435-Add-API-for-quit-reason.patch b/patches/server/0435-Add-API-for-quit-reason.patch index c4bac08ec9..efcf971804 100644 --- a/patches/server/0435-Add-API-for-quit-reason.patch +++ b/patches/server/0435-Add-API-for-quit-reason.patch @@ -28,7 +28,7 @@ index 134810ac91d828d67759cd1ed56f11b71e292917..ba41646a5edb57c4d9766df08bbc5701 Connection.LOGGER.debug("Failed to sent packet", throwable); if (this.getSending() == PacketFlow.CLIENTBOUND) { diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c6b2ea4eeb2d1e20266ff63c46aca0d0503f9b62..483f03005552ea59bb8fb4641ffe4923aead9eeb 100644 +index cdfc7a229129fc66caaec50f2d613f7178d1f3da..42da4c28c6a747174c1b757affa5e245463864ba 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -295,6 +295,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0451-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0451-Add-OBSTRUCTED-reason-to-BedEnterResult.patch index 1fde31e64f..c72796ff26 100644 --- a/patches/server/0451-Add-OBSTRUCTED-reason-to-BedEnterResult.patch +++ b/patches/server/0451-Add-OBSTRUCTED-reason-to-BedEnterResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index b0497ecb6d0963104ef178ede62dbc630059ad8d..7d99c696bec2ea338612d1376e2d24a952b74791 100644 +index 4679e1399288db68ae0325cf62ea1a8fb6d6c80b..57e25bf61b2d25d736a97e9aadc8cfaddf29ea58 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -303,6 +303,10 @@ public class CraftEventFactory { diff --git a/patches/server/0468-Add-BlockFailedDispenseEvent.patch b/patches/server/0468-Add-BlockFailedDispenseEvent.patch index 873e47f789..4d96419af9 100644 --- a/patches/server/0468-Add-BlockFailedDispenseEvent.patch +++ b/patches/server/0468-Add-BlockFailedDispenseEvent.patch @@ -32,10 +32,10 @@ index a1599eae0d8e9f0298fc6996ad03b0d6ba78f04f..083ddfb8fffa04dad6eeca2274f290a0 } else { ItemStack itemstack = tileentitydispenser.getItem(i); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7d99c696bec2ea338612d1376e2d24a952b74791..6d335dd7f3642fa3313d5bcfe6b59cae561e656f 100644 +index 57e25bf61b2d25d736a97e9aadc8cfaddf29ea58..b6456c7fdd97925a8b68bdb80ff53c441f7996c7 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2056,4 +2056,12 @@ public class CraftEventFactory { +@@ -2058,4 +2058,12 @@ public class CraftEventFactory { return org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getPotion()); } // Paper end - WitchReadyPotionEvent diff --git a/patches/server/0483-Add-BlockPreDispenseEvent.patch b/patches/server/0483-Add-BlockPreDispenseEvent.patch index ed818be7f7..76ee7d959e 100644 --- a/patches/server/0483-Add-BlockPreDispenseEvent.patch +++ b/patches/server/0483-Add-BlockPreDispenseEvent.patch @@ -29,10 +29,10 @@ index 083ddfb8fffa04dad6eeca2274f290a08e62b5eb..45fafee2cf1893dccf477939dad05e9e } else { // CraftBukkit start - Fire event when pushing items into other inventories diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 6d335dd7f3642fa3313d5bcfe6b59cae561e656f..eb6df1a88bea4d2449e67871a27d75b974a006ce 100644 +index b6456c7fdd97925a8b68bdb80ff53c441f7996c7..fd889f0af29703c85a78b8189881516d54d147a6 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2063,5 +2063,11 @@ public class CraftEventFactory { +@@ -2065,5 +2065,11 @@ public class CraftEventFactory { io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block); return event.callEvent(); } diff --git a/patches/server/0487-Expand-EntityUnleashEvent.patch b/patches/server/0487-Expand-EntityUnleashEvent.patch index 2bf977cb6d..4641c486ef 100644 --- a/patches/server/0487-Expand-EntityUnleashEvent.patch +++ b/patches/server/0487-Expand-EntityUnleashEvent.patch @@ -121,10 +121,10 @@ index 3c0af74ed65610b1d5e3b72fdcf28c5a3423f0da..01173fc7177d78588978e087e63efda0 flag1 = true; } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index eb6df1a88bea4d2449e67871a27d75b974a006ce..f1dcb98fc8e91f2636b51e752ae231749df33d7c 100644 +index fd889f0af29703c85a78b8189881516d54d147a6..7310d8011fc27b17360887c048cb6eb79e2c0b1f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1568,8 +1568,10 @@ public class CraftEventFactory { +@@ -1570,8 +1570,10 @@ public class CraftEventFactory { Bukkit.getPluginManager().callEvent(new PlayerRecipeBookSettingsChangeEvent(player.getBukkitEntity(), bukkitType, open, filter)); } diff --git a/patches/server/0488-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0488-Reset-shield-blocking-on-dimension-change.patch index 610bb5d52f..1dc7e3c626 100644 --- a/patches/server/0488-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0488-Reset-shield-blocking-on-dimension-change.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 483f03005552ea59bb8fb4641ffe4923aead9eeb..0c51127d84ba4000c81b739a17606f085d0fd834 100644 +index 42da4c28c6a747174c1b757affa5e245463864ba..cd563b639ed970d8bf390eb87f2b66412473a783 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1352,6 +1352,11 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0493-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0493-Allow-adding-items-to-BlockDropItemEvent.patch index 7e09fe0870..0808b4dbcd 100644 --- a/patches/server/0493-Allow-adding-items-to-BlockDropItemEvent.patch +++ b/patches/server/0493-Allow-adding-items-to-BlockDropItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow adding items to BlockDropItemEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f1dcb98fc8e91f2636b51e752ae231749df33d7c..388f0a53e993b84376ce2549c6b041bed283b8a7 100644 +index 7310d8011fc27b17360887c048cb6eb79e2c0b1f..edb5d93684d959dbad0115643b3c9f5096ceee3a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -452,13 +452,30 @@ public class CraftEventFactory { diff --git a/patches/server/0525-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0525-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch index 4b6b871ac2..936345f0c5 100644 --- a/patches/server/0525-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch +++ b/patches/server/0525-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expand PlayerRespawnEvent, fix passed parameter issues Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 0c51127d84ba4000c81b739a17606f085d0fd834..70e7e94ceaf8e8142fedfd8a006deb36560fc339 100644 +index cd563b639ed970d8bf390eb87f2b66412473a783..47bada5b674c9cc1f30e7d722432f8ecb7fe8f51 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1197,7 +1197,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0537-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0537-Expand-PlayerGameModeChangeEvent.patch index dfcacf1e1c..92b5afe5fc 100644 --- a/patches/server/0537-Expand-PlayerGameModeChangeEvent.patch +++ b/patches/server/0537-Expand-PlayerGameModeChangeEvent.patch @@ -45,7 +45,7 @@ index 7f09119bc7d661e08a960dd2bd46006efe752d3e..d1da3600dc07107309b20ebe6e7c0c4d } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 70e7e94ceaf8e8142fedfd8a006deb36560fc339..35cc5e6db0a860ddcc8b1eff1344f2a32df4bc88 100644 +index 47bada5b674c9cc1f30e7d722432f8ecb7fe8f51..31eccb60919eedf2dba23c759c3c29e011065edc 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2087,10 +2087,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0560-Fix-potions-splash-events.patch b/patches/server/0560-Fix-potions-splash-events.patch index 39a7d43df2..dc4c8cf698 100644 --- a/patches/server/0560-Fix-potions-splash-events.patch +++ b/patches/server/0560-Fix-potions-splash-events.patch @@ -143,7 +143,7 @@ index be787a5b52e90796d4f06e17e564f4324807c3e6..cb34cc9443da56c0497c7a0192c8b836 public boolean isLingering() { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 388f0a53e993b84376ce2549c6b041bed283b8a7..f99247b37a6fb04d27611051908364bcde168afa 100644 +index edb5d93684d959dbad0115643b3c9f5096ceee3a..18b2a6db3adee2ac2630d500005e0a4034cfbad7 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -876,6 +876,32 @@ public class CraftEventFactory { diff --git a/patches/server/0562-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0562-Fix-PlayerDropItemEvent-using-wrong-item.patch index fa462a043a..9b0d0e1d6f 100644 --- a/patches/server/0562-Fix-PlayerDropItemEvent-using-wrong-item.patch +++ b/patches/server/0562-Fix-PlayerDropItemEvent-using-wrong-item.patch @@ -31,7 +31,7 @@ index c81fd3e1108fb0a02f9240263404af2b968c8494..0d9de4c61c7b26a6ff37c12fde629161 } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 35cc5e6db0a860ddcc8b1eff1344f2a32df4bc88..997bea27d9aba6b10352e25f84b06caec4d56e01 100644 +index 31eccb60919eedf2dba23c759c3c29e011065edc..ce23e2058feea0583b58b56eb776f9eaf4c46fac 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -2483,7 +2483,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0569-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0569-Fix-kick-event-leave-message-not-being-sent.patch index 5455f31072..61a516dbd3 100644 --- a/patches/server/0569-Fix-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0569-Fix-kick-event-leave-message-not-being-sent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix kick event leave message not being sent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 997bea27d9aba6b10352e25f84b06caec4d56e01..1bcaf0c663070364c36f00a912c85fe0fca07f53 100644 +index ce23e2058feea0583b58b56eb776f9eaf4c46fac..a2dd1e423b97de27b9825dddb1705538982417b3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -289,7 +289,6 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0570-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0570-Don-t-apply-cramming-damage-to-players.patch index 8912e212bd..faba14eb93 100644 --- a/patches/server/0570-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0570-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 1bcaf0c663070364c36f00a912c85fe0fca07f53..0ea096ce4105e14729f12167a3ff1e62dd37971f 100644 +index a2dd1e423b97de27b9825dddb1705538982417b3..ca1bd7f63181ae8c00bf07732ad58416b356ba98 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -95,6 +95,7 @@ import net.minecraft.util.Mth; diff --git a/patches/server/0577-Add-PlayerSetSpawnEvent.patch b/patches/server/0577-Add-PlayerSetSpawnEvent.patch index 7473661836..6adf7a8c15 100644 --- a/patches/server/0577-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0577-Add-PlayerSetSpawnEvent.patch @@ -49,7 +49,7 @@ index a2d0699e8427b2262a2396495111125eccafbb66..15db9368227dbc29d07d74e85bd126b3 } } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 0ea096ce4105e14729f12167a3ff1e62dd37971f..08390a3608513a2172f5a5415b147af2369c8e6c 100644 +index ca1bd7f63181ae8c00bf07732ad58416b356ba98..3e9298db73d1318d28310f1a2536c9fca8b116b3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1425,7 +1425,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0595-Add-critical-damage-API.patch b/patches/server/0595-Add-critical-damage-API.patch index 9a52fb6f5d..8215f698f2 100644 --- a/patches/server/0595-Add-critical-damage-API.patch +++ b/patches/server/0595-Add-critical-damage-API.patch @@ -49,10 +49,10 @@ index c89b7cf63d067895bbd07f43eef467ff1861f625..536a4e3c26e83f359083bde19832a962 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 1f881f71d5698bc7b36bc029287ac8e873a46107..92b630475ef7032c9cae6288b2a0370562e25f57 100644 +index e8004c0689918a81369b404ab2a4143c26aa2b07..a2efc49f2b14c78991a3fa5b3e2cefee0209bcc1 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -415,6 +415,7 @@ public abstract class AbstractArrow extends Projectile { +@@ -422,6 +422,7 @@ public abstract class AbstractArrow extends Projectile { entityliving.setLastHurtMob(entity); } @@ -61,7 +61,7 @@ index 1f881f71d5698bc7b36bc029287ac8e873a46107..92b630475ef7032c9cae6288b2a03705 int k = entity.getRemainingFireTicks(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f99247b37a6fb04d27611051908364bcde168afa..e0c1eab089fff724e029ed8109a653403e15fc77 100644 +index 18b2a6db3adee2ac2630d500005e0a4034cfbad7..76e262cc2d6686096eb7b58b6e7343c2a0ecafe5 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1065,7 +1065,7 @@ public class CraftEventFactory { @@ -82,7 +82,7 @@ index f99247b37a6fb04d27611051908364bcde168afa..e0c1eab089fff724e029ed8109a65340 } else if (source.is(DamageTypes.FELL_OUT_OF_WORLD)) { return CraftEventFactory.callEntityDamageEvent(source.getDirectBlock(), source.getDirectBlockState(), entity, DamageCause.VOID, bukkitDamageSource, modifiers, modifierFunctions, cancelled); } else if (source.is(DamageTypes.LAVA)) { -@@ -1149,13 +1149,13 @@ public class CraftEventFactory { +@@ -1151,13 +1151,13 @@ public class CraftEventFactory { cause = DamageCause.CUSTOM; } diff --git a/patches/server/0602-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0602-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index 60586a4459..3b942d6ada 100644 --- a/patches/server/0602-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/server/0602-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -28,7 +28,7 @@ index efc27bb4072172f10839c181de9b5fba1f488b6f..4c739717fcf53b28312e8a98f9bf0989 } // Spigot End diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 08390a3608513a2172f5a5415b147af2369c8e6c..d31319cba4cb5698c63bacbdbdb91a800affc5e5 100644 +index 3e9298db73d1318d28310f1a2536c9fca8b116b3..0fe9c977d8313a1822eef17aebca1784faa03672 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1718,6 +1718,18 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0621-Ensure-valid-vehicle-status.patch b/patches/server/0621-Ensure-valid-vehicle-status.patch index 80ece6b202..1d5297804a 100644 --- a/patches/server/0621-Ensure-valid-vehicle-status.patch +++ b/patches/server/0621-Ensure-valid-vehicle-status.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ensure valid vehicle status diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index d31319cba4cb5698c63bacbdbdb91a800affc5e5..640c7c5076267f58bb8f16e9b151a6eb862dec7a 100644 +index 0fe9c977d8313a1822eef17aebca1784faa03672..bd37e1a78b42c948c7259b690001794d087a2e18 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -576,7 +576,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0680-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0680-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch index 46d0d117c4..17d61012f7 100644 --- a/patches/server/0680-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch +++ b/patches/server/0680-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch @@ -15,10 +15,10 @@ piercing arrows to avoid duplicate damage being applied. protected net.minecraft.world.entity.projectile.Projectile hitCancelled diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 92b630475ef7032c9cae6288b2a0370562e25f57..dfa44899529a7a9c32fe17fcb2091eab7d790f5a 100644 +index a2efc49f2b14c78991a3fa5b3e2cefee0209bcc1..114add343370700a7dbd438432635c76a0cbb871 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -322,6 +322,19 @@ public abstract class AbstractArrow extends Projectile { +@@ -329,6 +329,19 @@ public abstract class AbstractArrow extends Projectile { } } diff --git a/patches/server/0681-More-Projectile-API.patch b/patches/server/0681-More-Projectile-API.patch index e2fe2ef187..65d96303ec 100644 --- a/patches/server/0681-More-Projectile-API.patch +++ b/patches/server/0681-More-Projectile-API.patch @@ -682,7 +682,7 @@ index e374b9f40eddca13b30855d25a2030f8df98138f..4fc893378fb0568ddcffc7593d66df6b // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e0c1eab089fff724e029ed8109a653403e15fc77..877990d391432f144e0013679aca8c9cfebda03d 100644 +index 76e262cc2d6686096eb7b58b6e7343c2a0ecafe5..f47c881aada65e91a6a433b0d2df031f8f01c6b8 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -833,19 +833,19 @@ public class CraftEventFactory { diff --git a/patches/server/0690-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0690-Fix-new-block-data-for-EntityChangeBlockEvent.patch index 4311488b01..924b330ad8 100644 --- a/patches/server/0690-Fix-new-block-data-for-EntityChangeBlockEvent.patch +++ b/patches/server/0690-Fix-new-block-data-for-EntityChangeBlockEvent.patch @@ -196,10 +196,10 @@ index edc20745649b0837f1371c8d29e71fc0c8e5528f..932831bb5632ead5850842fc77192c84 } // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 877990d391432f144e0013679aca8c9cfebda03d..972c54fbdf7d3ab74f8f8ea62144805c9301399f 100644 +index f47c881aada65e91a6a433b0d2df031f8f01c6b8..15afaf9b2fcff25288eb5739c9cc72fb301b875a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1359,11 +1359,11 @@ public class CraftEventFactory { +@@ -1361,11 +1361,11 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0691-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0691-fix-player-loottables-running-when-mob-loot-gamerule.patch index e0e016beb1..a2415395a6 100644 --- a/patches/server/0691-fix-player-loottables-running-when-mob-loot-gamerule.patch +++ b/patches/server/0691-fix-player-loottables-running-when-mob-loot-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix player loottables running when mob loot gamerule is false diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 640c7c5076267f58bb8f16e9b151a6eb862dec7a..4b3c53406ee9a420c997d75e996c5a3d82300b0c 100644 +index bd37e1a78b42c948c7259b690001794d087a2e18..c364023ca15d837b64ac1bc2d0c3877fd86ab3cf 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -961,12 +961,14 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0717-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0717-Add-option-for-strict-advancement-dimension-checks.patch index 565ab435d6..a58d273ef9 100644 --- a/patches/server/0717-Add-option-for-strict-advancement-dimension-checks.patch +++ b/patches/server/0717-Add-option-for-strict-advancement-dimension-checks.patch @@ -24,7 +24,7 @@ index 01b8f7024fbc965bc6a7f97f79ba3dec964ef769..801823d003a8e28a13fe90db4604cd09 } else { BlockPos blockPos = BlockPos.containing(x, y, z); diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 4b3c53406ee9a420c997d75e996c5a3d82300b0c..44f7a8e71f1a4e43a7ecc169d3b6c41bc146c08b 100644 +index c364023ca15d837b64ac1bc2d0c3877fd86ab3cf..d8a21c34cb93fe36e98c8b36ea9aea7068753c6d 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1390,6 +1390,12 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0757-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0757-Correctly-handle-interactions-with-items-on-cooldown.patch index 96df3be322..5b61753747 100644 --- a/patches/server/0757-Correctly-handle-interactions-with-items-on-cooldown.patch +++ b/patches/server/0757-Correctly-handle-interactions-with-items-on-cooldown.patch @@ -30,7 +30,7 @@ index 03d89f326d320c5d778c3d1e2db7d6b88753faec..717d015dd4637dd9d568b751be1dc104 this.interactResult = event.useItemInHand() == Event.Result.DENY; this.interactPosition = blockposition.immutable(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 972c54fbdf7d3ab74f8f8ea62144805c9301399f..b1c99a83726749229c4d386984c76c3ffdfc5ae2 100644 +index 15afaf9b2fcff25288eb5739c9cc72fb301b875a..8233b2287c9cf3cfb4fd3f44d61c055e4076b355 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -546,6 +546,12 @@ public class CraftEventFactory { diff --git a/patches/server/0758-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0758-Add-PlayerInventorySlotChangeEvent.patch index b8b08a3592..56b45fccca 100644 --- a/patches/server/0758-Add-PlayerInventorySlotChangeEvent.patch +++ b/patches/server/0758-Add-PlayerInventorySlotChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerInventorySlotChangeEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 44f7a8e71f1a4e43a7ecc169d3b6c41bc146c08b..b8436860aa301baf3f4b9c45d947812fec566751 100644 +index d8a21c34cb93fe36e98c8b36ea9aea7068753c6d..22771e7c77032b579cdd8e0184e66576b314a530 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -352,6 +352,25 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0781-Sync-offhand-slot-in-menus.patch b/patches/server/0781-Sync-offhand-slot-in-menus.patch index 02fc790cef..6f4471b8bc 100644 --- a/patches/server/0781-Sync-offhand-slot-in-menus.patch +++ b/patches/server/0781-Sync-offhand-slot-in-menus.patch @@ -8,7 +8,7 @@ offhand slot isn't sent. This is not correct because you *can* put stuff into th by pressing the offhand swap item diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b8436860aa301baf3f4b9c45d947812fec566751..58e7bb57ef9915cf9c497ad53e67e95535291ddd 100644 +index 22771e7c77032b579cdd8e0184e66576b314a530..ff0fae77868a8b0e0acee35ea39dbbb98af03e99 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -321,6 +321,13 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0805-Add-EntityFertilizeEggEvent.patch b/patches/server/0805-Add-EntityFertilizeEggEvent.patch index 1ab7ad4432..a077b2cfc0 100644 --- a/patches/server/0805-Add-EntityFertilizeEggEvent.patch +++ b/patches/server/0805-Add-EntityFertilizeEggEvent.patch @@ -69,10 +69,10 @@ index d34d8fe70379dcad9540739ec0ae1c94f01fc46b..fadd341ff398886a4da102eefa1beb95 this.playSound(SoundEvents.SNIFFER_EGG_PLOP, 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 0.5F); } // Paper - Call EntityDropItemEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index b1c99a83726749229c4d386984c76c3ffdfc5ae2..7fa64d9081ce54d91eb7631c7d8623ed11d9954b 100644 +index 8233b2287c9cf3cfb4fd3f44d61c055e4076b355..63038e0ca10507751218fda5b9ace3cb6295e817 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2126,4 +2126,28 @@ public class CraftEventFactory { +@@ -2128,4 +2128,28 @@ public class CraftEventFactory { return event.callEvent(); } // Paper end diff --git a/patches/server/0825-Expand-PlayerItemMendEvent.patch b/patches/server/0825-Expand-PlayerItemMendEvent.patch index 819c2181a8..73068bdf5a 100644 --- a/patches/server/0825-Expand-PlayerItemMendEvent.patch +++ b/patches/server/0825-Expand-PlayerItemMendEvent.patch @@ -49,10 +49,10 @@ index ee5d93cd0c7ea7376e8488265d4e21610edeedc2..e84337b01ec7e5c530a4c6042b938638 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7fa64d9081ce54d91eb7631c7d8623ed11d9954b..5a6f954e0d01253cf861ae16c6055744d07acdb9 100644 +index 63038e0ca10507751218fda5b9ace3cb6295e817..214a1b8901947e8c08e8d7fc3f19e866a21350c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1265,10 +1265,10 @@ public class CraftEventFactory { +@@ -1267,10 +1267,10 @@ public class CraftEventFactory { return event; } diff --git a/patches/server/0840-Call-missing-BlockDispenseEvent.patch b/patches/server/0840-Call-missing-BlockDispenseEvent.patch index 3554c7ea2c..97050595b8 100644 --- a/patches/server/0840-Call-missing-BlockDispenseEvent.patch +++ b/patches/server/0840-Call-missing-BlockDispenseEvent.patch @@ -50,10 +50,10 @@ index 96db0b1041a4c0f054d4f3f2bdced960b119664e..78951f50188528718cdb3dbbaabe3f9f for (int k = 0; k < 5; ++k) { worldserver.sendParticles(ParticleTypes.SPLASH, (double) blockposition.getX() + worldserver.random.nextDouble(), (double) (blockposition.getY() + 1), (double) blockposition.getZ() + worldserver.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 5a6f954e0d01253cf861ae16c6055744d07acdb9..370672a22ce1fdf7eb9708cce8d25e8d0687b07a 100644 +index 214a1b8901947e8c08e8d7fc3f19e866a21350c8..35b6443d15678ec84271dcebf29b98b36df97a6e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2127,6 +2127,32 @@ public class CraftEventFactory { +@@ -2129,6 +2129,32 @@ public class CraftEventFactory { } // Paper end diff --git a/patches/server/0849-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0849-ExperienceOrb-should-call-EntitySpawnEvent.patch index b1aa9b3fb6..542bede5c4 100644 --- a/patches/server/0849-ExperienceOrb-should-call-EntitySpawnEvent.patch +++ b/patches/server/0849-ExperienceOrb-should-call-EntitySpawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 370672a22ce1fdf7eb9708cce8d25e8d0687b07a..68541f68d884a2d4d35af6dd62dc9062c3758056 100644 +index 35b6443d15678ec84271dcebf29b98b36df97a6e..7b1de2fddd5ff236c477439142c6e38a580d7f56 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -736,7 +736,8 @@ public class CraftEventFactory { diff --git a/patches/server/0874-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0874-Add-BlockFace-to-BlockDamageEvent.patch index 23d09a65d0..7ad1e7c9e4 100644 --- a/patches/server/0874-Add-BlockFace-to-BlockDamageEvent.patch +++ b/patches/server/0874-Add-BlockFace-to-BlockDamageEvent.patch @@ -18,7 +18,7 @@ index c680f081ba548f84f07a968a46811090c53e57e3..d839f8df658c894f144ba4637d290ffb if (blockEvent.isCancelled()) { // Let the client know the block still exists diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 68541f68d884a2d4d35af6dd62dc9062c3758056..913e36497098aa8f6c17d7ec22b7780e6653f30c 100644 +index 7b1de2fddd5ff236c477439142c6e38a580d7f56..361ad90853dbd7dc2d502f224f355d6d5e9c92cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -651,13 +651,13 @@ public class CraftEventFactory { diff --git a/patches/server/0883-Fix-inventory-desync.patch b/patches/server/0883-Fix-inventory-desync.patch index 28e08c0669..f9f1cad8e3 100644 --- a/patches/server/0883-Fix-inventory-desync.patch +++ b/patches/server/0883-Fix-inventory-desync.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix inventory desync diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 58e7bb57ef9915cf9c497ad53e67e95535291ddd..c31d5459cdee1ba6ebb68bcf9785f98234ab5594 100644 +index ff0fae77868a8b0e0acee35ea39dbbb98af03e99..acb594f93c40e19cc441d4444dbcb85aaae0a92b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -402,6 +402,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { diff --git a/patches/server/0884-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0884-Add-titleOverride-to-InventoryOpenEvent.patch index f333a3a97e..1b322025c9 100644 --- a/patches/server/0884-Add-titleOverride-to-InventoryOpenEvent.patch +++ b/patches/server/0884-Add-titleOverride-to-InventoryOpenEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add titleOverride to InventoryOpenEvent diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c31d5459cdee1ba6ebb68bcf9785f98234ab5594..1e0089b379d0d01d119f385916cc4b3d8b04bae6 100644 +index acb594f93c40e19cc441d4444dbcb85aaae0a92b..ee1ac37298232c91264e5bff52a12dfdd7480fcb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1659,12 +1659,17 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -79,10 +79,10 @@ index 3d36d79a4e7f16f6face3465cdf54656984f3ebc..41f3cdec7deabf34358b8087df77169f if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper - Prevent opening inventories when frozen player.containerMenu = container; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 913e36497098aa8f6c17d7ec22b7780e6653f30c..eee1261127e47ed0250ecb2d8b77993bb8730fc6 100644 +index 361ad90853dbd7dc2d502f224f355d6d5e9c92cc..c9a38f6b91ac538aea4c4a6f23d18415585a931b 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1382,10 +1382,21 @@ public class CraftEventFactory { +@@ -1384,10 +1384,21 @@ public class CraftEventFactory { } public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container) { @@ -105,7 +105,7 @@ index 913e36497098aa8f6c17d7ec22b7780e6653f30c..eee1261127e47ed0250ecb2d8b77993b if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open player.connection.handleContainerClose(new ServerboundContainerClosePacket(player.containerMenu.containerId), InventoryCloseEvent.Reason.OPEN_NEW); // Paper - Inventory close reason } -@@ -1400,10 +1411,10 @@ public class CraftEventFactory { +@@ -1402,10 +1413,10 @@ public class CraftEventFactory { if (event.isCancelled()) { container.transferTo(player.containerMenu, craftPlayer); diff --git a/patches/server/0920-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0920-Restore-vanilla-entity-drops-behavior.patch index 3cbfe52a9a..34f07dad88 100644 --- a/patches/server/0920-Restore-vanilla-entity-drops-behavior.patch +++ b/patches/server/0920-Restore-vanilla-entity-drops-behavior.patch @@ -9,7 +9,7 @@ on dropping the item instead of generalizing it for all dropped items like CB does. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 1e0089b379d0d01d119f385916cc4b3d8b04bae6..c39ba9d193122d08d3bf43bf3e148e98aa1a57e2 100644 +index ee1ac37298232c91264e5bff52a12dfdd7480fcb..40b5d379e917771b30d888eb390f5d5698a34ffb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -978,22 +978,20 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player { @@ -22,7 +22,7 @@ index 1e0089b379d0d01d119f385916cc4b3d8b04bae6..c39ba9d193122d08d3bf43bf3e148e98 if (!keepInventory) { for (ItemStack item : this.getInventory().getContents()) { - if (!item.isEmpty() && EnchantmentHelper.has(item, EnchantmentEffectComponents.PREVENT_EQUIPMENT_DROP)) { + if (!item.isEmpty() && !EnchantmentHelper.has(item, EnchantmentEffectComponents.PREVENT_EQUIPMENT_DROP)) { - loot.add(CraftItemStack.asCraftMirror(item)); + loot.add(new DefaultDrop(item, stack -> this.drop(stack, true, false, false))); // Paper - Restore vanilla drops behavior; drop function taken from Inventory#dropAll (don't fire drop event) } @@ -165,7 +165,7 @@ index 5bcb9a53ebebeef4bd6ec2458df4b63002ebd804..2f398750bfee5758ad8b1367b6fc1436 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index eee1261127e47ed0250ecb2d8b77993bb8730fc6..2821ad7116b4606a09eab86de63474b85dceaafe 100644 +index c9a38f6b91ac538aea4c4a6f23d18415585a931b..bec1f62559b42acee6c955baf7851aecb9179e16 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -965,18 +965,24 @@ public class CraftEventFactory { diff --git a/patches/server/0926-Add-drops-to-shear-events.patch b/patches/server/0926-Add-drops-to-shear-events.patch index d756f848f4..c29c4f4212 100644 --- a/patches/server/0926-Add-drops-to-shear-events.patch +++ b/patches/server/0926-Add-drops-to-shear-events.patch @@ -275,10 +275,10 @@ index 8420d75865b86e1d8afea2527b5521cac184e8b1..6e290d67b00c88ecd2cf2ce5f612f52e public boolean readyForShearing() { return !this.isSheared() && this.isAlive(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2821ad7116b4606a09eab86de63474b85dceaafe..bab47ffad0ae43bfed2b1866a2b1a562f9503c9f 100644 +index bec1f62559b42acee6c955baf7851aecb9179e16..1af662ca881d656b17697fce837f659349241234 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1667,20 +1667,20 @@ public class CraftEventFactory { +@@ -1669,20 +1669,20 @@ public class CraftEventFactory { player.level().getCraftServer().getPluginManager().callEvent(event); } diff --git a/patches/server/0928-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0928-Validate-ResourceLocation-in-NBT-reading.patch index 1e72001076..a054908025 100644 --- a/patches/server/0928-Validate-ResourceLocation-in-NBT-reading.patch +++ b/patches/server/0928-Validate-ResourceLocation-in-NBT-reading.patch @@ -97,10 +97,10 @@ index 56873752ae1ae0d2a36cb171d2de6884e15c01a5..5bac748649f43d74b13e7c0b4d355e67 } diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index dfa44899529a7a9c32fe17fcb2091eab7d790f5a..56729d5c5f0cd383b22c127ebbb394c30bf95aa7 100644 +index 114add343370700a7dbd438432635c76a0cbb871..0bf0e1586c80076a41b9f75b5e59e806b91bf825 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -@@ -642,7 +642,7 @@ public abstract class AbstractArrow extends Projectile { +@@ -649,7 +649,7 @@ public abstract class AbstractArrow extends Projectile { this.setCritArrow(nbt.getBoolean("crit")); this.setPierceLevel(nbt.getByte("PierceLevel")); if (nbt.contains("SoundEvent", 8)) { diff --git a/patches/server/0952-Fix-DamageSource-API.patch b/patches/server/0952-Fix-DamageSource-API.patch index 9e71d42085..1cf932b9ac 100644 --- a/patches/server/0952-Fix-DamageSource-API.patch +++ b/patches/server/0952-Fix-DamageSource-API.patch @@ -107,14 +107,14 @@ index 7bc612890f941177da11da0ce047d5a74d8ebb33..270acce7411e5ada71eaa04c05efc888 if (damager != null) { event = new HangingBreakByEntityEvent((Hanging) this.getBukkitEntity(), damager.getBukkitEntity(), source.is(DamageTypeTags.IS_EXPLOSION) ? HangingBreakEvent.RemoveCause.EXPLOSION : HangingBreakEvent.RemoveCause.ENTITY); diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java -index b3dd475b1c6cd10f89760e59cbba219df19948b6..cb1b19e2e0d8f0744b2355b8f4da0206b196b19c 100644 +index acc844c10db9cb42c0e70f3b467e620906b739f0..cb1b19e2e0d8f0744b2355b8f4da0206b196b19c 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java @@ -271,7 +271,7 @@ public class Creeper extends Monster implements PowerableMob { if (!event.isCancelled()) { // CraftBukkit end this.dead = true; -- this.level().explode(this, this.level().damageSources().explosion(this, this.entityIgniter, net.minecraft.world.damagesource.DamageTypes.EXPLOSION), null, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit +- this.level().explode(this, net.minecraft.world.level.Explosion.getDefaultDamageSource(this.level(), this).customEntityDamager(this.entityIgniter), null, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit + this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), Level.ExplosionInteraction.MOB); // CraftBukkit // Paper - fix DamageSource API (revert to vanilla, no, just no, don't change this) this.spawnLingeringCloud(); this.triggerOnDeathMobEffects(Entity.RemovalReason.KILLED); @@ -197,7 +197,7 @@ index 4c6e15535fa40aad8cf1920f392589404f9ba79c..35eb95ef6fb6a0f7ea63351e90741c48 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index bab47ffad0ae43bfed2b1866a2b1a562f9503c9f..867450afbdbcd43a9daa6894ae22d0479cd11714 100644 +index 1af662ca881d656b17697fce837f659349241234..37bd0b7a1bfb9d59efa803e453f39d4e3fc916a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1085,7 +1085,7 @@ public class CraftEventFactory { diff --git a/patches/server/0968-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0968-Fix-helmet-damage-reduction-inconsistencies.patch index 8d0cdbdf72..bbce375f3f 100644 --- a/patches/server/0968-Fix-helmet-damage-reduction-inconsistencies.patch +++ b/patches/server/0968-Fix-helmet-damage-reduction-inconsistencies.patch @@ -7,10 +7,10 @@ Affect the falling stalactite damage type where the reduction is not applied like in Vanilla diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 867450afbdbcd43a9daa6894ae22d0479cd11714..042f6ec4372121fcb755504a64a1746055eb667a 100644 +index 37bd0b7a1bfb9d59efa803e453f39d4e3fc916a4..bd6fee3e3ad9116802ff8bb57bfa741b881c4057 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1213,7 +1213,7 @@ public class CraftEventFactory { +@@ -1215,7 +1215,7 @@ public class CraftEventFactory { Map> modifierFunctions = new EnumMap<>(DamageModifier.class); modifiers.put(DamageModifier.BASE, rawDamage); modifierFunctions.put(DamageModifier.BASE, CraftEventFactory.ZERO); diff --git a/work/Bukkit b/work/Bukkit index b0a1d5b748..befcf86d22 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit b0a1d5b74806be6c64ac48b16fa91b3667fe7541 +Subproject commit befcf86d22f9576c361bba18b2ec725e41508a65 diff --git a/work/CraftBukkit b/work/CraftBukkit index a4c2ee70db..a1d2cd1521 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit a4c2ee70db50ade62436c7eaf6ec1f5376dce192 +Subproject commit a1d2cd1521b97cb4048f990455d78e7c9fb94e82