diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch index 3826a48b3e..819337ce6b 100644 --- a/patches/api/0006-Adventure.patch +++ b/patches/api/0006-Adventure.patch @@ -4307,12 +4307,12 @@ index 5adbe0514129abf3cfbc4b29a213f522359fe2e1..72ebc29db42d08d1d0361dba462fc8a5 /** diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java -index e12996492c1558fed9fab30de9f8018e0ed7fac3..002acfbdce1db10f7ba1b6a013e678f504ac6e69 100644 +index 6a8a9eb4d50e371b003f34c3b522c4939826f5dc..8423a1d4ef4a39bb1734b56f8a396d73b264ac9a 100644 --- a/src/main/java/org/bukkit/inventory/InventoryView.java +++ b/src/main/java/org/bukkit/inventory/InventoryView.java -@@ -447,12 +447,26 @@ public abstract class InventoryView { - return getPlayer().setWindowProperty(prop, value); - } +@@ -271,12 +271,26 @@ public interface InventoryView { + */ + public boolean setProperty(@NotNull Property prop, int value); + // Paper start /** @@ -4321,7 +4321,7 @@ index e12996492c1558fed9fab30de9f8018e0ed7fac3..002acfbdce1db10f7ba1b6a013e678f5 * @return The title. */ @NotNull -+ public /*abstract*/ net.kyori.adventure.text.Component title() { ++ default net.kyori.adventure.text.Component title() { + return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(this.getTitle()); + } + // Paper end @@ -4334,7 +4334,7 @@ index e12996492c1558fed9fab30de9f8018e0ed7fac3..002acfbdce1db10f7ba1b6a013e678f5 + */ + @Deprecated // Paper + @NotNull - public abstract String getTitle(); + public String getTitle(); /** diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java diff --git a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch index 02217b6f29..b2e2507384 100644 --- a/patches/api/0166-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0166-Fix-Spigot-annotation-mistakes.patch @@ -1139,6 +1139,19 @@ index f2a2a2ad9930499c5bf624e73571a3294a90db14..c8540a42ab44647fdd112ce4f731f3dc public ItemStack getCursor() { return getView().getCursor(); } +diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java +index 32cd8ee2e849df602a7e10aa5d0a218007faa0ac..fbdbd2f4da5e09d4b111ddcf72e2d7dd59046bd7 100644 +--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java ++++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java +@@ -153,7 +153,7 @@ public enum InventoryType { + * + * @deprecated use {@link #SMITHING} + */ +- @Deprecated ++ @Deprecated(forRemoval = true) // Paper + SMITHING_NEW(4, "Upgrade Gear"), + ; + diff --git a/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java b/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java index 1cb70b5c8776863f44f1c4cdde152c35cb51edb5..f09b378508fcc6299e7cb40f174028f6f88ba067 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBedLeaveEvent.java @@ -1369,10 +1382,10 @@ index f1a48eab1a357ae64545e1f1dc941c383cff8707..466d1bd7089b76f48f953e1a51c611ec /** * Checks if the inventory contains any ItemStacks with the given diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java -index 002acfbdce1db10f7ba1b6a013e678f504ac6e69..8d14426eb1ebea27058d5f22ea652f22d00fccb9 100644 +index 8423a1d4ef4a39bb1734b56f8a396d73b264ac9a..1e50dba6bb8753e6c1adff59ee0ff93adf3bfd4f 100644 --- a/src/main/java/org/bukkit/inventory/InventoryView.java +++ b/src/main/java/org/bukkit/inventory/InventoryView.java -@@ -126,9 +126,9 @@ public abstract class InventoryView { +@@ -125,9 +125,9 @@ public interface InventoryView { * Gets the id of this view. * * @return the id of this view @@ -1384,7 +1397,7 @@ index 002acfbdce1db10f7ba1b6a013e678f504ac6e69..8d14426eb1ebea27058d5f22ea652f22 public int getId() { return id; } -@@ -210,10 +210,10 @@ public abstract class InventoryView { +@@ -197,10 +197,10 @@ public interface InventoryView { /** * Get the item on the cursor of one of the viewing players. * @@ -1395,9 +1408,9 @@ index 002acfbdce1db10f7ba1b6a013e678f504ac6e69..8d14426eb1ebea27058d5f22ea652f22 */ - @Nullable + @NotNull // Paper - fix nullability - public final ItemStack getCursor() { - return getPlayer().getItemOnCursor(); - } + public ItemStack getCursor(); + + /** diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java index 3d08beee52f2247db6f6e679206ed6a965fbf9a8..1b4f9b93860e58762ac28715adad5a67298b06d7 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java diff --git a/patches/api/0398-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0397-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/api/0398-Add-method-to-remove-all-active-potion-effects.patch rename to patches/api/0397-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/api/0397-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0397-Properly-remove-the-experimental-smithing-inventory-.patch deleted file mode 100644 index 6448068df8..0000000000 --- a/patches/api/0397-Properly-remove-the-experimental-smithing-inventory-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Thu, 8 Jun 2023 14:45:30 -0700 -Subject: [PATCH] Properly remove the experimental smithing inventory type - - -diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java -index 32cd8ee2e849df602a7e10aa5d0a218007faa0ac..fbdbd2f4da5e09d4b111ddcf72e2d7dd59046bd7 100644 ---- a/src/main/java/org/bukkit/event/inventory/InventoryType.java -+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java -@@ -153,7 +153,7 @@ public enum InventoryType { - * - * @deprecated use {@link #SMITHING} - */ -- @Deprecated -+ @Deprecated(forRemoval = true) // Paper - SMITHING_NEW(4, "Upgrade Gear"), - ; - -diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java -index 8d14426eb1ebea27058d5f22ea652f22d00fccb9..ac6c5c7a58c2c88b6cb0f6632fb53e8d67f8a059 100644 ---- a/src/main/java/org/bukkit/inventory/InventoryView.java -+++ b/src/main/java/org/bukkit/inventory/InventoryView.java -@@ -370,7 +370,6 @@ public abstract class InventoryView { - type = InventoryType.SlotType.CRAFTING; - break; - case ANVIL: -- case SMITHING: - case CARTOGRAPHY: - case GRINDSTONE: - case MERCHANT: -@@ -388,6 +387,7 @@ public abstract class InventoryView { - } - break; - case LOOM: -+ case SMITHING: // Paper - case SMITHING_NEW: - if (slot == 3) { - type = InventoryType.SlotType.RESULT; diff --git a/patches/api/0399-Folia-scheduler-and-owned-region-API.patch b/patches/api/0398-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/api/0399-Folia-scheduler-and-owned-region-API.patch rename to patches/api/0398-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/api/0400-Add-event-for-player-editing-sign.patch b/patches/api/0399-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/api/0400-Add-event-for-player-editing-sign.patch rename to patches/api/0399-Add-event-for-player-editing-sign.patch diff --git a/patches/api/0401-Add-Sign-getInteractableSideFor.patch b/patches/api/0400-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/api/0401-Add-Sign-getInteractableSideFor.patch rename to patches/api/0400-Add-Sign-getInteractableSideFor.patch diff --git a/patches/api/0402-Fix-BanList-API.patch b/patches/api/0401-Fix-BanList-API.patch similarity index 100% rename from patches/api/0402-Fix-BanList-API.patch rename to patches/api/0401-Fix-BanList-API.patch diff --git a/patches/api/0403-Add-whitelist-events.patch b/patches/api/0402-Add-whitelist-events.patch similarity index 100% rename from patches/api/0403-Add-whitelist-events.patch rename to patches/api/0402-Add-whitelist-events.patch diff --git a/patches/api/0404-API-for-updating-recipes-on-clients.patch b/patches/api/0403-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/api/0404-API-for-updating-recipes-on-clients.patch rename to patches/api/0403-API-for-updating-recipes-on-clients.patch diff --git a/patches/api/0405-Add-PlayerFailMoveEvent.patch b/patches/api/0404-Add-PlayerFailMoveEvent.patch similarity index 100% rename from patches/api/0405-Add-PlayerFailMoveEvent.patch rename to patches/api/0404-Add-PlayerFailMoveEvent.patch diff --git a/patches/api/0406-Fix-custom-statistic-criteria-creation.patch b/patches/api/0405-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/api/0406-Fix-custom-statistic-criteria-creation.patch rename to patches/api/0405-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/api/0407-SculkCatalyst-bloom-API.patch b/patches/api/0406-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/api/0407-SculkCatalyst-bloom-API.patch rename to patches/api/0406-SculkCatalyst-bloom-API.patch diff --git a/patches/api/0408-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0407-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/api/0408-API-for-an-entity-s-scoreboard-name.patch rename to patches/api/0407-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/api/0409-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0408-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/api/0409-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/api/0408-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/api/0410-Add-Listing-API-for-Player.patch b/patches/api/0409-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/api/0410-Add-Listing-API-for-Player.patch rename to patches/api/0409-Add-Listing-API-for-Player.patch diff --git a/patches/api/0411-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0410-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/api/0411-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/api/0410-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/api/0412-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0411-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/api/0412-Fix-NPE-on-Boat-getStatus.patch rename to patches/api/0411-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/api/0413-Expand-Pose-API.patch b/patches/api/0412-Expand-Pose-API.patch similarity index 100% rename from patches/api/0413-Expand-Pose-API.patch rename to patches/api/0412-Expand-Pose-API.patch diff --git a/patches/api/0414-MerchantRecipe-add-copy-constructor.patch b/patches/api/0413-MerchantRecipe-add-copy-constructor.patch similarity index 100% rename from patches/api/0414-MerchantRecipe-add-copy-constructor.patch rename to patches/api/0413-MerchantRecipe-add-copy-constructor.patch diff --git a/patches/api/0415-More-DragonBattle-API.patch b/patches/api/0414-More-DragonBattle-API.patch similarity index 100% rename from patches/api/0415-More-DragonBattle-API.patch rename to patches/api/0414-More-DragonBattle-API.patch diff --git a/patches/api/0416-Add-PlayerPickItemEvent.patch b/patches/api/0415-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/api/0416-Add-PlayerPickItemEvent.patch rename to patches/api/0415-Add-PlayerPickItemEvent.patch diff --git a/patches/api/0417-Allow-trident-custom-damage.patch b/patches/api/0416-Allow-trident-custom-damage.patch similarity index 100% rename from patches/api/0417-Allow-trident-custom-damage.patch rename to patches/api/0416-Allow-trident-custom-damage.patch diff --git a/patches/api/0418-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0417-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/api/0418-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/api/0417-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/api/0419-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0418-Limit-setBurnTime-to-valid-short-values.patch similarity index 100% rename from patches/api/0419-Limit-setBurnTime-to-valid-short-values.patch rename to patches/api/0418-Limit-setBurnTime-to-valid-short-values.patch diff --git a/patches/api/0420-Add-OfflinePlayer-isConnected.patch b/patches/api/0419-Add-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/api/0420-Add-OfflinePlayer-isConnected.patch rename to patches/api/0419-Add-OfflinePlayer-isConnected.patch diff --git a/patches/api/0421-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0420-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/api/0421-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/api/0420-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/api/0422-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0421-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/api/0422-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/api/0421-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/api/0423-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0422-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch similarity index 100% rename from patches/api/0423-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch rename to patches/api/0422-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch diff --git a/patches/api/0424-Add-player-idle-duration-API.patch b/patches/api/0423-Add-player-idle-duration-API.patch similarity index 100% rename from patches/api/0424-Add-player-idle-duration-API.patch rename to patches/api/0423-Add-player-idle-duration-API.patch diff --git a/patches/api/0425-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0424-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/api/0425-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/api/0424-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/api/0426-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0425-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/api/0426-Add-predicate-for-blocks-when-raytracing.patch rename to patches/api/0425-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/api/0427-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0426-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/api/0427-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/api/0426-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/api/0428-Add-UUID-attribute-modifier-API.patch b/patches/api/0427-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/api/0428-Add-UUID-attribute-modifier-API.patch rename to patches/api/0427-Add-UUID-attribute-modifier-API.patch diff --git a/patches/api/0429-Expand-LingeringPotion-API.patch b/patches/api/0428-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/api/0429-Expand-LingeringPotion-API.patch rename to patches/api/0428-Expand-LingeringPotion-API.patch diff --git a/patches/api/0430-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0429-Remove-unnecessary-durability-check-in-ItemStack-isS.patch similarity index 100% rename from patches/api/0430-Remove-unnecessary-durability-check-in-ItemStack-isS.patch rename to patches/api/0429-Remove-unnecessary-durability-check-in-ItemStack-isS.patch diff --git a/patches/api/0431-Add-Structure-check-API.patch b/patches/api/0430-Add-Structure-check-API.patch similarity index 100% rename from patches/api/0431-Add-Structure-check-API.patch rename to patches/api/0430-Add-Structure-check-API.patch diff --git a/patches/api/0432-add-missing-Experimental-annotations.patch b/patches/api/0431-add-missing-Experimental-annotations.patch similarity index 100% rename from patches/api/0432-add-missing-Experimental-annotations.patch rename to patches/api/0431-add-missing-Experimental-annotations.patch diff --git a/patches/api/0433-Add-more-scoreboard-API.patch b/patches/api/0432-Add-more-scoreboard-API.patch similarity index 100% rename from patches/api/0433-Add-more-scoreboard-API.patch rename to patches/api/0432-Add-more-scoreboard-API.patch diff --git a/patches/api/0434-Improve-Registry.patch b/patches/api/0433-Improve-Registry.patch similarity index 100% rename from patches/api/0434-Improve-Registry.patch rename to patches/api/0433-Improve-Registry.patch diff --git a/patches/api/0435-Add-experience-points-API.patch b/patches/api/0434-Add-experience-points-API.patch similarity index 100% rename from patches/api/0435-Add-experience-points-API.patch rename to patches/api/0434-Add-experience-points-API.patch diff --git a/patches/api/0436-Add-missing-InventoryType.patch b/patches/api/0435-Add-missing-InventoryType.patch similarity index 100% rename from patches/api/0436-Add-missing-InventoryType.patch rename to patches/api/0435-Add-missing-InventoryType.patch diff --git a/patches/api/0437-Add-drops-to-shear-events.patch b/patches/api/0436-Add-drops-to-shear-events.patch similarity index 100% rename from patches/api/0437-Add-drops-to-shear-events.patch rename to patches/api/0436-Add-drops-to-shear-events.patch diff --git a/patches/api/0438-Add-HiddenPotionEffect-API.patch b/patches/api/0437-Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/api/0438-Add-HiddenPotionEffect-API.patch rename to patches/api/0437-Add-HiddenPotionEffect-API.patch diff --git a/patches/api/0439-Add-PlayerShieldDisableEvent.patch b/patches/api/0438-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/api/0439-Add-PlayerShieldDisableEvent.patch rename to patches/api/0438-Add-PlayerShieldDisableEvent.patch diff --git a/patches/api/0440-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0439-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch similarity index 100% rename from patches/api/0440-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch rename to patches/api/0439-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch diff --git a/patches/api/0441-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0440-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/api/0441-Add-BlockStateMeta-clearBlockState.patch rename to patches/api/0440-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/api/0442-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0441-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/api/0442-Expose-LootTable-of-DecoratedPot.patch rename to patches/api/0441-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/api/0443-Add-ShulkerDuplicateEvent.patch b/patches/api/0442-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/api/0443-Add-ShulkerDuplicateEvent.patch rename to patches/api/0442-Add-ShulkerDuplicateEvent.patch diff --git a/patches/api/0444-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0443-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/api/0444-Add-api-for-spawn-egg-texture-colors.patch rename to patches/api/0443-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/api/0445-Add-Lifecycle-Event-system.patch b/patches/api/0444-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/api/0445-Add-Lifecycle-Event-system.patch rename to patches/api/0444-Add-Lifecycle-Event-system.patch diff --git a/patches/api/0446-ItemStack-Tooltip-API.patch b/patches/api/0445-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/api/0446-ItemStack-Tooltip-API.patch rename to patches/api/0445-ItemStack-Tooltip-API.patch diff --git a/patches/api/0447-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0446-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/api/0447-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/api/0446-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/api/0448-Add-FluidState-API.patch b/patches/api/0447-Add-FluidState-API.patch similarity index 100% rename from patches/api/0448-Add-FluidState-API.patch rename to patches/api/0447-Add-FluidState-API.patch diff --git a/patches/api/0449-add-number-format-api.patch b/patches/api/0448-add-number-format-api.patch similarity index 100% rename from patches/api/0449-add-number-format-api.patch rename to patches/api/0448-add-number-format-api.patch diff --git a/patches/api/0450-improve-BanList-types.patch b/patches/api/0449-improve-BanList-types.patch similarity index 100% rename from patches/api/0450-improve-BanList-types.patch rename to patches/api/0449-improve-BanList-types.patch diff --git a/patches/api/0451-Suspicious-Effect-Entry-API.patch b/patches/api/0450-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/api/0451-Suspicious-Effect-Entry-API.patch rename to patches/api/0450-Suspicious-Effect-Entry-API.patch diff --git a/patches/api/0452-Fix-DamageSource-API.patch b/patches/api/0451-Fix-DamageSource-API.patch similarity index 100% rename from patches/api/0452-Fix-DamageSource-API.patch rename to patches/api/0451-Fix-DamageSource-API.patch diff --git a/patches/api/0453-Expanded-Hopper-API.patch b/patches/api/0452-Expanded-Hopper-API.patch similarity index 100% rename from patches/api/0453-Expanded-Hopper-API.patch rename to patches/api/0452-Expanded-Hopper-API.patch diff --git a/patches/api/0454-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0453-Clone-mutables-to-prevent-unexpected-issues.patch similarity index 100% rename from patches/api/0454-Clone-mutables-to-prevent-unexpected-issues.patch rename to patches/api/0453-Clone-mutables-to-prevent-unexpected-issues.patch diff --git a/patches/api/0455-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0454-Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/api/0455-Add-BlockBreakProgressUpdateEvent.patch rename to patches/api/0454-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/api/0456-Deprecate-ItemStack-setType.patch b/patches/api/0455-Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/api/0456-Deprecate-ItemStack-setType.patch rename to patches/api/0455-Deprecate-ItemStack-setType.patch diff --git a/patches/api/0457-Item-Mutation-Fixes.patch b/patches/api/0456-Item-Mutation-Fixes.patch similarity index 100% rename from patches/api/0457-Item-Mutation-Fixes.patch rename to patches/api/0456-Item-Mutation-Fixes.patch diff --git a/patches/api/0458-API-for-checking-sent-chunks.patch b/patches/api/0457-API-for-checking-sent-chunks.patch similarity index 100% rename from patches/api/0458-API-for-checking-sent-chunks.patch rename to patches/api/0457-API-for-checking-sent-chunks.patch diff --git a/patches/api/0459-Add-CartographyItemEvent.patch b/patches/api/0458-Add-CartographyItemEvent.patch similarity index 100% rename from patches/api/0459-Add-CartographyItemEvent.patch rename to patches/api/0458-Add-CartographyItemEvent.patch diff --git a/patches/api/0460-More-Raid-API.patch b/patches/api/0459-More-Raid-API.patch similarity index 100% rename from patches/api/0460-More-Raid-API.patch rename to patches/api/0459-More-Raid-API.patch diff --git a/patches/api/0461-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0460-Fix-SpawnerEntry-Equipment-API.patch similarity index 100% rename from patches/api/0461-Fix-SpawnerEntry-Equipment-API.patch rename to patches/api/0460-Fix-SpawnerEntry-Equipment-API.patch diff --git a/patches/api/0462-Fix-ItemFlags.patch b/patches/api/0461-Fix-ItemFlags.patch similarity index 100% rename from patches/api/0462-Fix-ItemFlags.patch rename to patches/api/0461-Fix-ItemFlags.patch diff --git a/patches/api/0463-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0462-Allow-modifying-library-loader-jars-bytecode.patch similarity index 100% rename from patches/api/0463-Allow-modifying-library-loader-jars-bytecode.patch rename to patches/api/0462-Allow-modifying-library-loader-jars-bytecode.patch diff --git a/patches/api/0464-Add-hook-to-remap-library-jars.patch b/patches/api/0463-Add-hook-to-remap-library-jars.patch similarity index 100% rename from patches/api/0464-Add-hook-to-remap-library-jars.patch rename to patches/api/0463-Add-hook-to-remap-library-jars.patch diff --git a/patches/api/0465-Add-GameMode-isInvulnerable.patch b/patches/api/0464-Add-GameMode-isInvulnerable.patch similarity index 100% rename from patches/api/0465-Add-GameMode-isInvulnerable.patch rename to patches/api/0464-Add-GameMode-isInvulnerable.patch diff --git a/patches/api/0466-Expose-hasColor-to-leather-armor.patch b/patches/api/0465-Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/api/0466-Expose-hasColor-to-leather-armor.patch rename to patches/api/0465-Expose-hasColor-to-leather-armor.patch diff --git a/patches/api/0467-Add-missing-wind-charge-damage-type.patch b/patches/api/0466-Add-missing-wind-charge-damage-type.patch similarity index 100% rename from patches/api/0467-Add-missing-wind-charge-damage-type.patch rename to patches/api/0466-Add-missing-wind-charge-damage-type.patch diff --git a/patches/api/0468-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0467-Added-API-to-get-player-ha-proxy-address.patch similarity index 100% rename from patches/api/0468-Added-API-to-get-player-ha-proxy-address.patch rename to patches/api/0467-Added-API-to-get-player-ha-proxy-address.patch diff --git a/patches/api/0469-More-Chest-Block-API.patch b/patches/api/0468-More-Chest-Block-API.patch similarity index 100% rename from patches/api/0469-More-Chest-Block-API.patch rename to patches/api/0468-More-Chest-Block-API.patch diff --git a/patches/api/0470-Brigadier-based-command-API.patch b/patches/api/0469-Brigadier-based-command-API.patch similarity index 100% rename from patches/api/0470-Brigadier-based-command-API.patch rename to patches/api/0469-Brigadier-based-command-API.patch diff --git a/patches/api/0471-Fix-issues-with-recipe-API.patch b/patches/api/0470-Fix-issues-with-recipe-API.patch similarity index 100% rename from patches/api/0471-Fix-issues-with-recipe-API.patch rename to patches/api/0470-Fix-issues-with-recipe-API.patch diff --git a/patches/api/0472-Fix-equipment-slot-and-group-API.patch b/patches/api/0471-Fix-equipment-slot-and-group-API.patch similarity index 100% rename from patches/api/0472-Fix-equipment-slot-and-group-API.patch rename to patches/api/0471-Fix-equipment-slot-and-group-API.patch diff --git a/patches/api/0473-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0472-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch similarity index 100% rename from patches/api/0473-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch rename to patches/api/0472-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch diff --git a/patches/api/0474-General-ItemMeta-fixes.patch b/patches/api/0473-General-ItemMeta-fixes.patch similarity index 100% rename from patches/api/0474-General-ItemMeta-fixes.patch rename to patches/api/0473-General-ItemMeta-fixes.patch diff --git a/patches/api/0475-Add-missing-fishing-event-state.patch b/patches/api/0474-Add-missing-fishing-event-state.patch similarity index 100% rename from patches/api/0475-Add-missing-fishing-event-state.patch rename to patches/api/0474-Add-missing-fishing-event-state.patch diff --git a/patches/api/0476-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/api/0475-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch similarity index 100% rename from patches/api/0476-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch rename to patches/api/0475-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch diff --git a/patches/api/0477-WIP-Tag-API.patch b/patches/api/0476-WIP-Tag-API.patch similarity index 100% rename from patches/api/0477-WIP-Tag-API.patch rename to patches/api/0476-WIP-Tag-API.patch diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch index 3e68c1f4f1..75e61f1b24 100644 --- a/patches/server/0010-Adventure.patch +++ b/patches/server/0010-Adventure.patch @@ -2861,7 +2861,7 @@ index e7c407039fef88ef01ba9b6be9ae5bcc3edc026f..5457358bc76889153036818fdfd70a04 @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5da00b79af81aa879f58ffa62ecfe51c075c314b..1d2a281da755ccc2c89ad2d7dbe3407ced83ee89 100644 +index e244ac9f51a08603a7877e7e655fda26cd396772..556d8f23ee2de77cea71abcc0e56718e60b20b05 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -45,6 +45,7 @@ import net.minecraft.nbt.CompoundTag; @@ -4676,7 +4676,7 @@ index 889af27e3fe5ce98b68b3177639c338ca287b024..a29dfbe7aa06113358a2078d927fc536 return event; } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java -index 834d871c84af392d16ffd1f88931326cfe24146d..b3ea06b088eedc2f852cc8b27c407963be10af37 100644 +index 42c888af154a133e118a9ff9fef587e345c13e19..867091ff253541ec45b6ae7f1fb3acc83a5c4966 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java @@ -72,6 +72,13 @@ public class CraftContainer extends AbstractContainerMenu { @@ -4780,10 +4780,10 @@ index c9cc23757a9fcc58d30b2915d4c5cfbc7d1c767a..fc0e1212022d1aa3506699b60ef33819 return this.title; } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java -index 4dd9a80af9901287ab6740b072f2b89678c3d0cb..b2586684295b295a3196a2a9cf724cec975b5a40 100644 +index 6871fbde3498f18274029638e0cd27d1a78bb1d7..5888a44d7f1f06e6308b068e57c295de366061cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java -@@ -73,6 +73,13 @@ public class CraftInventoryView extends InventoryView { +@@ -73,6 +73,13 @@ public class CraftInventoryView extends CraftAbstractInventoryView { return CraftItemStack.asCraftMirror(this.container.getSlot(slot).getItem()); } diff --git a/patches/server/0021-Hook-into-CB-plugin-rewrites.patch b/patches/server/0021-Hook-into-CB-plugin-rewrites.patch index 2652791358..1bdec9b9e9 100644 --- a/patches/server/0021-Hook-into-CB-plugin-rewrites.patch +++ b/patches/server/0021-Hook-into-CB-plugin-rewrites.patch @@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're debugging in an IDE pre-relocate. diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index 6500c1dad7a48256b8a58b0655f4972c0e7a5dd0..c8c40052d0bb7791297a215ba18fb093fbfda7b6 100644 +index 3526ece6c12f76eca93c995018e0f262360e1ba9..51452d8a8969a303be1be5851b251243a5944be3 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -8,6 +8,7 @@ import java.util.ArrayList; @@ -27,7 +27,7 @@ index 6500c1dad7a48256b8a58b0655f4972c0e7a5dd0..c8c40052d0bb7791297a215ba18fb093 import joptsimple.OptionParser; import joptsimple.OptionSet; import joptsimple.OptionSpec; -@@ -79,6 +81,40 @@ public class Commodore { +@@ -83,6 +85,40 @@ public class Commodore { private static final Map MATERIAL_METHOD_REROUTE = Commodore.createReroutes(MaterialRerouting.class); private static final Map METHOD_REROUTE = Commodore.createReroutes(MethodRerouting.class); @@ -68,7 +68,7 @@ index 6500c1dad7a48256b8a58b0655f4972c0e7a5dd0..c8c40052d0bb7791297a215ba18fb093 public static void main(String[] args) { OptionParser parser = new OptionParser(); OptionSpec inputFlag = parser.acceptsAll(Arrays.asList("i", "input")).withRequiredArg().ofType(File.class).required(); -@@ -205,9 +241,49 @@ public class Commodore { +@@ -209,9 +245,49 @@ public class Commodore { @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { return new MethodVisitor(this.api, super.visitMethod(access, name, desc, signature, exceptions)) { @@ -118,7 +118,7 @@ index 6500c1dad7a48256b8a58b0655f4972c0e7a5dd0..c8c40052d0bb7791297a215ba18fb093 name = FieldRename.rename(pluginVersion, owner, name); if (modern) { -@@ -306,6 +382,13 @@ public class Commodore { +@@ -321,6 +397,13 @@ public class Commodore { return; } @@ -132,7 +132,7 @@ index 6500c1dad7a48256b8a58b0655f4972c0e7a5dd0..c8c40052d0bb7791297a215ba18fb093 if (modern) { if (owner.equals("org/bukkit/Material") || (instantiatedMethodType != null && instantiatedMethodType.getDescriptor().startsWith("(Lorg/bukkit/Material;)"))) { switch (name) { -@@ -402,6 +485,13 @@ public class Commodore { +@@ -417,6 +500,13 @@ public class Commodore { @Override public void visitLdcInsn(Object value) { @@ -146,7 +146,7 @@ index 6500c1dad7a48256b8a58b0655f4972c0e7a5dd0..c8c40052d0bb7791297a215ba18fb093 if (value instanceof String && ((String) value).equals("com.mysql.jdbc.Driver")) { super.visitLdcInsn("com.mysql.cj.jdbc.Driver"); return; -@@ -412,6 +502,14 @@ public class Commodore { +@@ -427,6 +517,14 @@ public class Commodore { @Override public void visitInvokeDynamicInsn(String name, String descriptor, Handle bootstrapMethodHandle, Object... bootstrapMethodArguments) { @@ -161,7 +161,7 @@ index 6500c1dad7a48256b8a58b0655f4972c0e7a5dd0..c8c40052d0bb7791297a215ba18fb093 if (bootstrapMethodHandle.getOwner().equals("java/lang/invoke/LambdaMetafactory") && bootstrapMethodHandle.getName().equals("metafactory") && bootstrapMethodArguments.length == 3) { Type samMethodType = (Type) bootstrapMethodArguments[0]; -@@ -428,7 +526,7 @@ public class Commodore { +@@ -443,7 +541,7 @@ public class Commodore { methodArgs.add(new Handle(newOpcode, newOwner, newName, newDescription, newItf)); methodArgs.add(newInstantiated); @@ -170,7 +170,7 @@ index 6500c1dad7a48256b8a58b0655f4972c0e7a5dd0..c8c40052d0bb7791297a215ba18fb093 }, implMethod.getTag(), implMethod.getOwner(), implMethod.getName(), implMethod.getDesc(), implMethod.isInterface(), samMethodType, instantiatedMethodType); return; } -@@ -479,6 +577,12 @@ public class Commodore { +@@ -494,6 +592,12 @@ public class Commodore { @Override public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) { diff --git a/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch b/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch index 8211d56891..ddb41666e1 100644 --- a/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch +++ b/patches/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch @@ -645,10 +645,10 @@ index 242811578a786e3807a1a7019d472d5a68f87116..0b65fdf53124f3dd042b2363b1b8df8e return traceElements; } diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index c8c40052d0bb7791297a215ba18fb093fbfda7b6..e8bdc9f97cc506ca8509480ea0c07facc778df8d 100644 +index 51452d8a8969a303be1be5851b251243a5944be3..8757d4de8a589355b83690d37d9e81ce3cc6ae32 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -@@ -82,36 +82,26 @@ public class Commodore { +@@ -86,36 +86,26 @@ public class Commodore { private static final Map METHOD_REROUTE = Commodore.createReroutes(MethodRerouting.class); // Paper start - Plugin rewrites @@ -696,7 +696,7 @@ index c8c40052d0bb7791297a215ba18fb093fbfda7b6..e8bdc9f97cc506ca8509480ea0c07fac } // Paper end - Plugin rewrites -@@ -182,7 +172,7 @@ public class Commodore { +@@ -186,7 +176,7 @@ public class Commodore { ClassReader cr = new ClassReader(b); ClassWriter cw = new ClassWriter(cr, 0); diff --git a/patches/server/0023-Timings-v2.patch b/patches/server/0023-Timings-v2.patch index 35f5d89d02..44e528fa96 100644 --- a/patches/server/0023-Timings-v2.patch +++ b/patches/server/0023-Timings-v2.patch @@ -1230,7 +1230,7 @@ index eea8bafd98e3a8d82b3216488537ab898cc4ae7a..9675d91e4e7ed46147c3f7a11dd65122 this.entityManager.saveAll(); } else { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1d2a281da755ccc2c89ad2d7dbe3407ced83ee89..c2a22dda4767ec71318cadee8198e8f69a57b56b 100644 +index 556d8f23ee2de77cea71abcc0e56718e60b20b05..47e1640cafc8087d94d0b88b8b3117591f9f238e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -330,7 +330,6 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0056-Improve-Player-chat-API-handling.patch b/patches/server/0056-Improve-Player-chat-API-handling.patch index 3c9059a43f..c0799ae48f 100644 --- a/patches/server/0056-Improve-Player-chat-API-handling.patch +++ b/patches/server/0056-Improve-Player-chat-API-handling.patch @@ -17,7 +17,7 @@ Co-authored-by: Jake Potrebic Co-authored-by: SoSeDiK diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c2a22dda4767ec71318cadee8198e8f69a57b56b..6d31f4a9950b526a05fa508ec9da12c1a7fef306 100644 +index 47e1640cafc8087d94d0b88b8b3117591f9f238e..64db7e017b41bffcaac202ee4ecfd7df46d69331 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2013,7 +2013,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch index f8c81a181a..fd655a0b9f 100644 --- a/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch +++ b/patches/server/0084-Add-PlayerUseUnknownEntityEvent.patch @@ -28,7 +28,7 @@ index 1e9c68cd1868d083e6a790d56006dd4aa432010a..8a0ee9564fc36a2badf1357f7e6c47b5 + // Paper end - PlayerUseUnknownEntityEvent } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6d31f4a9950b526a05fa508ec9da12c1a7fef306..c955c9f542da4256b0900efe59f96a82ba437855 100644 +index 64db7e017b41bffcaac202ee4ecfd7df46d69331..14a821bfc6b20475889d3138b8da9e6bfaf1787c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2493,7 +2493,26 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0107-Configurable-packet-in-spam-threshold.patch b/patches/server/0107-Configurable-packet-in-spam-threshold.patch index 6ab9ca6ebc..65d911de77 100644 --- a/patches/server/0107-Configurable-packet-in-spam-threshold.patch +++ b/patches/server/0107-Configurable-packet-in-spam-threshold.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable packet in spam threshold diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c955c9f542da4256b0900efe59f96a82ba437855..4a4cb573b8b8bddea5e34ca4c3ba4ee4bb6be386 100644 +index 14a821bfc6b20475889d3138b8da9e6bfaf1787c..905a7941597306b0cd23ec9a883ef3ee9a684788 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1534,13 +1534,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0108-Configurable-flying-kick-messages.patch b/patches/server/0108-Configurable-flying-kick-messages.patch index a913098324..7a80c997cc 100644 --- a/patches/server/0108-Configurable-flying-kick-messages.patch +++ b/patches/server/0108-Configurable-flying-kick-messages.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4a4cb573b8b8bddea5e34ca4c3ba4ee4bb6be386..f348efd1c295451ec734cdc89d33eaa72b8b159e 100644 +index 905a7941597306b0cd23ec9a883ef3ee9a684788..34aeb823950fac8eaef3f38b302c1585a45f7498 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -346,7 +346,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index 4624e402d2..874f766d13 100644 --- a/patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/patches/server/0130-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -14,7 +14,7 @@ To be converted into a Paper-API event at some point in the future? public net.minecraft.world.entity.player.Player removeEntitiesOnShoulder()V diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f348efd1c295451ec734cdc89d33eaa72b8b159e..d3e60e2313eb7a339ad01929776076c8ac2ebdb3 100644 +index 34aeb823950fac8eaef3f38b302c1585a45f7498..44cc60d92c6e83ecfa2c232b59986968d0161672 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2259,6 +2259,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0152-Add-PlayerJumpEvent.patch b/patches/server/0152-Add-PlayerJumpEvent.patch index 9b6beb77d3..2e506e2c59 100644 --- a/patches/server/0152-Add-PlayerJumpEvent.patch +++ b/patches/server/0152-Add-PlayerJumpEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d3e60e2313eb7a339ad01929776076c8ac2ebdb3..7db4625917b6052746eba8a9ed491aed086aad5c 100644 +index 44cc60d92c6e83ecfa2c232b59986968d0161672..7906e163f8d03ba39480526d0293ad48534f11bf 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1199,7 +1199,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0162-AsyncTabCompleteEvent.patch b/patches/server/0162-AsyncTabCompleteEvent.patch index 834410d8ad..a7c60ca71e 100644 --- a/patches/server/0162-AsyncTabCompleteEvent.patch +++ b/patches/server/0162-AsyncTabCompleteEvent.patch @@ -16,7 +16,7 @@ Also adds isCommand and getLocation to the sync TabCompleteEvent Co-authored-by: Aikar diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7db4625917b6052746eba8a9ed491aed086aad5c..24b5ba35eb25a60d347713f235dde96c3c0018d6 100644 +index 7906e163f8d03ba39480526d0293ad48534f11bf..ec80a9138260497d0deccf3ade3f44fc849de1d5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -711,21 +711,58 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0177-Player.setPlayerProfile-API.patch b/patches/server/0177-Player.setPlayerProfile-API.patch index 95521bd2e8..cec219427f 100644 --- a/patches/server/0177-Player.setPlayerProfile-API.patch +++ b/patches/server/0177-Player.setPlayerProfile-API.patch @@ -9,7 +9,7 @@ This can be useful for changing name or skins after a player has logged in. public-f net.minecraft.world.entity.player.Player gameProfile diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 24b5ba35eb25a60d347713f235dde96c3c0018d6..9e49636a77611966fdc73dcc1a094162038ec52d 100644 +index ec80a9138260497d0deccf3ade3f44fc849de1d5..72edfb965aca81c2d2442b794b42baa04ec713b3 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1472,7 +1472,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -220,10 +220,10 @@ index aaef5693b044141d2aa8108b74b240903c64e6e6..a6567aa9a3ec9dd17689e907131e5cca public void onEntityRemove(Entity entity) { this.invertedVisibilityEntities.remove(entity.getUUID()); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index e8bdc9f97cc506ca8509480ea0c07facc778df8d..2d9453498531c99f4fa566a08099b4e5a7af25fa 100644 +index 8757d4de8a589355b83690d37d9e81ce3cc6ae32..93c0390aade242bc24f8d9a9ac99242d0f588d5e 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -@@ -379,6 +379,13 @@ public class Commodore { +@@ -394,6 +394,13 @@ public class Commodore { } // Paper end - Rewrite plugins diff --git a/patches/server/0209-InventoryCloseEvent-Reason-API.patch b/patches/server/0209-InventoryCloseEvent-Reason-API.patch index 4f22c3cd2e..b6a91e355d 100644 --- a/patches/server/0209-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0209-InventoryCloseEvent-Reason-API.patch @@ -75,7 +75,7 @@ index 809a4f403695240b507528fb8fa3f7d390f86349..622f890d2613acf948b68d6febe0834c this.doCloseContainer(); } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9e49636a77611966fdc73dcc1a094162038ec52d..6ed3c4abb66002752d0e50040585363912ccd4bd 100644 +index 72edfb965aca81c2d2442b794b42baa04ec713b3..a954d3b0ff0917d857002dba70c54b3fcdf77943 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2619,10 +2619,15 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0211-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0211-Refresh-player-inventory-when-cancelling-PlayerInter.patch index 5ce99f4b00..ebc80323b4 100644 --- a/patches/server/0211-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/patches/server/0211-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is cancelled to avoid this problem. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6ed3c4abb66002752d0e50040585363912ccd4bd..1cebf1dc897345bdba7bcc7db24a793aa3773c12 100644 +index a954d3b0ff0917d857002dba70c54b3fcdf77943..087e87976d738426db9a850926463900b0c1e8ca 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2496,6 +2496,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0224-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0224-Break-up-and-make-tab-spam-limits-configurable.patch index d215803bca..43418bc01d 100644 --- a/patches/server/0224-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/patches/server/0224-Break-up-and-make-tab-spam-limits-configurable.patch @@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on plugins doing unsafe things. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1cebf1dc897345bdba7bcc7db24a793aa3773c12..fc1726cd10c3b051154ca954580849745a9c086f 100644 +index 087e87976d738426db9a850926463900b0c1e8ca..f1e31a80349a9cbd677a5216b332a99761b94814 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -265,6 +265,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0260-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0260-Add-option-to-prevent-players-from-moving-into-unloa.patch index 2b6b76069e..bcd7e3f8f6 100644 --- a/patches/server/0260-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/patches/server/0260-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index fc1726cd10c3b051154ca954580849745a9c086f..b1a0c0e2d02af3730293f4708ce50479ede2ccab 100644 +index f1e31a80349a9cbd677a5216b332a99761b94814..cc7a14df387e68e8b6d3abdee62f4b48fdbaa6a7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -494,9 +494,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0265-Restore-custom-InventoryHolder-support.patch b/patches/server/0265-Restore-custom-InventoryHolder-support.patch index 4fb2fe77ea..4fa1d8fac1 100644 --- a/patches/server/0265-Restore-custom-InventoryHolder-support.patch +++ b/patches/server/0265-Restore-custom-InventoryHolder-support.patch @@ -161,12 +161,12 @@ index 0000000000000000000000000000000000000000..224d4b2cc45b0d02230a76caee9c8857 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java -index b3ea06b088eedc2f852cc8b27c407963be10af37..027d6d9c04dc4da5d978cc0c03a08a6efe93b4d9 100644 +index 867091ff253541ec45b6ae7f1fb3acc83a5c4966..10a5b1853d3984427209c87bdec1d471dddb1244 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftContainer.java @@ -49,7 +49,7 @@ public class CraftContainer extends AbstractContainerMenu { public CraftContainer(final Inventory inventory, final Player player, int id) { - this(new InventoryView() { + this(new CraftAbstractInventoryView() { - private final String originalTitle = (inventory instanceof CraftInventoryCustom) ? ((CraftInventoryCustom.MinecraftInventory) ((CraftInventory) inventory).getInventory()).getTitle() : inventory.getType().getDefaultTitle(); + private final String originalTitle = inventory instanceof CraftInventoryCustom ? ((CraftInventoryCustom) inventory).getTitle() : inventory.getType().getDefaultTitle(); // Paper diff --git a/patches/server/0267-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0267-Don-t-allow-digging-into-unloaded-chunks.patch index 1592c5abc6..1e6c4cb7c2 100644 --- a/patches/server/0267-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/patches/server/0267-Don-t-allow-digging-into-unloaded-chunks.patch @@ -59,7 +59,7 @@ index a5b0efd6142075ca1ecb604afbc1d0162199e7a4..da9e864520150acd8027545672aa476b this.level.destroyBlockProgress(this.player.getId(), pos, -1); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b1a0c0e2d02af3730293f4708ce50479ede2ccab..9b255f9551fa66efa21944e284a40a03aefc3040 100644 +index cc7a14df387e68e8b6d3abdee62f4b48fdbaa6a7..2e35c6cfdf0cded5adc9f512612faaa68876961c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1595,6 +1595,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0271-Book-Size-Limits.patch b/patches/server/0271-Book-Size-Limits.patch index 872f2d8903..5fd23a7c1e 100644 --- a/patches/server/0271-Book-Size-Limits.patch +++ b/patches/server/0271-Book-Size-Limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits Puts some limits on the size of books. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9b255f9551fa66efa21944e284a40a03aefc3040..519ba39c5ff2c7782a88adc4212a7aca6788e09d 100644 +index 2e35c6cfdf0cded5adc9f512612faaa68876961c..abab7c6ce2079a0101c59c130fd65db7b2a73498 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1043,6 +1043,45 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0278-Brigadier-Mojang-API.patch b/patches/server/0278-Brigadier-Mojang-API.patch index 4015e42587..cd301233eb 100644 --- a/patches/server/0278-Brigadier-Mojang-API.patch +++ b/patches/server/0278-Brigadier-Mojang-API.patch @@ -119,7 +119,7 @@ index a05aea8561ac102476ee1b3068942b095950a86a..2b5235aea933462ca711abb5b59b6715 if (commandnode2.canUse(source)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 519ba39c5ff2c7782a88adc4212a7aca6788e09d..f0fb981c46229c2498061ab6b3adff2db886f7f6 100644 +index abab7c6ce2079a0101c59c130fd65db7b2a73498..29678ddb0cb53fae9ae497614690f9d855f9eb86 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -769,19 +769,34 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0280-Limit-Client-Sign-length-more.patch b/patches/server/0280-Limit-Client-Sign-length-more.patch index ce0baeff49..20e898577a 100644 --- a/patches/server/0280-Limit-Client-Sign-length-more.patch +++ b/patches/server/0280-Limit-Client-Sign-length-more.patch @@ -22,7 +22,7 @@ it only impacts data sent from the client. Set -DPaper.maxSignLength=XX to change limit or -1 to disable diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f0fb981c46229c2498061ab6b3adff2db886f7f6..5db66f34c8010331765f2a75af6f8f19c6855e51 100644 +index 29678ddb0cb53fae9ae497614690f9d855f9eb86..86cb92b7cf18272ee4b46c292ed4a7192119ce1a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -299,6 +299,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0352-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0352-Validate-PickItem-Packet-and-kick-for-invalid.patch index 231569604f..7f0081b049 100644 --- a/patches/server/0352-Validate-PickItem-Packet-and-kick-for-invalid.patch +++ b/patches/server/0352-Validate-PickItem-Packet-and-kick-for-invalid.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Validate PickItem Packet and kick for invalid diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5db66f34c8010331765f2a75af6f8f19c6855e51..451f443a11e93b1d4a00490fd3459156289ff614 100644 +index 86cb92b7cf18272ee4b46c292ed4a7192119ce1a..9103d27e5a80c095b22569bb1bba754f98a9b43c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -895,7 +895,14 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0355-Prevent-teleporting-dead-entities.patch b/patches/server/0355-Prevent-teleporting-dead-entities.patch index e133cff17c..70302fe34b 100644 --- a/patches/server/0355-Prevent-teleporting-dead-entities.patch +++ b/patches/server/0355-Prevent-teleporting-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent teleporting dead entities diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 451f443a11e93b1d4a00490fd3459156289ff614..0cdb3af5e89b9934257fc26e619b5086711c3486 100644 +index 9103d27e5a80c095b22569bb1bba754f98a9b43c..9b77b711a172d653a4a96d667551ce83040112e4 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1553,6 +1553,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0370-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0370-Prevent-position-desync-causing-tp-exploit.patch index 439f44b599..7fcd84e1b6 100644 --- a/patches/server/0370-Prevent-position-desync-causing-tp-exploit.patch +++ b/patches/server/0370-Prevent-position-desync-causing-tp-exploit.patch @@ -13,7 +13,7 @@ behaviour, we need to move all of this dangerous logic outside of the move call and into an appropriate place in the tick method. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0cdb3af5e89b9934257fc26e619b5086711c3486..49f3cc0cf7ee20f754442fc1cbccb66132fbe794 100644 +index 9b77b711a172d653a4a96d667551ce83040112e4..151f078ab6081637189d3d532718dac0ec5e46df 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1350,6 +1350,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0372-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0372-Add-PlayerRecipeBookClickEvent.patch index 61efb3a952..eab3672167 100644 --- a/patches/server/0372-Add-PlayerRecipeBookClickEvent.patch +++ b/patches/server/0372-Add-PlayerRecipeBookClickEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerRecipeBookClickEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 49f3cc0cf7ee20f754442fc1cbccb66132fbe794..0fa1cf3694424b81fe40fbaa701a29da73eca8ea 100644 +index 151f078ab6081637189d3d532718dac0ec5e46df..090b42aba7353d232a210d67936d024d00388047 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3058,16 +3058,40 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0374-Add-permission-for-command-blocks.patch b/patches/server/0374-Add-permission-for-command-blocks.patch index b9b154e252..8f73a21aea 100644 --- a/patches/server/0374-Add-permission-for-command-blocks.patch +++ b/patches/server/0374-Add-permission-for-command-blocks.patch @@ -18,7 +18,7 @@ index da9e864520150acd8027545672aa476be414bb4d..d4bd44210d58b30696feeea48e190947 return false; } else if (this.player.blockActionRestricted(this.level, pos, this.gameModeForPlayer)) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0fa1cf3694424b81fe40fbaa701a29da73eca8ea..e7e12f6b7b9c34b9ab4bb934a9a45ad58269981d 100644 +index 090b42aba7353d232a210d67936d024d00388047..01def06cf90faaf67421b6e5a87f4c47dd4c1142 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -806,7 +806,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0376-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0376-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 3f8fdb89ba..f74a80db7f 100644 --- a/patches/server/0376-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0376-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -76,7 +76,7 @@ index d6dc8c983d26ce89f17a990be4284fdc78ad164b..2b1d7a2360a9ee7bca9d93a2dc8c61d1 @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e7e12f6b7b9c34b9ab4bb934a9a45ad58269981d..9b597e3840260c5fad3682bb5e1e135ce81235d3 100644 +index 01def06cf90faaf67421b6e5a87f4c47dd4c1142..9f28c9f2e8f8323aa374c2ac5e7610b825890b18 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3261,7 +3261,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0382-Do-not-accept-invalid-client-settings.patch b/patches/server/0382-Do-not-accept-invalid-client-settings.patch index 34c085dca2..5c428d433e 100644 --- a/patches/server/0382-Do-not-accept-invalid-client-settings.patch +++ b/patches/server/0382-Do-not-accept-invalid-client-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not accept invalid client settings diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9b597e3840260c5fad3682bb5e1e135ce81235d3..cf77e704a1f7b27cae0b5f1a930c9fca045793e0 100644 +index 9f28c9f2e8f8323aa374c2ac5e7610b825890b18..762998180eb7b10151f390ee79690c68d66622f2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3253,6 +3253,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0411-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0411-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch index f4d6f72db3..cb9d72e351 100644 --- a/patches/server/0411-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch +++ b/patches/server/0411-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch @@ -9,7 +9,7 @@ as this is how Vanilla teleports entities. Cancel any pending motion when teleported. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index cf77e704a1f7b27cae0b5f1a930c9fca045793e0..1f11efcef80f9915006cc68b5e8938b393d115ee 100644 +index 762998180eb7b10151f390ee79690c68d66622f2..d97b1040ecec1d30fdd1bf309a8215955642fb93 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -679,7 +679,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0421-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0421-Fix-for-large-move-vectors-crashing-server.patch index add9c0ed45..e987725d68 100644 --- a/patches/server/0421-Fix-for-large-move-vectors-crashing-server.patch +++ b/patches/server/0421-Fix-for-large-move-vectors-crashing-server.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix for large move vectors crashing server Check movement distance also based on current position. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1f11efcef80f9915006cc68b5e8938b393d115ee..d8cd5bcc8d8c07eb4582030ca2703f9171743bd8 100644 +index d97b1040ecec1d30fdd1bf309a8215955642fb93..7a743d81c387179218c519a7e27702605069caeb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -492,9 +492,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0445-Limit-recipe-packets.patch b/patches/server/0445-Limit-recipe-packets.patch index 1738c2e123..f880991f70 100644 --- a/patches/server/0445-Limit-recipe-packets.patch +++ b/patches/server/0445-Limit-recipe-packets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d8cd5bcc8d8c07eb4582030ca2703f9171743bd8..291c85c823a24b86235bf7581761c1686f609b82 100644 +index 7a743d81c387179218c519a7e27702605069caeb..a0bac2fe6222964b098cfaf9470f09c43328fcf5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -266,6 +266,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0460-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0460-Fix-interact-event-not-being-called-sometimes.patch index c80cc0c64b..50b8b7414c 100644 --- a/patches/server/0460-Fix-interact-event-not-being-called-sometimes.patch +++ b/patches/server/0460-Fix-interact-event-not-being-called-sometimes.patch @@ -11,7 +11,7 @@ Subject: [PATCH] Fix interact event not being called sometimes Co-authored-by: Moulberry diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 291c85c823a24b86235bf7581761c1686f609b82..48ebf9e606079fc091f1c4eed37001bbd0100e55 100644 +index a0bac2fe6222964b098cfaf9470f09c43328fcf5..09e40d6e50b7c1ddd1451981d05ecbbef43cfed2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1771,7 +1771,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl @@ -24,7 +24,7 @@ index 291c85c823a24b86235bf7581761c1686f609b82..48ebf9e606079fc091f1c4eed37001bb } } @@ -2392,13 +2392,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl - double d3 = this.player.gameMode.getGameModeForPlayer() == GameType.CREATIVE ? 5.0D : 4.5D; + double d3 = Math.max(this.player.blockInteractionRange(), this.player.entityInteractionRange()); // SPIGOT-5607: Only call interact event if no block or entity is being clicked. Use bukkit ray trace method, because it handles blocks and entities at the same time // SPIGOT-7429: Make sure to call PlayerInteractEvent for spectators and non-pickable entities - org.bukkit.util.RayTraceResult result = this.player.level().getWorld().rayTrace(origin, origin.getDirection(), d3, org.bukkit.FluidCollisionMode.NEVER, false, 0.1, entity -> { @@ -39,7 +39,7 @@ index 291c85c823a24b86235bf7581761c1686f609b82..48ebf9e606079fc091f1c4eed37001bb + GameType gameType = this.player.gameMode.getGameModeForPlayer(); + if (gameType == GameType.ADVENTURE && result.getHitBlock() != null) { + CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, ((org.bukkit.craftbukkit.block.CraftBlock) result.getHitBlock()).getPosition(), org.bukkit.craftbukkit.block.CraftBlock.blockFaceToNotch(result.getHitBlockFace()), this.player.getInventory().getSelected(), InteractionHand.MAIN_HAND); -+ } else if (gameType != GameType.CREATIVE && result.getHitEntity() != null && origin.toVector().distanceSquared(result.getHitPosition()) > 3.0D * 3.0D) { ++ } else if (gameType != GameType.CREATIVE && result.getHitEntity() != null && origin.toVector().distanceSquared(result.getHitPosition()) > this.player.entityInteractionRange() * this.player.entityInteractionRange()) { + CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_AIR, this.player.getInventory().getSelected(), InteractionHand.MAIN_HAND); + } + } // Paper end - Call interact event diff --git a/patches/server/0504-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0504-Allow-using-signs-inside-spawn-protection.patch index df5205a027..b105615726 100644 --- a/patches/server/0504-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0504-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 48ebf9e606079fc091f1c4eed37001bbd0100e55..91f19079cefe3ff5d3defec3991b32225c283d8b 100644 +index 09e40d6e50b7c1ddd1451981d05ecbbef43cfed2..95942fcf46bb14257faa7f5095bbf853b589be1e 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1759,8 +1759,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0509-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0509-Don-t-ignore-result-of-PlayerEditBookEvent.patch index 292034ce60..ea634835be 100644 --- a/patches/server/0509-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/server/0509-Don-t-ignore-result-of-PlayerEditBookEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 91f19079cefe3ff5d3defec3991b32225c283d8b..0f6f1b47f88f46f4d51704304b0504826cef3565 100644 +index 95942fcf46bb14257faa7f5095bbf853b589be1e..80b0da98233dd98a05c898a73e519db9d30a3e74 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1155,7 +1155,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0519-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0519-fix-PlayerItemHeldEvent-firing-twice.patch index 3ffd81552b..1934fa9d5d 100644 --- a/patches/server/0519-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/server/0519-fix-PlayerItemHeldEvent-firing-twice.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0f6f1b47f88f46f4d51704304b0504826cef3565..a31f15acc53ab63b601b8de340beeeba92d5ed64 100644 +index 80b0da98233dd98a05c898a73e519db9d30a3e74..699658bd80eb88907041efb01d31e4051edb91de 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1934,6 +1934,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0536-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0536-Expand-PlayerGameModeChangeEvent.patch index 0834c59e06..f088e643a5 100644 --- a/patches/server/0536-Expand-PlayerGameModeChangeEvent.patch +++ b/patches/server/0536-Expand-PlayerGameModeChangeEvent.patch @@ -134,7 +134,7 @@ index 5de472df78940d1b8320f73d18b2edf3a796227e..073cf184a0e7af41048ae67a9b17b4cd } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a31f15acc53ab63b601b8de340beeeba92d5ed64..17ba9988b6d7fbed2675291781ae28643cd0e6f5 100644 +index 699658bd80eb88907041efb01d31e4051edb91de..58e5acbd00c4f8c0fcafa4f2c21b6a9f4dcc4151 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2732,7 +2732,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0539-Move-range-check-for-block-placing-up.patch b/patches/server/0539-Move-range-check-for-block-placing-up.patch index 7f257f6eac..684068f18d 100644 --- a/patches/server/0539-Move-range-check-for-block-placing-up.patch +++ b/patches/server/0539-Move-range-check-for-block-placing-up.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Move range check for block placing up diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 17ba9988b6d7fbed2675291781ae28643cd0e6f5..f1eea721a2ab664c1b52384313941e46cb8f1a11 100644 +index 58e5acbd00c4f8c0fcafa4f2c21b6a9f4dcc4151..e713a2abca824e92a4922c34fca8c1f0bfdcdf68 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1746,6 +1746,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0542-Add-Unix-domain-socket-support.patch b/patches/server/0542-Add-Unix-domain-socket-support.patch index 80f6dfdfd5..7def3d56ce 100644 --- a/patches/server/0542-Add-Unix-domain-socket-support.patch +++ b/patches/server/0542-Add-Unix-domain-socket-support.patch @@ -87,7 +87,7 @@ index d6d7f1c446ba5507f67038ff27775ba75156f4a7..c63c194c44646e6bc1a5942655278701 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f1eea721a2ab664c1b52384313941e46cb8f1a11..9fb437fe46741edb4ffb7c3d1f0c1bf791ba2283 100644 +index e713a2abca824e92a4922c34fca8c1f0bfdcdf68..ada5016ee354e799a8241a0706ea04e236efd1eb 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2551,6 +2551,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0548-Add-PlayerKickEvent-causes.patch b/patches/server/0548-Add-PlayerKickEvent-causes.patch index 022d813508..ebf1392ee2 100644 --- a/patches/server/0548-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0548-Add-PlayerKickEvent-causes.patch @@ -218,7 +218,7 @@ index 24bf661e76fb421a8be565d9ea68edf7205254d2..feb529adf2168025c785ab92d95a3246 if (this.cserver.getServer().isRunning()) { this.cserver.getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9fb437fe46741edb4ffb7c3d1f0c1bf791ba2283..1c76c6f8b60c65f73efdb30f695c2387a7e6fe1b 100644 +index ada5016ee354e799a8241a0706ea04e236efd1eb..70b215dfbe53bd475192ca1d021032c8fba97228 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -349,7 +349,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0566-Add-PlayerArmSwingEvent.patch b/patches/server/0566-Add-PlayerArmSwingEvent.patch index 78c4ed80d1..080029d23f 100644 --- a/patches/server/0566-Add-PlayerArmSwingEvent.patch +++ b/patches/server/0566-Add-PlayerArmSwingEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmSwingEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1c76c6f8b60c65f73efdb30f695c2387a7e6fe1b..4e96a2a41f3e467e1595cc99ed6a4ce88a98672c 100644 +index 70b215dfbe53bd475192ca1d021032c8fba97228..0a5cad166e852888208125a80b5e2d5e7e9a3a82 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2413,7 +2413,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0567-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0567-Fix-kick-event-leave-message-not-being-sent.patch index 62346afa75..3d2effd695 100644 --- a/patches/server/0567-Fix-kick-event-leave-message-not-being-sent.patch +++ b/patches/server/0567-Fix-kick-event-leave-message-not-being-sent.patch @@ -55,7 +55,7 @@ index feb529adf2168025c785ab92d95a3246e73c0236..b43f87ff4b9853b5d4bbea5ff9686d64 MinecraftServer minecraftserver = this.server; Connection networkmanager = this.connection; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 4e96a2a41f3e467e1595cc99ed6a4ce88a98672c..e55b783ea9fcdf300346409f19c6973fb1d40a48 100644 +index 0a5cad166e852888208125a80b5e2d5e7e9a3a82..dd728c297335581ad69c94f768ec5201b7879264 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1895,6 +1895,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0573-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0573-Prevent-AFK-kick-while-watching-end-credits.patch index 02fd619640..73cf011e9d 100644 --- a/patches/server/0573-Prevent-AFK-kick-while-watching-end-credits.patch +++ b/patches/server/0573-Prevent-AFK-kick-while-watching-end-credits.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent AFK kick while watching end credits diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e55b783ea9fcdf300346409f19c6973fb1d40a48..045f510cf6ee120e00a13b2306d0c0ae9086b7fa 100644 +index dd728c297335581ad69c94f768ec5201b7879264..93a9ef3fc5620c622ce0dfb010c6dafad8fcdb71 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -397,7 +397,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0591-Add-more-advancement-API.patch b/patches/server/0591-Add-more-advancement-API.patch index 772c00ba58..970ef0c936 100644 --- a/patches/server/0591-Add-more-advancement-API.patch +++ b/patches/server/0591-Add-more-advancement-API.patch @@ -164,10 +164,10 @@ index 8ca86852319d7463f60832bc98b825b0b4325995..62ada73302c6b3ce3fb2dcc8c31a1d9c private final DisplayInfo handle; diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index 2d9453498531c99f4fa566a08099b4e5a7af25fa..9d8adc5e281decd61fb3a8cfd78531b0b374e29c 100644 +index 93c0390aade242bc24f8d9a9ac99242d0f588d5e..164f736479facbab370a7b11ffa4f0fca767c448 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -@@ -384,6 +384,11 @@ public class Commodore { +@@ -399,6 +399,11 @@ public class Commodore { super.visitMethodInsn(opcode, owner, name, "()Lcom/destroystokyo/paper/profile/PlayerProfile;", itf); return; } diff --git a/patches/server/0592-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0592-Add-ItemFactory-getSpawnEgg-API.patch index 12ea03ddb7..28bf327957 100644 --- a/patches/server/0592-Add-ItemFactory-getSpawnEgg-API.patch +++ b/patches/server/0592-Add-ItemFactory-getSpawnEgg-API.patch @@ -37,10 +37,10 @@ index eabb8b42b890224dd19b879ff276e9908674310d..803a19063c03627dbea79cb1c395ae35 + // Paper end - old getSpawnEgg API } diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index 9d8adc5e281decd61fb3a8cfd78531b0b374e29c..0d5ce79dc8fb3b1677e09d663608a5cb5224de2f 100644 +index 164f736479facbab370a7b11ffa4f0fca767c448..935c97af6fedde505c79956b24069770742a61cf 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -@@ -391,6 +391,15 @@ public class Commodore { +@@ -406,6 +406,15 @@ public class Commodore { } // Paper end diff --git a/patches/server/0602-Improve-and-expand-AsyncCatcher.patch b/patches/server/0602-Improve-and-expand-AsyncCatcher.patch index ec5a6e526c..4f184a70f2 100644 --- a/patches/server/0602-Improve-and-expand-AsyncCatcher.patch +++ b/patches/server/0602-Improve-and-expand-AsyncCatcher.patch @@ -17,7 +17,7 @@ Async catch modifications to critical entity state Co-authored-by: Jake Potrebic diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 045f510cf6ee120e00a13b2306d0c0ae9086b7fa..147f2faac16e9dcaa6c63ff660978638567109ca 100644 +index 93a9ef3fc5620c622ce0dfb010c6dafad8fcdb71..987ad7f7130c45a4b3843e186b6a5662859a06ae 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1578,6 +1578,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0616-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0616-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch index 7f0fd29a50..90b29a13b4 100644 --- a/patches/server/0616-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch +++ b/patches/server/0616-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Don't respond to ServerboundCommandSuggestionPacket when diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 147f2faac16e9dcaa6c63ff660978638567109ca..c645dae6ba4fe15c1548300854a73e2ef9dca353 100644 +index 987ad7f7130c45a4b3843e186b6a5662859a06ae..5169ca504b3b820e1b3b54af482dc709e2dee863 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -748,6 +748,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0681-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0681-Don-t-allow-vehicle-movement-from-players-while-tele.patch index 8a08304bd7..97f05cf771 100644 --- a/patches/server/0681-Don-t-allow-vehicle-movement-from-players-while-tele.patch +++ b/patches/server/0681-Don-t-allow-vehicle-movement-from-players-while-tele.patch @@ -7,7 +7,7 @@ Bring the vehicle move packet behavior in line with the regular player move packet. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c645dae6ba4fe15c1548300854a73e2ef9dca353..c4ce2f6a2737891337a4369deee5d98f990edeab 100644 +index 5169ca504b3b820e1b3b54af482dc709e2dee863..f26d092e50e5f1e320ba2e3a264573ad862aca26 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -484,6 +484,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0694-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0694-Prevent-tile-entity-copies-loading-chunks.patch index aaf851bff7..41eee9f92e 100644 --- a/patches/server/0694-Prevent-tile-entity-copies-loading-chunks.patch +++ b/patches/server/0694-Prevent-tile-entity-copies-loading-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity copies loading chunks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c4ce2f6a2737891337a4369deee5d98f990edeab..d2eb455eb527ca819565e6538f97d1972afc8a7f 100644 +index f26d092e50e5f1e320ba2e3a264573ad862aca26..c87e243744166fb736ca8db65ac268072e353e16 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3202,7 +3202,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0725-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0725-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch index 7b9fd5728a..6a05adf6b7 100644 --- a/patches/server/0725-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch +++ b/patches/server/0725-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Spigot Config not using commands.spam-exclusions diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d2eb455eb527ca819565e6538f97d1972afc8a7f..559a683e22bfeb981a7a84beeeb08b7aac994687 100644 +index c87e243744166fb736ca8db65ac268072e353e16..8f65943161a6621f8f7926c48322e26a854ae139 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2384,7 +2384,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0726-More-Teleport-API.patch b/patches/server/0726-More-Teleport-API.patch index 0d14091d47..8162e7b15e 100644 --- a/patches/server/0726-More-Teleport-API.patch +++ b/patches/server/0726-More-Teleport-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] More Teleport API diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 559a683e22bfeb981a7a84beeeb08b7aac994687..7dafab02db55fbba49e59a6b2a8c03f8a22cb982 100644 +index 8f65943161a6621f8f7926c48322e26a854ae139..58fd502c2a735d4a102de451a002cfd622c58294 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1566,11 +1566,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0729-Send-block-entities-after-destroy-prediction.patch b/patches/server/0729-Send-block-entities-after-destroy-prediction.patch index c5c44aed4b..40992c754a 100644 --- a/patches/server/0729-Send-block-entities-after-destroy-prediction.patch +++ b/patches/server/0729-Send-block-entities-after-destroy-prediction.patch @@ -57,7 +57,7 @@ index 4d024956156aefde7df308642dfd0a40779e0633..6abecaac8407b992d208a9108e11fd49 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7dafab02db55fbba49e59a6b2a8c03f8a22cb982..6f53025766666adfa2354a7ae9cbffc5baccdfa5 100644 +index 58fd502c2a735d4a102de451a002cfd622c58294..3b1e231c637750821a756c877c9c6b7150b184b8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1712,8 +1712,28 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0747-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0747-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch index 4d07ca9402..08af302068 100644 --- a/patches/server/0747-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch +++ b/patches/server/0747-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Mitigate effects of WorldCreator#keepSpawnLoaded ret type TODO: Remove in 1.21? diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index 0d5ce79dc8fb3b1677e09d663608a5cb5224de2f..3b71aa01d98f0f8d76fbb36986f74c9a6768855b 100644 +index 935c97af6fedde505c79956b24069770742a61cf..854e0eb25b03cfe2979bc10223219c5b45691bd9 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -@@ -389,6 +389,12 @@ public class Commodore { +@@ -404,6 +404,12 @@ public class Commodore { super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, runtimeCbPkgPrefix() + "advancement/CraftAdvancement", "getDisplay0", desc, false); return; } diff --git a/patches/server/0788-Improve-logging-and-errors.patch b/patches/server/0788-Improve-logging-and-errors.patch index 0537254752..243a962373 100644 --- a/patches/server/0788-Improve-logging-and-errors.patch +++ b/patches/server/0788-Improve-logging-and-errors.patch @@ -52,7 +52,7 @@ index aa39bdb0a4ba8fedf5052ea9700afa7d4d2a4300..b4af03c4bdd1ce0861f36c3b75fc7e89 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6f53025766666adfa2354a7ae9cbffc5baccdfa5..8429d78be110b7d296284d99089a37d9f1573ba8 100644 +index 3b1e231c637750821a756c877c9c6b7150b184b8..e5b466f71d4c65eb31210ccad05a9fb603d53098 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3400,7 +3400,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0791-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0791-Add-missing-SpigotConfig-logCommands-check.patch index 6deb542ce8..a7d5349548 100644 --- a/patches/server/0791-Add-missing-SpigotConfig-logCommands-check.patch +++ b/patches/server/0791-Add-missing-SpigotConfig-logCommands-check.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing SpigotConfig logCommands check Co-authored-by: david diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 8429d78be110b7d296284d99089a37d9f1573ba8..810a9580034b2049220655b9863bf589097f82b3 100644 +index e5b466f71d4c65eb31210ccad05a9fb603d53098..1b486d09bd1a84835183a6c8181933fcabb3373f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2058,7 +2058,9 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0796-Use-single-player-info-update-packet-on-join.patch b/patches/server/0796-Use-single-player-info-update-packet-on-join.patch index 2c8409d959..4552daec45 100644 --- a/patches/server/0796-Use-single-player-info-update-packet-on-join.patch +++ b/patches/server/0796-Use-single-player-info-update-packet-on-join.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use single player info update packet on join diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 810a9580034b2049220655b9863bf589097f82b3..554f32f562ce4d841f50183a011fc09fd170f741 100644 +index 1b486d09bd1a84835183a6c8181933fcabb3373f..62b022a72954eeecfa141f4ec93ccb44d955e54b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3438,7 +3438,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0813-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0813-Treat-sequence-violations-like-they-should-be.patch index 3f1ebdd9fa..0a8d25783a 100644 --- a/patches/server/0813-Treat-sequence-violations-like-they-should-be.patch +++ b/patches/server/0813-Treat-sequence-violations-like-they-should-be.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Treat sequence violations like they should be diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 554f32f562ce4d841f50183a011fc09fd170f741..941d45f0a4a50a8ad1d085cb04221c7a77370408 100644 +index 62b022a72954eeecfa141f4ec93ccb44d955e54b..664d9cfacb87b1d9193376261f7102b64c906ddc 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1977,6 +1977,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0814-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0814-Prevent-causing-expired-keys-from-impacting-new-join.patch index 7aea15e9ac..d08f848c6e 100644 --- a/patches/server/0814-Prevent-causing-expired-keys-from-impacting-new-join.patch +++ b/patches/server/0814-Prevent-causing-expired-keys-from-impacting-new-join.patch @@ -26,7 +26,7 @@ index 68c062cbaa030d62d97c9c003651f8fc17a00a6b..6247a21c9c391abf1f6db3482c659593 UPDATE_GAME_MODE((serialized, buf) -> serialized.gameMode = GameType.byId(buf.readVarInt()), (buf, entry) -> buf.writeVarInt(entry.gameMode().getId())), UPDATE_LISTED((serialized, buf) -> serialized.listed = buf.readBoolean(), (buf, entry) -> buf.writeBoolean(entry.listed())), diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 941d45f0a4a50a8ad1d085cb04221c7a77370408..5f20090c35cfd83e54ce139bfe49ae70ddd16582 100644 +index 664d9cfacb87b1d9193376261f7102b64c906ddc..977af8887ac331576a1c4441fcfad681f69a9929 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -295,6 +295,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0850-Implement-PlayerFailMoveEvent.patch b/patches/server/0850-Implement-PlayerFailMoveEvent.patch index 673107a946..e222dfa6e2 100644 --- a/patches/server/0850-Implement-PlayerFailMoveEvent.patch +++ b/patches/server/0850-Implement-PlayerFailMoveEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFailMoveEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5f20090c35cfd83e54ce139bfe49ae70ddd16582..e1cae30864f033d32c8e7c3e6e4e4af92d74f2b0 100644 +index 977af8887ac331576a1c4441fcfad681f69a9929..46bb2031141b88416f2df1fb8bca76638ef66dae 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1261,8 +1261,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0866-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0866-Don-t-tab-complete-namespaced-commands-if-send-names.patch index c5d8030053..200d3d6a57 100644 --- a/patches/server/0866-Don-t-tab-complete-namespaced-commands-if-send-names.patch +++ b/patches/server/0866-Don-t-tab-complete-namespaced-commands-if-send-names.patch @@ -11,7 +11,7 @@ This patch prevents server from sending namespaced commands when player requests tab-complete only commands. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index e1cae30864f033d32c8e7c3e6e4e4af92d74f2b0..48c1327d7226fdbb34ef0cc9e6516aaf94e6781c 100644 +index 46bb2031141b88416f2df1fb8bca76638ef66dae..7ad73ec156417a5c8b826744f1c3ceefc0b129ce 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -820,6 +820,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0876-Add-PlayerPickItemEvent.patch b/patches/server/0876-Add-PlayerPickItemEvent.patch index e97cdf35c3..b9ddd8ed60 100644 --- a/patches/server/0876-Add-PlayerPickItemEvent.patch +++ b/patches/server/0876-Add-PlayerPickItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerPickItemEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 48c1327d7226fdbb34ef0cc9e6516aaf94e6781c..5694afb14889187a4cfc342ccf497dd6ca867f0e 100644 +index 7ad73ec156417a5c8b826744f1c3ceefc0b129ce..0ed03a8ec85d8491d96c7b3ac3feff805a773539 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -935,8 +935,17 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0886-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0886-Add-slot-sanity-checks-in-container-clicks.patch index 7356593a1f..00c27f3999 100644 --- a/patches/server/0886-Add-slot-sanity-checks-in-container-clicks.patch +++ b/patches/server/0886-Add-slot-sanity-checks-in-container-clicks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add slot sanity checks in container clicks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 5694afb14889187a4cfc342ccf497dd6ca867f0e..7e25d42a6ce16b5e8e17d03592a674734b85f540 100644 +index 0ed03a8ec85d8491d96c7b3ac3feff805a773539..5d7b443173c3f11fc402e96db109e4382466d182 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2987,6 +2987,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0943-Add-CartographyItemEvent.patch b/patches/server/0943-Add-CartographyItemEvent.patch index b6ae62ffa8..2d775d4172 100644 --- a/patches/server/0943-Add-CartographyItemEvent.patch +++ b/patches/server/0943-Add-CartographyItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add CartographyItemEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 7e25d42a6ce16b5e8e17d03592a674734b85f540..ae66fb6ad96bc322d3a0690026bfd5accf30cc67 100644 +index 5d7b443173c3f11fc402e96db109e4382466d182..449fd298293f4fb996b7ddae6b174d6a28e95eb6 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3109,6 +3109,19 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0950-Fix-DamageSource-API.patch b/patches/server/0950-Fix-DamageSource-API.patch index b6a6d334d0..26474a62cf 100644 --- a/patches/server/0950-Fix-DamageSource-API.patch +++ b/patches/server/0950-Fix-DamageSource-API.patch @@ -175,7 +175,7 @@ index 60eac9df10a9a395a1568925515d010eb51a64e5..55fd997a4e894eeab24de269d59e4861 if (flag && entity instanceof LivingEntity entityliving) { diff --git a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java b/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java -index 5572c50cac4968e3ec75fe1fc98442407bc3b905..7df86e7124a9ed359f05324b8fc4c8862f7e4b79 100644 +index 8532324060eed772a10e2a3429890438cf32f9ba..7df86e7124a9ed359f05324b8fc4c8862f7e4b79 100644 --- a/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java +++ b/src/main/java/org/bukkit/craftbukkit/damage/CraftDamageSource.java @@ -41,13 +41,13 @@ public class CraftDamageSource implements DamageSource { @@ -198,7 +198,7 @@ index 5572c50cac4968e3ec75fe1fc98442407bc3b905..7df86e7124a9ed359f05324b8fc4c886 @Override public boolean isIndirect() { -- return this.getHandle().getEntity() != this.getHandle().getDamager(); +- return this.getHandle().getCausingDamager() != this.getHandle().getDamager(); + return !this.getHandle().isDirect(); // Paper - fix DamageSource API } diff --git a/patches/server/0953-Improve-tag-parser-handling.patch b/patches/server/0953-Improve-tag-parser-handling.patch index 3fd32ea7bf..e800ee95bf 100644 --- a/patches/server/0953-Improve-tag-parser-handling.patch +++ b/patches/server/0953-Improve-tag-parser-handling.patch @@ -169,7 +169,7 @@ index 898b19887ed34c87003fc63cb5905df2ba6234a5..b47eeb23055b135d5567552ba983bfbc private void write(FriendlyByteBuf buf) { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ae66fb6ad96bc322d3a0690026bfd5accf30cc67..92a281429ba583212dc7ab2caf3135d94e39017c 100644 +index 449fd298293f4fb996b7ddae6b174d6a28e95eb6..134f31cce8d8eca669948a784e2766216fb91ab5 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -766,6 +766,13 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0975-Brigadier-based-command-API.patch b/patches/server/0975-Brigadier-based-command-API.patch index 395602eca3..96d91304d7 100644 --- a/patches/server/0975-Brigadier-based-command-API.patch +++ b/patches/server/0975-Brigadier-based-command-API.patch @@ -2327,7 +2327,7 @@ index b4af03c4bdd1ce0861f36c3b75fc7e89d701c46a..0761d5bc5f2813bb4a9f664ac7a05b97 this.setPvpAllowed(dedicatedserverproperties.pvp); this.setFlightAllowed(dedicatedserverproperties.allowFlight); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 92a281429ba583212dc7ab2caf3135d94e39017c..1ff2a20fd9e08faa5155fc156851e4a8d9742a1d 100644 +index 134f31cce8d8eca669948a784e2766216fb91ab5..60c65af218d533d53b765ba2175fed163c32c126 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2408,33 +2408,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch index 4f061e6e5e..9e1dfe1f30 100644 --- a/patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -201,7 +201,7 @@ index 0e7ace92522fbd4cef7b2c2b8a0f8b86c2cce192..1d849ce4e2c85f149af25318b8ffb6dc ((LivingEntity) this.entity).detectEquipmentUpdatesPublic(); // CraftBukkit - SPIGOT-3789: sync again immediately after sending } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 1ff2a20fd9e08faa5155fc156851e4a8d9742a1d..f04ff7b0c3d30c83931cba2dd6c70e458f08999c 100644 +index 60c65af218d533d53b765ba2175fed163c32c126..a0f5839719ca0ce6ed048229f074041b4f64cc97 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2732,7 +2732,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch index ba49c9f65d..1af38ab7e6 100644 --- a/patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch +++ b/patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate InvAction#HOTBAR_MOVE_AND_READD diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f04ff7b0c3d30c83931cba2dd6c70e458f08999c..d80d490722dddb9255eb1abdf838bc7f4edcc229 100644 +index a0f5839719ca0ce6ed048229f074041b4f64cc97..a8debfad8c8e66099f8a9aedc6f1971a8576dade 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2998,14 +2998,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/patches/server/0990-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0990-Properly-remove-the-experimental-smithing-inventory-.patch new file mode 100644 index 0000000000..9ede88caa7 --- /dev/null +++ b/patches/server/0990-Properly-remove-the-experimental-smithing-inventory-.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic +Date: Thu, 8 Jun 2023 14:45:18 -0700 +Subject: [PATCH] Properly remove the experimental smithing inventory type + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftAbstractInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftAbstractInventoryView.java +index 149825642976124e852be9aef54a3cb4a8ac193d..71d3a5e5dc5630007cf46f4be3d39da4145dd431 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftAbstractInventoryView.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftAbstractInventoryView.java +@@ -160,7 +160,6 @@ public abstract class CraftAbstractInventoryView implements InventoryView { + type = InventoryType.SlotType.CRAFTING; + break; + case ANVIL: +- case SMITHING: + case CARTOGRAPHY: + case GRINDSTONE: + case MERCHANT: +@@ -178,6 +177,7 @@ public abstract class CraftAbstractInventoryView implements InventoryView { + } + break; + case LOOM: ++ case SMITHING: // Paper - properly remove experimental smithing inventory + case SMITHING_NEW: + if (slot == 3) { + type = InventoryType.SlotType.RESULT; diff --git a/patches/server/0990-Chunk-System-Starlight-from-Moonrise.patch b/patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch similarity index 100% rename from patches/server/0990-Chunk-System-Starlight-from-Moonrise.patch rename to patches/server/0991-Chunk-System-Starlight-from-Moonrise.patch diff --git a/patches/server/0991-Rewrite-dataconverter-system.patch b/patches/server/0992-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0991-Rewrite-dataconverter-system.patch rename to patches/server/0992-Rewrite-dataconverter-system.patch diff --git a/patches/server/0992-disable-forced-empty-world-ticks.patch b/patches/server/0993-disable-forced-empty-world-ticks.patch similarity index 100% rename from patches/server/0992-disable-forced-empty-world-ticks.patch rename to patches/server/0993-disable-forced-empty-world-ticks.patch diff --git a/patches/server/0993-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0994-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/0993-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/server/0994-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0995-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/0995-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/0995-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0996-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0995-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/server/0996-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0996-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0997-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0996-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/server/0997-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0997-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0998-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0997-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0998-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0998-Flat-bedrock-generator-settings.patch b/patches/server/0999-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0998-Flat-bedrock-generator-settings.patch rename to patches/server/0999-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0999-Entity-Activation-Range-2.0.patch b/patches/server/1000-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0999-Entity-Activation-Range-2.0.patch rename to patches/server/1000-Entity-Activation-Range-2.0.patch diff --git a/patches/server/1000-Optional-per-player-mob-spawns.patch b/patches/server/1001-Optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/1000-Optional-per-player-mob-spawns.patch rename to patches/server/1001-Optional-per-player-mob-spawns.patch diff --git a/patches/server/1001-Anti-Xray.patch b/patches/server/1002-Anti-Xray.patch similarity index 100% rename from patches/server/1001-Anti-Xray.patch rename to patches/server/1002-Anti-Xray.patch diff --git a/patches/server/1002-Eigencraft-redstone-implementation.patch b/patches/server/1003-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/1002-Eigencraft-redstone-implementation.patch rename to patches/server/1003-Eigencraft-redstone-implementation.patch diff --git a/patches/server/1003-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1004-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/1003-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/1004-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/1004-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1005-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch similarity index 100% rename from patches/server/1004-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch rename to patches/server/1005-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch diff --git a/patches/server/1005-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1006-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/1005-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/1006-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/1006-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/1007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/1006-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/1007-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/1007-Optimize-Hoppers.patch b/patches/server/1008-Optimize-Hoppers.patch similarity index 100% rename from patches/server/1007-Optimize-Hoppers.patch rename to patches/server/1008-Optimize-Hoppers.patch diff --git a/patches/server/1008-Entity-load-save-limit-per-chunk.patch b/patches/server/1009-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/1008-Entity-load-save-limit-per-chunk.patch rename to patches/server/1009-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/1009-Optimize-Voxel-Shape-Merging.patch b/patches/server/1010-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/1009-Optimize-Voxel-Shape-Merging.patch rename to patches/server/1010-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/1010-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1011-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/1010-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/1011-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/1011-Remove-streams-from-hot-code.patch b/patches/server/1012-Remove-streams-from-hot-code.patch similarity index 100% rename from patches/server/1011-Remove-streams-from-hot-code.patch rename to patches/server/1012-Remove-streams-from-hot-code.patch diff --git a/patches/server/1012-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1013-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/1012-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/1013-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1014-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/1013-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/1014-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/1014-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1015-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 98% rename from patches/server/1014-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/1015-Fix-entity-type-tags-suggestions-in-selectors.patch index 47e6c56f5b..3d9a52a5af 100644 --- a/patches/server/1014-Fix-entity-type-tags-suggestions-in-selectors.patch +++ b/patches/server/1015-Fix-entity-type-tags-suggestions-in-selectors.patch @@ -10,7 +10,7 @@ when if this was fixed on the client, that wouldn't be needed. Mojira Issue: https://bugs.mojang.com/browse/MC-235045 diff --git a/src/main/java/net/minecraft/commands/CommandSourceStack.java b/src/main/java/net/minecraft/commands/CommandSourceStack.java -index 4017b82e72fefd6685e9250a936686fd8a0891f1..59d7e8a3d83d3ab7aa28606401bb129ccaeff240 100644 +index 4017b82e72fefd6685e9250a936686fd8a0891f1..2d344df35d47b4b1ecddf32ccaa4dae41e5f58cb 100644 --- a/src/main/java/net/minecraft/commands/CommandSourceStack.java +++ b/src/main/java/net/minecraft/commands/CommandSourceStack.java @@ -447,4 +447,20 @@ public class CommandSourceStack implements ExecutionCommandSource getSelectedEntities() { + if (io.papermc.paper.configuration.GlobalConfiguration.get().commands.fixTargetSelectorTagCompletion && this.source instanceof ServerPlayer player) { + final Entity cameraEntity = player.getCamera(); -+ final double pickDistance = player.gameMode.getGameModeForPlayer().isCreative() ? 6.0F : 4.5F; ++ final double pickDistance = player.entityInteractionRange(); + final Vec3 min = cameraEntity.getEyePosition(1.0F); + final Vec3 viewVector = cameraEntity.getViewVector(1.0F); + final Vec3 max = min.add(viewVector.x * pickDistance, viewVector.y * pickDistance, viewVector.z * pickDistance); diff --git a/patches/server/1015-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1016-Handle-Oversized-block-entities-in-chunks.patch similarity index 100% rename from patches/server/1015-Handle-Oversized-block-entities-in-chunks.patch rename to patches/server/1016-Handle-Oversized-block-entities-in-chunks.patch diff --git a/patches/server/1016-API-for-checking-sent-chunks.patch b/patches/server/1017-API-for-checking-sent-chunks.patch similarity index 100% rename from patches/server/1016-API-for-checking-sent-chunks.patch rename to patches/server/1017-API-for-checking-sent-chunks.patch diff --git a/patches/server/1017-Configurable-Sand-Duping.patch b/patches/server/1018-Configurable-Sand-Duping.patch similarity index 100% rename from patches/server/1017-Configurable-Sand-Duping.patch rename to patches/server/1018-Configurable-Sand-Duping.patch diff --git a/patches/server/1018-Properly-resend-entities.patch b/patches/server/1020-Properly-resend-entities.patch similarity index 99% rename from patches/server/1018-Properly-resend-entities.patch rename to patches/server/1020-Properly-resend-entities.patch index 221fe50a8a..60b3f34d58 100644 --- a/patches/server/1018-Properly-resend-entities.patch +++ b/patches/server/1020-Properly-resend-entities.patch @@ -81,7 +81,7 @@ index e9dcdb1e09e84a9b451034ff4bdfa6eae2dd1c04..24b1715397ba8e6f5e9841a030d0e3d9 } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d80d490722dddb9255eb1abdf838bc7f4edcc229..e460578e2f2f82da05bcf867529ccf9c09ecc1e6 100644 +index a8debfad8c8e66099f8a9aedc6f1971a8576dade..7796e191747be545e744564a2b0b65790f69114d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1949,6 +1949,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl diff --git a/work/Bukkit b/work/Bukkit index e2160a1865..2b4b6d1424 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit e2160a18658bb7d19d303abd7a24605848d6912c +Subproject commit 2b4b6d14241d3d96eb6b7d1888176146dc5895d4 diff --git a/work/CraftBukkit b/work/CraftBukkit index 6ce1726424..68603b1c11 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 6ce17264243172b5e3d14309388e131f025d90f4 +Subproject commit 68603b1c1162f168efdfe8d989d8795587ef9842