diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch index 2d7a462cb..e99ac6c66 100644 --- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch @@ -20,7 +20,7 @@ index f7a0a33e49cadf9b2bd43f118c106937760da762..50dec5cb5e924301842300e8fc80cb67 + } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index dd140b5e55c8ffea7e60962602435c2bd992c048..791474acb3d6219eb43255eda907738b1471158e 100644 +index 5a06220f876c868ac2ddb4aeaad9f91f0804f2a5..0747b943491c6b7d9e7862307d041a5fb8072b6c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -61,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -32,7 +32,7 @@ index dd140b5e55c8ffea7e60962602435c2bd992c048..791474acb3d6219eb43255eda907738b private final RecipeBookServer recipeBook = new RecipeBookServer(); private Vec3D cf; private int cg; -@@ -766,6 +766,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -767,6 +767,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.decouple(); this.getWorldServer().removePlayer(this); if (!this.viewingCredits) { diff --git a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch index 591dd0c87..fe9fd36d6 100644 --- a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch +++ b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch @@ -34,10 +34,10 @@ index acb246076e5b127703c8080a8c5000c8cb05e4ec..ca0b6424379f5470315815e6f3d9731c return null; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 603d42098d9f78828e75e5411f1a97371ebaebab..339cb8c54152290b048d7d601e0ebb7ad9f4c646 100644 +index 91496373c4dfb97adc2255e59ef413c7c78d009c..0751dd4babcb69d05ddf05c006f01d42597a1564 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -871,7 +871,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -872,7 +872,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { protected CraftPortalEvent callPortalEvent(Entity entity, WorldServer exitWorldServer, BlockPosition exitPosition, TeleportCause cause, int searchRadius, int creationRadius) { Location enter = this.getBukkitEntity().getLocation(); Location exit = new Location(exitWorldServer.getWorld(), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ(), yaw, pitch); diff --git a/Spigot-Server-Patches/0091-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0091-Implement-PlayerLocaleChangeEvent.patch index 92106c376..865bb279c 100644 --- a/Spigot-Server-Patches/0091-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0091-Implement-PlayerLocaleChangeEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 339cb8c54152290b048d7d601e0ebb7ad9f4c646..a4252ef2d5fcd66b47c87fc904f9dac5c4402724 100644 +index 0751dd4babcb69d05ddf05c006f01d42597a1564..bb91aec892f4e55fbe9bebe9c47aebb560238281 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1539,16 +1539,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1540,16 +1540,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return s; } diff --git a/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch index e10e4844b..8fd557945 100644 --- a/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0118-Cache-user-authenticator-threads.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache user authenticator threads diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5f8d7d71886de1e1dec23453d4e9a72000661cc5..9e2d39cbad7e52fe2338623fbbda65b273062276 100644 +index 61a4db3a8f2ea58aae2c84dc2d954de5cf8273ab..84c48018a070e877d1caf6c1d741cd5de7d9c631 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -4,7 +4,9 @@ import com.google.common.collect.Lists; @@ -50,7 +50,7 @@ index 5f8d7d71886de1e1dec23453d4e9a72000661cc5..9e2d39cbad7e52fe2338623fbbda65b2 this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint)); } -@@ -1406,7 +1415,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1407,7 +1416,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.lastHealthSent = -1.0F; this.lastFoodSent = -1; // this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit diff --git a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch index e2d919e4a..ea2e7c856 100644 --- a/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0130-Properly-fix-item-duplication-bug.patch @@ -6,10 +6,10 @@ 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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 9e2d39cbad7e52fe2338623fbbda65b273062276..044fecfda9dc9f7f503f39b26adab55c98b909c4 100644 +index 84c48018a070e877d1caf6c1d741cd5de7d9c631..f76b3de873a28ca29b77c45c61b55f05ecff7ad8 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1904,7 +1904,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1905,7 +1905,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override protected boolean isFrozen() { diff --git a/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch index 5819d74b4..7bcb8b460 100644 --- a/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0237-InventoryCloseEvent-Reason-API.patch @@ -34,7 +34,7 @@ index 0f7e162b342ac589dc357508a1dcd1ab02d1fe3e..cc20b73a993d021789840ed2ee7ba1fc this.activeContainer = this.defaultContainer; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 4be86db18a77af058a4227f6cb23abd2c5e41051..fa211442594c72c0d9b2fddc85472aa9939d6d1e 100644 +index af3d0ffd6d8b3a7f794e5084551cd6d31df10fc1..a7dc4aabf10c9b9b10897e7540c4da9b0a2b6eb8 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -412,7 +412,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -55,7 +55,7 @@ index 4be86db18a77af058a4227f6cb23abd2c5e41051..fa211442594c72c0d9b2fddc85472aa9 } String deathMessage = event.getDeathMessage(); -@@ -1138,7 +1138,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1139,7 +1139,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return OptionalInt.empty(); } else { if (this.activeContainer != this.defaultContainer) { @@ -64,7 +64,7 @@ index 4be86db18a77af058a4227f6cb23abd2c5e41051..fa211442594c72c0d9b2fddc85472aa9 } this.nextContainerCounter(); -@@ -1198,7 +1198,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1199,7 +1199,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } // CraftBukkit end if (this.activeContainer != this.defaultContainer) { @@ -73,7 +73,7 @@ index 4be86db18a77af058a4227f6cb23abd2c5e41051..fa211442594c72c0d9b2fddc85472aa9 } // this.nextContainerCounter(); // CraftBukkit - moved up -@@ -1262,7 +1262,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1263,7 +1263,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @Override public void closeInventory() { diff --git a/Spigot-Server-Patches/0301-Call-player-spectator-target-events-and-improve-impl.patch b/Spigot-Server-Patches/0301-Call-player-spectator-target-events-and-improve-impl.patch index 8c19ebfb0..eeeba4dce 100644 --- a/Spigot-Server-Patches/0301-Call-player-spectator-target-events-and-improve-impl.patch +++ b/Spigot-Server-Patches/0301-Call-player-spectator-target-events-and-improve-impl.patch @@ -19,10 +19,10 @@ spectate the target entity. Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 32aba006312ef30401e09cf05325dd1fa82bfed0..da4f0ef74898eb327449f0dccb34afb63235b3b1 100644 +index d6586e2c36f89328ba482230ae7d6a050966ed27..d1f716067e6c71f523c7561b9ef92f4296d1a726 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1659,15 +1659,59 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1660,15 +1660,59 @@ public class EntityPlayer extends EntityHuman implements ICrafting { return (Entity) (this.spectatedEntity == null ? this : this.spectatedEntity); } diff --git a/Spigot-Server-Patches/0307-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0307-Reset-players-airTicks-on-respawn.patch index 5f5552da4..d34785555 100644 --- a/Spigot-Server-Patches/0307-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0307-Reset-players-airTicks-on-respawn.patch @@ -17,10 +17,10 @@ index f3b69a5eb5d15738d7061e10643ace23bd3718c4..f13cb4fec9da1773729630bc0e8bd01b return 300; } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index da4f0ef74898eb327449f0dccb34afb63235b3b1..aaa4f3e26f52fd978ca421d2339627b9647c18e2 100644 +index d1f716067e6c71f523c7561b9ef92f4296d1a726..01d679cfa6ad8f5dc5bb4539197a59cb00c65337 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1996,6 +1996,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1997,6 +1997,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } this.setHealth(this.getMaxHealth()); diff --git a/Spigot-Server-Patches/0319-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0319-force-entity-dismount-during-teleportation.patch index 5f0768607..ada44a955 100644 --- a/Spigot-Server-Patches/0319-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0319-force-entity-dismount-during-teleportation.patch @@ -112,10 +112,10 @@ index b4b45d93188494ae0639ae4eb9c764a48fe21607..7c239b95c9f8dfa76d397979e6b3fdcc this.a(entity); } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index aaa4f3e26f52fd978ca421d2339627b9647c18e2..f68d5931a3d2df5f69032c49a4b2b80a0783f504 100644 +index 01d679cfa6ad8f5dc5bb4539197a59cb00c65337..d27868d71af20579dff1109e78029b19347da058 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1106,11 +1106,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1107,11 +1107,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } } diff --git a/Spigot-Server-Patches/0325-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0325-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index eb751c206..e8ed67477 100644 --- a/Spigot-Server-Patches/0325-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0325-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index ce43462b9a9a393b51a2c4b96467ebd007fd7126..717786be86f76c384b4a1f56169b948e2297de38 100644 +index ed82053bdf27cc8dbef03565f27e27516bd42d08..7c4fb3585d2813974cdaf24fc653a0f562e38398 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -1372,6 +1372,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1373,6 +1373,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void p() { this.ch = true; this.ejectPassengers(); diff --git a/Spigot-Server-Patches/0380-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0380-implement-optional-per-player-mob-spawns.patch index e0154048c..f06987131 100644 --- a/Spigot-Server-Patches/0380-implement-optional-per-player-mob-spawns.patch +++ b/Spigot-Server-Patches/0380-implement-optional-per-player-mob-spawns.patch @@ -573,7 +573,7 @@ index 55feb186e4f3f7985efdf7c4410ed4232e52733e..dce9c62c0cf37a37994537b74dfdc228 this.p = spawnercreature_d; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 8f9f1bb7f30632edcba4feae414a11d795610e05..80d613e5b241bb27dd7d7d17f2d3570469d3315d 100644 +index bd79a9464618972305139566b21c8aaa0a5e23db..697068cbccde5b57f788246c2e1f4a5e7194993e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -87,6 +87,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -596,7 +596,7 @@ index 8f9f1bb7f30632edcba4feae414a11d795610e05..80d613e5b241bb27dd7d7d17f2d35704 } // Yes, this doesn't match Vanilla, but it's the best we can do for now. -@@ -1900,6 +1906,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1901,6 +1907,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } diff --git a/Spigot-Server-Patches/0388-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0388-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch index 5a65daa3a..2dc6453b6 100644 --- a/Spigot-Server-Patches/0388-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ b/Spigot-Server-Patches/0388-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 80d613e5b241bb27dd7d7d17f2d3570469d3315d..e82d4b4ef55f981ea653e53424a5a8c746fa70d3 100644 +index 697068cbccde5b57f788246c2e1f4a5e7194993e..256677a48d1eebff89fa24dfbdc76a5003e4397d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -942,6 +942,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -943,6 +943,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { this.lastHealthSent = -1.0F; this.lastFoodSent = -1; diff --git a/Spigot-Server-Patches/0448-Prevent-opening-inventories-when-frozen.patch b/Spigot-Server-Patches/0448-Prevent-opening-inventories-when-frozen.patch index 37d1162dc..0d9f38d17 100644 --- a/Spigot-Server-Patches/0448-Prevent-opening-inventories-when-frozen.patch +++ b/Spigot-Server-Patches/0448-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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2f1f57dc347e37c2b2be0cc7930174aa66bf9d67..52fa2cb225754125f8f28e9a2dca3fa2887ffed8 100644 +index cc7710ab19e4805dff4336a22e0b29af564f8955..4d117ed0de75672fe95341832ec032b665179b39 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -424,7 +424,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -17,7 +17,7 @@ index 2f1f57dc347e37c2b2be0cc7930174aa66bf9d67..52fa2cb225754125f8f28e9a2dca3fa2 this.closeInventory(org.bukkit.event.inventory.InventoryCloseEvent.Reason.CANT_USE); // Paper this.activeContainer = this.defaultContainer; } -@@ -1251,7 +1251,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1252,7 +1252,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } else { // CraftBukkit start this.activeContainer = container; @@ -26,7 +26,7 @@ index 2f1f57dc347e37c2b2be0cc7930174aa66bf9d67..52fa2cb225754125f8f28e9a2dca3fa2 // CraftBukkit end container.addSlotListener(this); return OptionalInt.of(this.containerCounter); -@@ -2042,7 +2042,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -2043,7 +2043,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } @Override diff --git a/Spigot-Server-Patches/0453-Implement-Player-Client-Options-API.patch b/Spigot-Server-Patches/0453-Implement-Player-Client-Options-API.patch index 452d78b6b..8b844be0a 100644 --- a/Spigot-Server-Patches/0453-Implement-Player-Client-Options-API.patch +++ b/Spigot-Server-Patches/0453-Implement-Player-Client-Options-API.patch @@ -98,7 +98,7 @@ index eae7bfa171e648b8ec51465a8d9f7d9b7c59a2c9..ce4ebc96c01f3dacf4e4d0569d86f521 protected static final DataWatcherObject bk = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p); protected static final DataWatcherObject bl = DataWatcher.a(EntityHuman.class, DataWatcherRegistry.p); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 52fa2cb225754125f8f28e9a2dca3fa2887ffed8..b22eb32199de78730bc6db5d803fadde5fd3b7c1 100644 +index 4d117ed0de75672fe95341832ec032b665179b39..a5e3ba2ed7369473f61d0e5ceca58ac2b44ea3ee 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -118,7 +118,7 @@ index 52fa2cb225754125f8f28e9a2dca3fa2887ffed8..b22eb32199de78730bc6db5d803fadde private long ca = SystemUtils.getMonotonicMillis(); private Entity spectatedEntity; public boolean worldChangeInvuln; -@@ -1652,6 +1653,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { +@@ -1653,6 +1654,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public String locale = null; // CraftBukkit - lowercase // Paper - default to null public void a(PacketPlayInSettings packetplayinsettings) { diff --git a/work/CraftBukkit b/work/CraftBukkit index bad55dbb5..9aafdc9a7 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit bad55dbb5a5268934f3fcfc467bcd44c40426633 +Subproject commit 9aafdc9a782861665917c8f8490e9cf4eb7fd062