Remove stacktrace on exception from reading server.properties (#9296)

118 files changed, 41 insertions, 30 deletions

diff --git a/patches/server/0860-Block-Ticking-API.patch b/patches/server/0859-Block-Ticking-API.patch
index 583ed00736..583ed00736 100644
--- a/patches/server/0860-Block-Ticking-API.patch
+++ b/patches/server/0859-Block-Ticking-API.patch
diff --git a/patches/server/0859-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0859-Remove-invalid-signature-login-stacktrace.patch
deleted file mode 100644
index 53aeb3bcef..0000000000
--- a/patches/server/0859-Remove-invalid-signature-login-stacktrace.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <[email protected]>
-Date: Fri, 10 Jun 2022 16:02:35 +0200
-Subject: [PATCH] Remove invalid signature login stacktrace
-
-
-diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 35ef7487060f81fb106a6a882006edf03023fd01..14488a4cdc3fc8edf3abb3d57ffdcc4880f987ee 100644
---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3588,7 +3588,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
- 
-                     this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator, Duration.ZERO));
-                 } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
--                    ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage());
-+                    // ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage()); // Paper - unnecessary log
-                     this.disconnect(profilepublickey_b.getComponent(), profilepublickey_b.kickCause); // Paper - kick event causes
-                 }
- 
diff --git a/patches/server/0861-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0860-Add-Velocity-IP-Forwarding-Support.patch
index 091bb3c90f..091bb3c90f 100644
--- a/patches/server/0861-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0860-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0862-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0861-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
index 2e38ad24c3..2e38ad24c3 100644
--- a/patches/server/0862-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
+++ b/patches/server/0861-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0863-Add-NamespacedKey-biome-methods.patch b/patches/server/0862-Add-NamespacedKey-biome-methods.patch
index e03f769d70..e03f769d70 100644
--- a/patches/server/0863-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0862-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0864-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0863-Fix-plugin-loggers-on-server-shutdown.patch
index af3d178c6b..af3d178c6b 100644
--- a/patches/server/0864-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0863-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0865-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0864-Stop-large-look-changes-from-crashing-the-server.patch
index 1a4fc80ccb..1a4fc80ccb 100644
--- a/patches/server/0865-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0864-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0866-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0865-Fire-EntityChangeBlockEvent-in-more-places.patch
index c7fbbaaa64..c7fbbaaa64 100644
--- a/patches/server/0866-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0865-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0867-Missing-eating-regain-reason.patch b/patches/server/0866-Missing-eating-regain-reason.patch
index b5a99bc0ef..b5a99bc0ef 100644
--- a/patches/server/0867-Missing-eating-regain-reason.patch
+++ b/patches/server/0866-Missing-eating-regain-reason.patch
diff --git a/patches/server/0868-Missing-effect-cause.patch b/patches/server/0867-Missing-effect-cause.patch
index 2b4bcfc188..2b4bcfc188 100644
--- a/patches/server/0868-Missing-effect-cause.patch
+++ b/patches/server/0867-Missing-effect-cause.patch
diff --git a/patches/server/0869-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0868-Added-byte-array-serialization-deserialization-for-P.patch
index 28ffa3283e..28ffa3283e 100644
--- a/patches/server/0869-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0868-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0870-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0869-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 4aa37793dd..4aa37793dd 100644
--- a/patches/server/0870-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0869-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0871-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0870-Call-BlockPhysicsEvent-more-often.patch
index 83450685d0..83450685d0 100644
--- a/patches/server/0871-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0870-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0872-Configurable-chat-thread-limit.patch b/patches/server/0871-Configurable-chat-thread-limit.patch
index d6404f007b..d6404f007b 100644
--- a/patches/server/0872-Configurable-chat-thread-limit.patch
+++ b/patches/server/0871-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0873-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0872-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index 793883a2f4..793883a2f4 100644
--- a/patches/server/0873-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0872-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0874-fix-Jigsaw-block-kicking-user.patch b/patches/server/0873-fix-Jigsaw-block-kicking-user.patch
index 6206d8d028..6206d8d028 100644
--- a/patches/server/0874-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0873-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0875-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0874-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 7cd7034099..7cd7034099 100644
--- a/patches/server/0875-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0874-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0876-Add-getDrops-to-BlockState.patch b/patches/server/0875-Add-getDrops-to-BlockState.patch
index 7f9d14aad9..7f9d14aad9 100644
--- a/patches/server/0876-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0875-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0877-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0876-Fix-a-bunch-of-vanilla-bugs.patch
index 193fb96886..193fb96886 100644
--- a/patches/server/0877-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0876-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0878-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0877-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 758839864f..758839864f 100644
--- a/patches/server/0878-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0877-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0879-Fix-custom-piglin-loved-items.patch b/patches/server/0878-Fix-custom-piglin-loved-items.patch
index e768ba98b8..e768ba98b8 100644
--- a/patches/server/0879-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0878-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0880-EntityPickupItemEvent-fixes.patch b/patches/server/0879-EntityPickupItemEvent-fixes.patch
index 8c7fe9dd48..8c7fe9dd48 100644
--- a/patches/server/0880-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0879-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0881-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0880-Correctly-handle-interactions-with-items-on-cooldown.patch
index 9243e65aeb..9243e65aeb 100644
--- a/patches/server/0881-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0880-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0882-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0881-Add-PlayerInventorySlotChangeEvent.patch
index 70dd42cf1b..70dd42cf1b 100644
--- a/patches/server/0882-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0881-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0883-Elder-Guardian-appearance-API.patch b/patches/server/0882-Elder-Guardian-appearance-API.patch
index 5bce895aa9..5855c82762 100644
--- a/patches/server/0883-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0882-Elder-Guardian-appearance-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8369fa30d713e9917473d9d6caf4ebc4e3aad228..3975546e58ae69d5d9f662a446d0d68a731f45dc 100644
+index b2f333b88f8282b01975c622c496ca796745b1d4..e0f2f83f411270ac3bc95979ab6778606b3fc890 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3083,6 +3083,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0884-Allow-changing-bed-s-occupied-property.patch b/patches/server/0883-Allow-changing-bed-s-occupied-property.patch
index 4d0128b6d3..4d0128b6d3 100644
--- a/patches/server/0884-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/server/0883-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0885-Add-entity-knockback-API.patch b/patches/server/0884-Add-entity-knockback-API.patch
index 3c5152fdf6..3c5152fdf6 100644
--- a/patches/server/0885-Add-entity-knockback-API.patch
+++ b/patches/server/0884-Add-entity-knockback-API.patch
diff --git a/patches/server/0886-Detect-headless-JREs.patch b/patches/server/0885-Detect-headless-JREs.patch
index 9d49be7a76..9d49be7a76 100644
--- a/patches/server/0886-Detect-headless-JREs.patch
+++ b/patches/server/0885-Detect-headless-JREs.patch
diff --git a/patches/server/0887-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0886-fixed-entity-vehicle-collision-event-not-called.patch
index 19c5cdfd72..19c5cdfd72 100644
--- a/patches/server/0887-fixed-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0886-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0888-optimized-dirt-and-snow-spreading.patch b/patches/server/0887-optimized-dirt-and-snow-spreading.patch
index 08a3761309..08a3761309 100644
--- a/patches/server/0888-optimized-dirt-and-snow-spreading.patch
+++ b/patches/server/0887-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0889-Added-EntityToggleSitEvent.patch b/patches/server/0888-Added-EntityToggleSitEvent.patch
index 3545a2f37d..3545a2f37d 100644
--- a/patches/server/0889-Added-EntityToggleSitEvent.patch
+++ b/patches/server/0888-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0890-Add-fire-tick-delay-option.patch b/patches/server/0889-Add-fire-tick-delay-option.patch
index e9a876ed2b..e9a876ed2b 100644
--- a/patches/server/0890-Add-fire-tick-delay-option.patch
+++ b/patches/server/0889-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0891-Add-Moving-Piston-API.patch b/patches/server/0890-Add-Moving-Piston-API.patch
index 53df041ba1..53df041ba1 100644
--- a/patches/server/0891-Add-Moving-Piston-API.patch
+++ b/patches/server/0890-Add-Moving-Piston-API.patch
diff --git a/patches/server/0892-Ignore-impossible-spawn-tick.patch b/patches/server/0891-Ignore-impossible-spawn-tick.patch
index 46cd469266..46cd469266 100644
--- a/patches/server/0892-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0891-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0893-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0892-Track-projectile-source-for-fireworks-from-dispenser.patch
index 389dfc4431..389dfc4431 100644
--- a/patches/server/0893-Track-projectile-source-for-fireworks-from-dispenser.patch
+++ b/patches/server/0892-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0894-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0893-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
index a840f9a576..a840f9a576 100644
--- a/patches/server/0894-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
+++ b/patches/server/0893-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0895-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0894-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index ba347aa9a8..ba347aa9a8 100644
--- a/patches/server/0895-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0894-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0896-Prevent-compass-from-loading-chunks.patch b/patches/server/0895-Prevent-compass-from-loading-chunks.patch
index fd21636990..fd21636990 100644
--- a/patches/server/0896-Prevent-compass-from-loading-chunks.patch
+++ b/patches/server/0895-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0897-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0896-Add-PrePlayerAttackEntityEvent.patch
index 01fbd77bb2..01fbd77bb2 100644
--- a/patches/server/0897-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0896-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0898-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0897-ensure-reset-EnderDragon-boss-event-name.patch
index 0f1fd322ef..0f1fd322ef 100644
--- a/patches/server/0898-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0897-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0899-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0898-fix-MC-252817-green-map-markers-do-not-disappear.patch
index e5593afbc6..e5593afbc6 100644
--- a/patches/server/0899-fix-MC-252817-green-map-markers-do-not-disappear.patch
+++ b/patches/server/0898-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0900-Add-Player-Warden-Warning-API.patch b/patches/server/0899-Add-Player-Warden-Warning-API.patch
index a95e4dd1c0..102a25ab34 100644
--- a/patches/server/0900-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0899-Add-Player-Warden-Warning-API.patch
@@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
 public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3975546e58ae69d5d9f662a446d0d68a731f45dc..627872976ae4c01f3e87b210ed745622e72c8552 100644
+index e0f2f83f411270ac3bc95979ab6778606b3fc890..621a990a54e61e174e77558d70a84d6a215fb879 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3088,6 +3088,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0901-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0900-More-vanilla-friendly-methods-to-update-trades.patch
index 18bc407bfb..18bc407bfb 100644
--- a/patches/server/0901-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0900-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0902-Add-paper-dumplisteners-command.patch b/patches/server/0901-Add-paper-dumplisteners-command.patch
index cbf1598dd5..cbf1598dd5 100644
--- a/patches/server/0902-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0901-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0903-check-global-player-list-where-appropriate.patch b/patches/server/0902-check-global-player-list-where-appropriate.patch
index be6c2d1321..be6c2d1321 100644
--- a/patches/server/0903-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0902-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0904-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0903-Fix-async-entity-add-due-to-fungus-trees.patch
index fdb8bd16d3..fdb8bd16d3 100644
--- a/patches/server/0904-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0903-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0905-ItemStack-damage-API.patch b/patches/server/0904-ItemStack-damage-API.patch
index 9c9e244de1..9c9e244de1 100644
--- a/patches/server/0905-ItemStack-damage-API.patch
+++ b/patches/server/0904-ItemStack-damage-API.patch
diff --git a/patches/server/0906-Friction-API.patch b/patches/server/0905-Friction-API.patch
index b137b79138..b137b79138 100644
--- a/patches/server/0906-Friction-API.patch
+++ b/patches/server/0905-Friction-API.patch
diff --git a/patches/server/0907-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0906-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 458d74cc9c..458d74cc9c 100644
--- a/patches/server/0907-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0906-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0908-Fix-player-kick-on-shutdown.patch b/patches/server/0907-Fix-player-kick-on-shutdown.patch
index b954657690..b954657690 100644
--- a/patches/server/0908-Fix-player-kick-on-shutdown.patch
+++ b/patches/server/0907-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0909-Sync-offhand-slot-in-menus.patch b/patches/server/0908-Sync-offhand-slot-in-menus.patch
index 66e1fc2fc7..66e1fc2fc7 100644
--- a/patches/server/0909-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0908-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0910-Player-Entity-Tracking-Events.patch b/patches/server/0909-Player-Entity-Tracking-Events.patch
index 0fdc102ca9..0fdc102ca9 100644
--- a/patches/server/0910-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0909-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0911-Limit-pet-look-distance.patch b/patches/server/0910-Limit-pet-look-distance.patch
index 724bcbffa1..724bcbffa1 100644
--- a/patches/server/0911-Limit-pet-look-distance.patch
+++ b/patches/server/0910-Limit-pet-look-distance.patch
diff --git a/patches/server/0912-Properly-resend-entities.patch b/patches/server/0911-Properly-resend-entities.patch
index c5f9768645..c1cea9b974 100644
--- a/patches/server/0912-Properly-resend-entities.patch
+++ b/patches/server/0911-Properly-resend-entities.patch
@@ -66,7 +66,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..bf6a70a69bb695ec1a202cd1e863c468
      public static class DataItem<T> {
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 14488a4cdc3fc8edf3abb3d57ffdcc4880f987ee..0d998395b65be269c2b5b58acd1b2b46408f8f8e 100644
+index 35ef7487060f81fb106a6a882006edf03023fd01..1f6a0ec6e42906466aa63fe81f2d651b8512e837 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2799,7 +2799,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0913-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0912-Fixes-and-additions-to-the-SpawnReason-API.patch
index f7f6ee5b61..f7f6ee5b61 100644
--- a/patches/server/0913-Fixes-and-additions-to-the-SpawnReason-API.patch
+++ b/patches/server/0912-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0914-fix-Instruments.patch b/patches/server/0913-fix-Instruments.patch
index 39e65cc263..c488b2b420 100644
--- a/patches/server/0914-fix-Instruments.patch
+++ b/patches/server/0913-fix-Instruments.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
 properly handle Player#playNote
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 627872976ae4c01f3e87b210ed745622e72c8552..50036389960681b429836b28e608f512c104a888 100644
+index 621a990a54e61e174e77558d70a84d6a215fb879..c1d8535564446d297238a962cc0956f75a314e7b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -717,29 +717,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0915-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0914-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index f4f36a8f11..f4f36a8f11 100644
--- a/patches/server/0915-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0914-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0916-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0915-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 923b2ffa50..923b2ffa50 100644
--- a/patches/server/0916-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0915-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0918-Add-BlockLockCheckEvent.patch b/patches/server/0916-Add-BlockLockCheckEvent.patch
index 29e8b68880..29e8b68880 100644
--- a/patches/server/0918-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0916-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0919-Add-Sneaking-API-for-Entities.patch b/patches/server/0917-Add-Sneaking-API-for-Entities.patch
index c7ba3ecf8f..c7ba3ecf8f 100644
--- a/patches/server/0919-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0917-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0917-Improve-logging-and-errors.patch b/patches/server/0918-Improve-logging-and-errors.patch
index 192162ab13..ce2f62a657 100644
--- a/patches/server/0917-Improve-logging-and-errors.patch
+++ b/patches/server/0918-Improve-logging-and-errors.patch
@@ -4,6 +4,36 @@ Date: Wed, 14 Dec 2022 15:52:11 -0800
 Subject: [PATCH] Improve logging and errors
 
 
+diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
+index f6e423a76d4c9cf639f1d44af80d33cf3072f6b5..135fc81414446f24c3adad71f5199c7898a6c1cd 100644
+--- a/src/main/java/net/minecraft/server/dedicated/Settings.java
++++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
+@@ -49,6 +49,12 @@ public abstract class Settings<T extends Settings<T>> {
+     }
+ 
+     public static Properties loadFromFile(Path path) {
++        // Paper start
++        if (Files.notExists(path)) {
++            LOGGER.info("Could not find existing {}. Creating with default values...", path.getFileName());
++            return new Properties();
++        }
++        // Paper end
+         try {
+             Properties properties;
+             Properties properties1;
+diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+index 1f6a0ec6e42906466aa63fe81f2d651b8512e837..0d998395b65be269c2b5b58acd1b2b46408f8f8e 100644
+--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
++++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+@@ -3588,7 +3588,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+ 
+                     this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator, Duration.ZERO));
+                 } catch (ProfilePublicKey.ValidationException profilepublickey_b) {
+-                    ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage());
++                    // ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage()); // Paper - unnecessary log
+                     this.disconnect(profilepublickey_b.getComponent(), profilepublickey_b.kickCause); // Paper - kick event causes
+                 }
+ 
 diff --git a/src/main/java/net/minecraft/server/packs/PathPackResources.java b/src/main/java/net/minecraft/server/packs/PathPackResources.java
 index 0232c29d96e1021a9f5a9678996993dc55fe7254..8ad8ad1189d7cdb58caaa39c482d32685afa3f9a 100644
 --- a/src/main/java/net/minecraft/server/packs/PathPackResources.java
diff --git a/patches/server/0920-Improve-PortalEvents.patch b/patches/server/0919-Improve-PortalEvents.patch
index aa5fbc2763..aa5fbc2763 100644
--- a/patches/server/0920-Improve-PortalEvents.patch
+++ b/patches/server/0919-Improve-PortalEvents.patch
diff --git a/patches/server/0921-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0920-Add-config-option-for-spider-worldborder-climbing.patch
index 38b52c6506..38b52c6506 100644
--- a/patches/server/0921-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0920-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0922-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0921-Add-missing-SpigotConfig-logCommands-check.patch
index 8ecc1a22e8..8ecc1a22e8 100644
--- a/patches/server/0922-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0921-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0923-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0922-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 04dbb4d045..04dbb4d045 100644
--- a/patches/server/0923-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0922-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0924-Flying-Fall-Damage.patch b/patches/server/0923-Flying-Fall-Damage.patch
index c63718317f..3ed95d5d3f 100644
--- a/patches/server/0924-Flying-Fall-Damage.patch
+++ b/patches/server/0923-Flying-Fall-Damage.patch
@@ -26,7 +26,7 @@ index 53487f0a4fe672298c3b83d24a2a603641afcde8..58152160d609d0e9d105153aeb166a56
          } else {
              if (fallDistance >= 2.0F) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 50036389960681b429836b28e608f512c104a888..01d1878e1ce2338717e77ab729ed481fd5ff7252 100644
+index c1d8535564446d297238a962cc0956f75a314e7b..3d447541b733aa6cefc29c49d551b83642bc1f2a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2304,6 +2304,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0925-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0924-Add-exploded-block-state-to-BlockExplodeEvent.patch
index a968490b2b..a968490b2b 100644
--- a/patches/server/0925-Add-exploded-block-state-to-BlockExplodeEvent.patch
+++ b/patches/server/0924-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/server/0926-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0925-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 5f8840b205..5f8840b205 100644
--- a/patches/server/0926-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0925-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0927-config-for-disabling-entity-tag-tags.patch b/patches/server/0926-config-for-disabling-entity-tag-tags.patch
index e7680c986a..e7680c986a 100644
--- a/patches/server/0927-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0926-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0928-Use-single-player-info-update-packet-on-join.patch b/patches/server/0927-Use-single-player-info-update-packet-on-join.patch
index 222434b107..222434b107 100644
--- a/patches/server/0928-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0927-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0929-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0928-Correctly-shrink-items-during-EntityResurrectEvent.patch
index 48e1f8b1ec..48e1f8b1ec 100644
--- a/patches/server/0929-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0928-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0930-Win-Screen-API.patch b/patches/server/0929-Win-Screen-API.patch
index 843c3f3379..0fec33ced7 100644
--- a/patches/server/0930-Win-Screen-API.patch
+++ b/patches/server/0929-Win-Screen-API.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
 public net.minecraft.server.level.ServerPlayer seenCredits
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 01d1878e1ce2338717e77ab729ed481fd5ff7252..19dfcb53fea04b13593adee4987eaa589546703d 100644
+index 3d447541b733aa6cefc29c49d551b83642bc1f2a..3643c7f434d8aa66633311ccb77ba4d035e8d337 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1206,6 +1206,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0931-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0930-Remove-CraftItemStack-setAmount-null-assignment.patch
index f6cf642638..f6cf642638 100644
--- a/patches/server/0931-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0930-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0932-Fix-force-opening-enchantment-tables.patch b/patches/server/0931-Fix-force-opening-enchantment-tables.patch
index 97bfc2c883..97bfc2c883 100644
--- a/patches/server/0932-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0931-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0933-Add-Entity-Body-Yaw-API.patch b/patches/server/0932-Add-Entity-Body-Yaw-API.patch
index 6381bc95be..6381bc95be 100644
--- a/patches/server/0933-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0932-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0934-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0933-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index efaf1a6e90..efaf1a6e90 100644
--- a/patches/server/0934-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0933-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0935-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0934-Update-the-flag-when-a-captured-block-state-is-outda.patch
index 097c2e3932..097c2e3932 100644
--- a/patches/server/0935-Update-the-flag-when-a-captured-block-state-is-outda.patch
+++ b/patches/server/0934-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0936-Add-EntityFertilizeEggEvent.patch b/patches/server/0935-Add-EntityFertilizeEggEvent.patch
index 1d6a8aeb2c..1d6a8aeb2c 100644
--- a/patches/server/0936-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0935-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0937-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0936-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index 2e74734a41..2e74734a41 100644
--- a/patches/server/0937-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0936-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0938-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0937-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index c09b36b849..c09b36b849 100644
--- a/patches/server/0938-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0937-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0939-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0938-Correctly-handle-ArmorStand-invisibility.patch
index 103ddcbb11..103ddcbb11 100644
--- a/patches/server/0939-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0938-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0940-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0939-Fix-advancement-triggers-for-entity-damage.patch
index 549fd4f631..549fd4f631 100644
--- a/patches/server/0940-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0939-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0941-Fix-text-display-error-on-spawn.patch b/patches/server/0940-Fix-text-display-error-on-spawn.patch
index cb6ccd7e5e..cb6ccd7e5e 100644
--- a/patches/server/0941-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0940-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0942-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0941-Fix-certain-inventories-returning-null-Locations.patch
index e69fe4eb74..e69fe4eb74 100644
--- a/patches/server/0942-Fix-certain-inventories-returning-null-Locations.patch
+++ b/patches/server/0941-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0943-Add-Shearable-API.patch b/patches/server/0942-Add-Shearable-API.patch
index 950ecc2beb..950ecc2beb 100644
--- a/patches/server/0943-Add-Shearable-API.patch
+++ b/patches/server/0942-Add-Shearable-API.patch
diff --git a/patches/server/0944-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0943-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 4c90082c28..4c90082c28 100644
--- a/patches/server/0944-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0943-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0945-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0944-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
index 9f3b11aee1..9f3b11aee1 100644
--- a/patches/server/0945-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
+++ b/patches/server/0944-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0946-Optimize-Hoppers.patch b/patches/server/0945-Optimize-Hoppers.patch
index 3470e69a7a..18820e3768 100644
--- a/patches/server/0946-Optimize-Hoppers.patch
+++ b/patches/server/0945-Optimize-Hoppers.patch
@@ -25,7 +25,7 @@ index c5f3dc74888919e82e2ffbb8d648b7640aa6b690..80cf4852e4010eeeadaf920ab927a40d
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index ac688d6175cc4c82cb454100b19738318503701a..deb1b4c4216f76c4b44a31c337d43baae8039640 100644
+index 784623eefedfb601a8e0b8b42cbdb71eaebcac84..90ed64613717e104fc31d7e8d5df964c92119052 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -718,10 +718,16 @@ public final class ItemStack {
diff --git a/patches/server/0947-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0946-Fix-beehives-generating-from-using-bonemeal.patch
index 48fda8c1b9..df619142e1 100644
--- a/patches/server/0947-Fix-beehives-generating-from-using-bonemeal.patch
+++ b/patches/server/0946-Fix-beehives-generating-from-using-bonemeal.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix beehives generating from using bonemeal
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index deb1b4c4216f76c4b44a31c337d43baae8039640..da4e0712bea0c7aad9fe905b805b9fa11580f59f 100644
+index 90ed64613717e104fc31d7e8d5df964c92119052..50141d426dc93149dc48d876487649aab7e74380 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -392,6 +392,7 @@ public final class ItemStack {
diff --git a/patches/server/0948-Fix-api-checking-banned-ips.patch b/patches/server/0947-Fix-api-checking-banned-ips.patch
index 08f63f3c08..08f63f3c08 100644
--- a/patches/server/0948-Fix-api-checking-banned-ips.patch
+++ b/patches/server/0947-Fix-api-checking-banned-ips.patch
diff --git a/patches/server/0949-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0948-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index f4282269d8..f4282269d8 100644
--- a/patches/server/0949-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0948-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0950-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0949-Treat-sequence-violations-like-they-should-be.patch
index 06d229aac7..06d229aac7 100644
--- a/patches/server/0950-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0949-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0951-remove-duplicate-animate-packet-for-records.patch b/patches/server/0950-remove-duplicate-animate-packet-for-records.patch
index 0958982027..0958982027 100644
--- a/patches/server/0951-remove-duplicate-animate-packet-for-records.patch
+++ b/patches/server/0950-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0952-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0951-Prevent-causing-expired-keys-from-impacting-new-join.patch
index 85153d77d0..85153d77d0 100644
--- a/patches/server/0952-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0951-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0953-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0952-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 6671aa6357..6671aa6357 100644
--- a/patches/server/0953-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0952-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0954-Use-array-for-gamerule-storage.patch b/patches/server/0953-Use-array-for-gamerule-storage.patch
index 52052561af..52052561af 100644
--- a/patches/server/0954-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0953-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0955-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0954-Fix-a-couple-of-upstream-bed-issues.patch
index f4a4393fa2..f4a4393fa2 100644
--- a/patches/server/0955-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0954-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0956-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0955-Fix-demo-flag-not-enabling-demo-mode.patch
index 195413f40e..195413f40e 100644
--- a/patches/server/0956-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0955-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0957-Add-Mob-Experience-reward-API.patch b/patches/server/0956-Add-Mob-Experience-reward-API.patch
index 3c07d5e971..3c07d5e971 100644
--- a/patches/server/0957-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0956-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0958-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0957-Break-redstone-on-top-of-trap-doors-early.patch
index 461e4c40ca..461e4c40ca 100644
--- a/patches/server/0958-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0957-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0959-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0958-Fix-DamageCause-for-Falling-Blocks.patch
index 962ecdd8fa..962ecdd8fa 100644
--- a/patches/server/0959-Fix-DamageCause-for-Falling-Blocks.patch
+++ b/patches/server/0958-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0960-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0959-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index 809f5d1710..809f5d1710 100644
--- a/patches/server/0960-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0959-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0961-More-accurate-isInOpenWater-impl.patch b/patches/server/0960-More-accurate-isInOpenWater-impl.patch
index 5d9d32149a..5d9d32149a 100644
--- a/patches/server/0961-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0960-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0962-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0961-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
index 2127f28b00..2127f28b00 100644
--- a/patches/server/0962-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
+++ b/patches/server/0961-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0963-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0962-Optimise-recalcBlockCounts-for-empty-sections.patch
index 2f061397e0..2f061397e0 100644
--- a/patches/server/0963-Optimise-recalcBlockCounts-for-empty-sections.patch
+++ b/patches/server/0962-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0964-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0963-Fix-destroying-beehive-without-any-players-nearby-th.patch
index b166366059..b166366059 100644
--- a/patches/server/0964-Fix-destroying-beehive-without-any-players-nearby-th.patch
+++ b/patches/server/0963-Fix-destroying-beehive-without-any-players-nearby-th.patch
diff --git a/patches/server/0965-Expand-PlayerItemMendEvent.patch b/patches/server/0964-Expand-PlayerItemMendEvent.patch
index fe452b742e..42e104169f 100644
--- a/patches/server/0965-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0964-Expand-PlayerItemMendEvent.patch
@@ -33,7 +33,7 @@ index 8d8fe55a05eea237a8af99ed15ab16d6167daa77..eca634792d2a7cc649675e3394e84dba
              return k > 0 ? this.repairPlayerItems(player, k) : 0;
          } else {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 19dfcb53fea04b13593adee4987eaa589546703d..87e939222353de48b796d546a09ed4516bd011a7 100644
+index 3643c7f434d8aa66633311ccb77ba4d035e8d337..59c00045ec903a635966f16cf33e5b4110262953 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1674,11 +1674,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0966-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0965-Refresh-ProjectileSource-for-projectiles.patch
index e666028592..e666028592 100644
--- a/patches/server/0966-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0965-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0967-Add-transient-modifier-API.patch b/patches/server/0966-Add-transient-modifier-API.patch
index e3b704e242..e3b704e242 100644
--- a/patches/server/0967-Add-transient-modifier-API.patch
+++ b/patches/server/0966-Add-transient-modifier-API.patch
diff --git a/patches/server/0968-Fix-block-place-logic.patch b/patches/server/0967-Fix-block-place-logic.patch
index e534f4f285..57ecc3dabb 100644
--- a/patches/server/0968-Fix-block-place-logic.patch
+++ b/patches/server/0967-Fix-block-place-logic.patch
@@ -18,7 +18,7 @@ index b0204af850ee182773ad458208cccd946ad148d5..ebee8de2ed831755b6fd154f6cc77ac9
                      if ((entityhuman == null || !entityhuman.getAbilities().instabuild) && itemstack != ItemStack.EMPTY) { // CraftBukkit
                          itemstack.shrink(1);
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index da4e0712bea0c7aad9fe905b805b9fa11580f59f..103ad5f373a59fadb4783892579f3e681a8fd596 100644
+index 50141d426dc93149dc48d876487649aab7e74380..414167d5390baea98a9876ee4ea368c8eeee2f9f 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -462,13 +462,7 @@ public final class ItemStack {
diff --git a/patches/server/0969-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0968-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 0176a6c1b6..0176a6c1b6 100644
--- a/patches/server/0969-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0968-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0970-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0969-Ignore-inline-definitions-of-trim-material-pattern.patch
index 9b113e0bfe..9b113e0bfe 100644
--- a/patches/server/0970-Ignore-inline-definitions-of-trim-material-pattern.patch
+++ b/patches/server/0969-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0971-Call-BlockGrowEvent-for-the-pitcher-crop.patch b/patches/server/0970-Call-BlockGrowEvent-for-the-pitcher-crop.patch
index 98e7c69d60..98e7c69d60 100644
--- a/patches/server/0971-Call-BlockGrowEvent-for-the-pitcher-crop.patch
+++ b/patches/server/0970-Call-BlockGrowEvent-for-the-pitcher-crop.patch
diff --git a/patches/server/0972-Add-API-for-waxed-signs.patch b/patches/server/0971-Add-API-for-waxed-signs.patch
index 70908f9bbb..a2329c0a7a 100644
--- a/patches/server/0972-Add-API-for-waxed-signs.patch
+++ b/patches/server/0971-Add-API-for-waxed-signs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for waxed signs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 78b57aa3120f8526b4bff2ca90d7735845a87b41..3114baf15425129aae9eb3376bb2a727729d378e 100644
+index a74a585a270e4a4c12f025b35a7f104f21e4705c..d00e3627a4da6369e08f3495f04af342ae28e71f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -67,6 +67,18 @@ public class CraftSign<T extends SignBlockEntity> extends CraftBlockEntityState<
diff --git a/patches/server/0973-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0972-Properly-remove-the-experimental-smithing-inventory-.patch
index 73dd186dd3..73dd186dd3 100644
--- a/patches/server/0973-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/server/0972-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/server/0974-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0973-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 9df3133e61..9df3133e61 100644
--- a/patches/server/0974-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0973-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0975-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0974-fix-MapLike-spam-for-missing-key-selector.patch
index 0dcf015d42..0dcf015d42 100644
--- a/patches/server/0975-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0974-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0976-Fix-sniffer-removeExploredLocation.patch b/patches/server/0975-Fix-sniffer-removeExploredLocation.patch
index 7e07747224..7e07747224 100644
--- a/patches/server/0976-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0975-Fix-sniffer-removeExploredLocation.patch