diff --git a/patches/unapplied/server/0064-Chunk-Save-Reattempt.patch b/patches/server/0064-Chunk-Save-Reattempt.patch similarity index 91% rename from patches/unapplied/server/0064-Chunk-Save-Reattempt.patch rename to patches/server/0064-Chunk-Save-Reattempt.patch index d58537d3da..660c0077ac 100644 --- a/patches/unapplied/server/0064-Chunk-Save-Reattempt.patch +++ b/patches/server/0064-Chunk-Save-Reattempt.patch @@ -19,10 +19,10 @@ index aa8972fd1a1fade05d60ab69efb8ff24f344508a..ddcc212ba83d9365adb842b3d3ced64e } } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 18ef7025f7f4dc2a4aff85ca65ff5a2d35a1ef06..64e957650dafc9fc30fa997e7f7d3fd47cf60089 100644 +index fe8bb0037bb7f317fc32ac34461f4eb3a1f397f2..a16047cab2709d197489215de66bf24901523a1c 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -@@ -167,6 +167,7 @@ public class RegionFileStorage implements AutoCloseable { +@@ -208,6 +208,7 @@ public class RegionFileStorage implements AutoCloseable { } // Paper end - rewrite chunk system try { // Paper @@ -30,7 +30,7 @@ index 18ef7025f7f4dc2a4aff85ca65ff5a2d35a1ef06..64e957650dafc9fc30fa997e7f7d3fd4 if (nbt == null) { regionfile.clear(pos); -@@ -191,7 +192,18 @@ public class RegionFileStorage implements AutoCloseable { +@@ -232,7 +233,18 @@ public class RegionFileStorage implements AutoCloseable { dataoutputstream.close(); } } diff --git a/patches/server/0064-Complete-resource-pack-API.patch b/patches/server/0065-Complete-resource-pack-API.patch similarity index 100% rename from patches/server/0064-Complete-resource-pack-API.patch rename to patches/server/0065-Complete-resource-pack-API.patch diff --git a/patches/server/0065-Default-loading-permissions.yml-before-plugins.patch b/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch similarity index 100% rename from patches/server/0065-Default-loading-permissions.yml-before-plugins.patch rename to patches/server/0066-Default-loading-permissions.yml-before-plugins.patch diff --git a/patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch b/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/server/0066-Allow-Reloading-of-Custom-Permissions.patch rename to patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/server/0067-Remove-Metadata-on-reload.patch b/patches/server/0068-Remove-Metadata-on-reload.patch similarity index 100% rename from patches/server/0067-Remove-Metadata-on-reload.patch rename to patches/server/0068-Remove-Metadata-on-reload.patch diff --git a/patches/server/0068-Handle-Item-Meta-Inconsistencies.patch b/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch similarity index 100% rename from patches/server/0068-Handle-Item-Meta-Inconsistencies.patch rename to patches/server/0069-Handle-Item-Meta-Inconsistencies.patch diff --git a/patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 100% rename from patches/server/0069-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch diff --git a/patches/server/0070-Add-World-Util-Methods.patch b/patches/server/0071-Add-World-Util-Methods.patch similarity index 100% rename from patches/server/0070-Add-World-Util-Methods.patch rename to patches/server/0071-Add-World-Util-Methods.patch diff --git a/patches/server/0071-Custom-replacement-for-eaten-items.patch b/patches/server/0072-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/server/0071-Custom-replacement-for-eaten-items.patch rename to patches/server/0072-Custom-replacement-for-eaten-items.patch diff --git a/patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 100% rename from patches/server/0072-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch diff --git a/patches/server/0073-Use-a-Shared-Random-for-Entities.patch b/patches/server/0074-Use-a-Shared-Random-for-Entities.patch similarity index 100% rename from patches/server/0073-Use-a-Shared-Random-for-Entities.patch rename to patches/server/0074-Use-a-Shared-Random-for-Entities.patch diff --git a/patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 100% rename from patches/server/0074-Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch diff --git a/patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/0075-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 100% rename from patches/server/0076-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch diff --git a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/server/0078-Configurable-Chunk-Inhabited-Time.patch b/patches/server/0079-Configurable-Chunk-Inhabited-Time.patch similarity index 100% rename from patches/server/0078-Configurable-Chunk-Inhabited-Time.patch rename to patches/server/0079-Configurable-Chunk-Inhabited-Time.patch diff --git a/patches/server/0079-EntityPathfindEvent.patch b/patches/server/0080-EntityPathfindEvent.patch similarity index 100% rename from patches/server/0079-EntityPathfindEvent.patch rename to patches/server/0080-EntityPathfindEvent.patch diff --git a/patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 93% rename from patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch index 53b372aa14..077dc7b919 100644 --- a/patches/server/0080-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch @@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap). The maximum size of the RegionFileCache is also made configurable. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index fe8bb0037bb7f317fc32ac34461f4eb3a1f397f2..8bff53217d087a9d53aa3738660dde563ee125f1 100644 +index a16047cab2709d197489215de66bf24901523a1c..4c1b1ac36ef09a9cc8da6e8ee71f82d4a67478df 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java @@ -91,7 +91,7 @@ public class RegionFileStorage implements AutoCloseable { diff --git a/patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/server/0081-Do-not-load-chunks-for-Pathfinding.patch rename to patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/server/0082-Add-PlayerUseUnknownEntityEvent.patch rename to patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch b/patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch similarity index 100% rename from patches/server/0083-Configurable-Grass-Spread-Tick-Rate.patch rename to patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch diff --git a/patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from patches/server/0084-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/patches/server/0085-Optimize-DataBits.patch b/patches/server/0086-Optimize-DataBits.patch similarity index 100% rename from patches/server/0085-Optimize-DataBits.patch rename to patches/server/0086-Optimize-DataBits.patch diff --git a/patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from patches/server/0086-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/patches/server/0087-Configurable-Player-Collision.patch b/patches/server/0088-Configurable-Player-Collision.patch similarity index 100% rename from patches/server/0087-Configurable-Player-Collision.patch rename to patches/server/0088-Configurable-Player-Collision.patch diff --git a/patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/server/0088-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/server/0089-Configurable-RCON-IP-address.patch b/patches/server/0090-Configurable-RCON-IP-address.patch similarity index 100% rename from patches/server/0089-Configurable-RCON-IP-address.patch rename to patches/server/0090-Configurable-RCON-IP-address.patch diff --git a/patches/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/server/0090-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/server/0091-Add-ability-to-configure-frosted_ice-properties.patch b/patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch similarity index 100% rename from patches/server/0091-Add-ability-to-configure-frosted_ice-properties.patch rename to patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch diff --git a/patches/server/0092-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch similarity index 100% rename from patches/server/0092-remove-null-possibility-for-getServer-singleton.patch rename to patches/server/0093-remove-null-possibility-for-getServer-singleton.patch diff --git a/patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/0093-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/0094-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 100% rename from patches/server/0094-LootTable-API-Replenishable-Lootables-Feature.patch rename to patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch diff --git a/patches/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 100% rename from patches/server/0095-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch diff --git a/patches/server/0096-System-property-for-disabling-watchdoge.patch b/patches/server/0097-System-property-for-disabling-watchdoge.patch similarity index 100% rename from patches/server/0096-System-property-for-disabling-watchdoge.patch rename to patches/server/0097-System-property-for-disabling-watchdoge.patch diff --git a/patches/server/0097-Async-GameProfileCache-saving.patch b/patches/server/0098-Async-GameProfileCache-saving.patch similarity index 100% rename from patches/server/0097-Async-GameProfileCache-saving.patch rename to patches/server/0098-Async-GameProfileCache-saving.patch diff --git a/patches/server/0098-Optional-TNT-doesn-t-move-in-water.patch b/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch similarity index 100% rename from patches/server/0098-Optional-TNT-doesn-t-move-in-water.patch rename to patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch diff --git a/patches/server/0099-Faster-redstone-torch-rapid-clock-removal.patch b/patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch similarity index 100% rename from patches/server/0099-Faster-redstone-torch-rapid-clock-removal.patch rename to patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch diff --git a/patches/server/0100-Add-server-name-parameter.patch b/patches/server/0101-Add-server-name-parameter.patch similarity index 100% rename from patches/server/0100-Add-server-name-parameter.patch rename to patches/server/0101-Add-server-name-parameter.patch diff --git a/patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch b/patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch similarity index 100% rename from patches/server/0101-Only-send-global-sounds-to-same-world-if-limiting-ra.patch rename to patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch diff --git a/patches/server/0102-Avoid-blocking-on-Network-Manager-creation.patch b/patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch similarity index 100% rename from patches/server/0102-Avoid-blocking-on-Network-Manager-creation.patch rename to patches/server/0103-Avoid-blocking-on-Network-Manager-creation.patch diff --git a/patches/server/0103-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 100% rename from patches/server/0103-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to patches/server/0104-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch diff --git a/patches/server/0104-Add-setting-for-proxy-online-mode-status.patch b/patches/server/0105-Add-setting-for-proxy-online-mode-status.patch similarity index 100% rename from patches/server/0104-Add-setting-for-proxy-online-mode-status.patch rename to patches/server/0105-Add-setting-for-proxy-online-mode-status.patch diff --git a/patches/server/0105-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch similarity index 100% rename from patches/server/0105-Optimise-BlockState-s-hashCode-equals.patch rename to patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch diff --git a/patches/server/0106-Configurable-packet-in-spam-threshold.patch b/patches/server/0107-Configurable-packet-in-spam-threshold.patch similarity index 100% rename from patches/server/0106-Configurable-packet-in-spam-threshold.patch rename to patches/server/0107-Configurable-packet-in-spam-threshold.patch diff --git a/patches/server/0107-Configurable-flying-kick-messages.patch b/patches/server/0108-Configurable-flying-kick-messages.patch similarity index 100% rename from patches/server/0107-Configurable-flying-kick-messages.patch rename to patches/server/0108-Configurable-flying-kick-messages.patch diff --git a/patches/server/0108-Add-EntityZapEvent.patch b/patches/server/0109-Add-EntityZapEvent.patch similarity index 100% rename from patches/server/0108-Add-EntityZapEvent.patch rename to patches/server/0109-Add-EntityZapEvent.patch diff --git a/patches/server/0109-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch b/patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch similarity index 100% rename from patches/server/0109-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch rename to patches/server/0110-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch diff --git a/patches/server/0110-Cache-user-authenticator-threads.patch b/patches/server/0111-Cache-user-authenticator-threads.patch similarity index 100% rename from patches/server/0110-Cache-user-authenticator-threads.patch rename to patches/server/0111-Cache-user-authenticator-threads.patch diff --git a/patches/server/0111-Allow-Reloading-of-Command-Aliases.patch b/patches/server/0112-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/server/0111-Allow-Reloading-of-Command-Aliases.patch rename to patches/server/0112-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/server/0112-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/server/0112-Add-source-to-PlayerExpChangeEvent.patch rename to patches/server/0113-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/server/0113-Add-ProjectileCollideEvent.patch b/patches/server/0114-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/server/0113-Add-ProjectileCollideEvent.patch rename to patches/server/0114-Add-ProjectileCollideEvent.patch diff --git a/patches/server/0114-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from patches/server/0114-Prevent-Pathfinding-out-of-World-Border.patch rename to patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch diff --git a/patches/server/0115-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 100% rename from patches/server/0115-Optimize-World.isLoaded-BlockPosition-Z.patch rename to patches/server/0116-Optimize-World.isLoaded-BlockPosition-Z.patch diff --git a/patches/server/0116-Bound-Treasure-Maps-to-World-Border.patch b/patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from patches/server/0116-Bound-Treasure-Maps-to-World-Border.patch rename to patches/server/0117-Bound-Treasure-Maps-to-World-Border.patch diff --git a/patches/server/0117-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from patches/server/0117-Configurable-Cartographer-Treasure-Maps.patch rename to patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch diff --git a/patches/server/0118-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/server/0119-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/server/0118-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/server/0119-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/server/0119-String-based-Action-Bar-API.patch b/patches/server/0120-String-based-Action-Bar-API.patch similarity index 100% rename from patches/server/0119-String-based-Action-Bar-API.patch rename to patches/server/0120-String-based-Action-Bar-API.patch diff --git a/patches/server/0120-Properly-fix-item-duplication-bug.patch b/patches/server/0121-Properly-fix-item-duplication-bug.patch similarity index 100% rename from patches/server/0120-Properly-fix-item-duplication-bug.patch rename to patches/server/0121-Properly-fix-item-duplication-bug.patch diff --git a/patches/server/0121-Firework-API-s.patch b/patches/server/0122-Firework-API-s.patch similarity index 100% rename from patches/server/0121-Firework-API-s.patch rename to patches/server/0122-Firework-API-s.patch diff --git a/patches/server/0122-PlayerTeleportEndGatewayEvent.patch b/patches/server/0123-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0122-PlayerTeleportEndGatewayEvent.patch rename to patches/server/0123-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/server/0123-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/server/0123-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/server/0124-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/server/0124-Enforce-Sync-Player-Saves.patch b/patches/server/0125-Enforce-Sync-Player-Saves.patch similarity index 100% rename from patches/server/0124-Enforce-Sync-Player-Saves.patch rename to patches/server/0125-Enforce-Sync-Player-Saves.patch diff --git a/patches/server/0125-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/server/0126-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 100% rename from patches/server/0125-Don-t-allow-entities-to-ride-themselves-572.patch rename to patches/server/0126-Don-t-allow-entities-to-ride-themselves-572.patch diff --git a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/server/0127-Cap-Entity-Collisions.patch b/patches/server/0128-Cap-Entity-Collisions.patch similarity index 100% rename from patches/server/0127-Cap-Entity-Collisions.patch rename to patches/server/0128-Cap-Entity-Collisions.patch diff --git a/patches/server/0128-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/0128-Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/0129-Do-not-let-armorstands-drown.patch b/patches/server/0130-Do-not-let-armorstands-drown.patch similarity index 100% rename from patches/server/0129-Do-not-let-armorstands-drown.patch rename to patches/server/0130-Do-not-let-armorstands-drown.patch diff --git a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch similarity index 100% rename from patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/server/0131-Properly-handle-async-calls-to-restart-the-server.patch diff --git a/patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 100% rename from patches/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/server/0132-Add-option-to-make-parrots-stay-on-shoulders-despite.patch diff --git a/patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/server/0133-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 100% rename from patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/server/0134-Use-TerminalConsoleAppender-for-console-improvements.patch diff --git a/patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/server/0134-provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/server/0135-provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/server/0135-Item-canEntityPickup.patch b/patches/server/0136-Item-canEntityPickup.patch similarity index 100% rename from patches/server/0135-Item-canEntityPickup.patch rename to patches/server/0136-Item-canEntityPickup.patch diff --git a/patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/0136-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/server/0137-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/0137-PlayerAttemptPickupItemEvent.patch b/patches/server/0138-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/0137-PlayerAttemptPickupItemEvent.patch rename to patches/server/0138-PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0139-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0139-Add-UnknownCommandEvent.patch b/patches/server/0140-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/server/0139-Add-UnknownCommandEvent.patch rename to patches/server/0140-Add-UnknownCommandEvent.patch diff --git a/patches/server/0140-Basic-PlayerProfile-API.patch b/patches/server/0141-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/server/0140-Basic-PlayerProfile-API.patch rename to patches/server/0141-Basic-PlayerProfile-API.patch diff --git a/patches/server/0141-Shoulder-Entities-Release-API.patch b/patches/server/0142-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/0141-Shoulder-Entities-Release-API.patch rename to patches/server/0142-Shoulder-Entities-Release-API.patch diff --git a/patches/server/0142-Profile-Lookup-Events.patch b/patches/server/0143-Profile-Lookup-Events.patch similarity index 100% rename from patches/server/0142-Profile-Lookup-Events.patch rename to patches/server/0143-Profile-Lookup-Events.patch diff --git a/patches/server/0143-Block-player-logins-during-server-shutdown.patch b/patches/server/0144-Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/0143-Block-player-logins-during-server-shutdown.patch rename to patches/server/0144-Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/0144-Entity-fromMobSpawner.patch b/patches/server/0145-Entity-fromMobSpawner.patch similarity index 100% rename from patches/server/0144-Entity-fromMobSpawner.patch rename to patches/server/0145-Entity-fromMobSpawner.patch diff --git a/patches/server/0145-Improve-the-Saddle-API-for-Horses.patch b/patches/server/0146-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/0145-Improve-the-Saddle-API-for-Horses.patch rename to patches/server/0146-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/0146-Implement-ensureServerConversions-API.patch b/patches/server/0147-Implement-ensureServerConversions-API.patch similarity index 100% rename from patches/server/0146-Implement-ensureServerConversions-API.patch rename to patches/server/0147-Implement-ensureServerConversions-API.patch diff --git a/patches/server/0147-Implement-getI18NDisplayName.patch b/patches/server/0148-Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/0147-Implement-getI18NDisplayName.patch rename to patches/server/0148-Implement-getI18NDisplayName.patch diff --git a/patches/server/0148-ProfileWhitelistVerifyEvent.patch b/patches/server/0149-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/server/0148-ProfileWhitelistVerifyEvent.patch rename to patches/server/0149-ProfileWhitelistVerifyEvent.patch diff --git a/patches/server/0149-Fix-this-stupid-bullshit.patch b/patches/server/0150-Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/server/0149-Fix-this-stupid-bullshit.patch rename to patches/server/0150-Fix-this-stupid-bullshit.patch diff --git a/patches/server/0150-LivingEntity-setKiller.patch b/patches/server/0151-LivingEntity-setKiller.patch similarity index 100% rename from patches/server/0150-LivingEntity-setKiller.patch rename to patches/server/0151-LivingEntity-setKiller.patch diff --git a/patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/0151-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/server/0152-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/server/0152-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/server/0153-Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/server/0153-Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/server/0154-Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 100% rename from patches/server/0154-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/server/0155-Handle-plugin-prefixes-using-Log4J-configuration.patch diff --git a/patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/server/0155-Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/server/0156-Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/server/0156-Add-PlayerJumpEvent.patch b/patches/server/0157-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/server/0156-Add-PlayerJumpEvent.patch rename to patches/server/0157-Add-PlayerJumpEvent.patch diff --git a/patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch b/patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch similarity index 100% rename from patches/server/0157-handle-ServerboundKeepAlivePacket-async.patch rename to patches/server/0158-handle-ServerboundKeepAlivePacket-async.patch diff --git a/patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch b/patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/server/0158-Expose-client-protocol-version-and-virtual-host.patch rename to patches/server/0159-Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/server/0159-revert-serverside-behavior-of-keepalives.patch b/patches/server/0160-revert-serverside-behavior-of-keepalives.patch similarity index 100% rename from patches/server/0159-revert-serverside-behavior-of-keepalives.patch rename to patches/server/0160-revert-serverside-behavior-of-keepalives.patch diff --git a/patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/server/0160-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/server/0161-Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/server/0161-Add-PlayerArmorChangeEvent.patch b/patches/server/0162-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/0161-Add-PlayerArmorChangeEvent.patch rename to patches/server/0162-Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from patches/server/0162-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/server/0163-Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 100% rename from patches/server/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to patches/server/0164-Fix-MC-117075-TE-Unload-Lag-Spike.patch diff --git a/patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch b/patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch similarity index 100% rename from patches/server/0164-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/server/0165-use-CB-BlockState-implementations-for-captured-block.patch diff --git a/patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/server/0165-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/server/0166-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/server/0166-AsyncTabCompleteEvent.patch b/patches/server/0167-AsyncTabCompleteEvent.patch similarity index 100% rename from patches/server/0166-AsyncTabCompleteEvent.patch rename to patches/server/0167-AsyncTabCompleteEvent.patch diff --git a/patches/server/0167-PlayerPickupExperienceEvent.patch b/patches/server/0168-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/0167-PlayerPickupExperienceEvent.patch rename to patches/server/0168-PlayerPickupExperienceEvent.patch diff --git a/patches/server/0168-Ability-to-apply-mending-to-XP-API.patch b/patches/server/0169-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/server/0168-Ability-to-apply-mending-to-XP-API.patch rename to patches/server/0169-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/server/0170-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch b/patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0170-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/server/0171-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0171-PreCreatureSpawnEvent.patch b/patches/server/0172-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/0171-PreCreatureSpawnEvent.patch rename to patches/server/0172-PreCreatureSpawnEvent.patch diff --git a/patches/server/0172-Fill-Profile-Property-Events.patch b/patches/server/0173-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0172-Fill-Profile-Property-Events.patch rename to patches/server/0173-Fill-Profile-Property-Events.patch diff --git a/patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch b/patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0173-PlayerAdvancementCriterionGrantEvent.patch rename to patches/server/0174-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0174-Add-ArmorStand-Item-Meta.patch b/patches/server/0175-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0174-Add-ArmorStand-Item-Meta.patch rename to patches/server/0175-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0175-Extend-Player-Interact-cancellation.patch b/patches/server/0176-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0175-Extend-Player-Interact-cancellation.patch rename to patches/server/0176-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0176-Tameable-getOwnerUniqueId-API.patch b/patches/server/0177-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0176-Tameable-getOwnerUniqueId-API.patch rename to patches/server/0177-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 100% rename from patches/server/0177-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/server/0178-Toggleable-player-crits-helps-mitigate-hacked-client.patch diff --git a/patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch b/patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0178-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/server/0179-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0180-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/0179-Implement-extended-PaperServerListPingEvent.patch rename to patches/server/0180-Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/server/0180-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/server/0181-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/server/0181-Player.setPlayerProfile-API.patch b/patches/server/0182-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/server/0181-Player.setPlayerProfile-API.patch rename to patches/server/0182-Player.setPlayerProfile-API.patch diff --git a/patches/server/0182-getPlayerUniqueId-API.patch b/patches/server/0183-getPlayerUniqueId-API.patch similarity index 100% rename from patches/server/0182-getPlayerUniqueId-API.patch rename to patches/server/0183-getPlayerUniqueId-API.patch diff --git a/patches/server/0183-Improved-Async-Task-Scheduler.patch b/patches/server/0184-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0183-Improved-Async-Task-Scheduler.patch rename to patches/server/0184-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0184-Make-legacy-ping-handler-more-reliable.patch b/patches/server/0185-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0184-Make-legacy-ping-handler-more-reliable.patch rename to patches/server/0185-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0185-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/server/0186-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0186-Flag-to-disable-the-channel-limit.patch b/patches/server/0187-Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/server/0186-Flag-to-disable-the-channel-limit.patch rename to patches/server/0187-Flag-to-disable-the-channel-limit.patch diff --git a/patches/server/0187-Add-openSign-method-to-HumanEntity.patch b/patches/server/0188-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/0187-Add-openSign-method-to-HumanEntity.patch rename to patches/server/0188-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/0188-Configurable-sprint-interruption-on-attack.patch b/patches/server/0189-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/0188-Configurable-sprint-interruption-on-attack.patch rename to patches/server/0189-Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/0189-EndermanEscapeEvent.patch b/patches/server/0190-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0189-EndermanEscapeEvent.patch rename to patches/server/0190-EndermanEscapeEvent.patch diff --git a/patches/server/0190-Enderman.teleportRandomly.patch b/patches/server/0191-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0190-Enderman.teleportRandomly.patch rename to patches/server/0191-Enderman.teleportRandomly.patch diff --git a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0192-Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/server/0191-Block-Enderpearl-Travel-Exploit.patch rename to patches/server/0192-Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/server/0193-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch new file mode 100644 index 0000000000..4fc54451ea --- /dev/null +++ b/patches/server/0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: 0x22 <0x22@futureclient.net> +Date: Thu, 26 Apr 2018 04:41:11 -0400 +Subject: [PATCH] Fix exploit that allowed colored signs to be created + + +diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +index 584feb744bd2aa34f788de17d43c16a04c33a2c6..13705a9e42c6ffc0e403de5fb56232845169d198 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +@@ -201,9 +201,9 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C + Style chatmodifier = text.getMessage(i, player.isTextFilteringEnabled()).getStyle(); + + if (player.isTextFilteringEnabled()) { +- text = text.setMessage(i, Component.literal(filteredtext.filteredOrEmpty()).setStyle(chatmodifier)); ++ text = text.setMessage(i, Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only + } else { +- text = text.setMessage(i, Component.literal(filteredtext.raw()).setStyle(chatmodifier), Component.literal(filteredtext.filteredOrEmpty()).setStyle(chatmodifier)); ++ text = text.setMessage(i, Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.raw())).setStyle(chatmodifier), Component.literal(net.minecraft.SharedConstants.filterText(filteredtext.filteredOrEmpty())).setStyle(chatmodifier)); // Paper - filter sign text to chat only + } + + // CraftBukkit start diff --git a/patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/0193-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/server/0195-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/0194-EndermanAttackPlayerEvent.patch b/patches/server/0196-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0194-EndermanAttackPlayerEvent.patch rename to patches/server/0196-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0195-WitchConsumePotionEvent.patch b/patches/server/0197-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0195-WitchConsumePotionEvent.patch rename to patches/server/0197-WitchConsumePotionEvent.patch diff --git a/patches/server/0196-WitchThrowPotionEvent.patch b/patches/server/0198-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0196-WitchThrowPotionEvent.patch rename to patches/server/0198-WitchThrowPotionEvent.patch diff --git a/patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/0197-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/server/0199-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/0198-WitchReadyPotionEvent.patch b/patches/server/0200-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0198-WitchReadyPotionEvent.patch rename to patches/server/0200-WitchReadyPotionEvent.patch diff --git a/patches/server/0199-ItemStack-getMaxItemUseDuration.patch b/patches/server/0201-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0199-ItemStack-getMaxItemUseDuration.patch rename to patches/server/0201-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch b/patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0200-Implement-EntityTeleportEndGatewayEvent.patch rename to patches/server/0202-Implement-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0201-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/server/0203-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0202-Fix-CraftEntity-hashCode.patch b/patches/server/0204-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0202-Fix-CraftEntity-hashCode.patch rename to patches/server/0204-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/0203-Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/server/0205-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch b/patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0204-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/server/0206-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0205-Make-shield-blocking-delay-configurable.patch b/patches/server/0207-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/0205-Make-shield-blocking-delay-configurable.patch rename to patches/server/0207-Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/0206-Improve-EntityShootBowEvent.patch b/patches/server/0208-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0206-Improve-EntityShootBowEvent.patch rename to patches/server/0208-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0207-PlayerReadyArrowEvent.patch b/patches/server/0209-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0207-PlayerReadyArrowEvent.patch rename to patches/server/0209-PlayerReadyArrowEvent.patch diff --git a/patches/server/0208-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch similarity index 100% rename from patches/server/0208-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch rename to patches/server/0210-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch diff --git a/patches/server/0209-Expand-Explosions-API.patch b/patches/server/0211-Expand-Explosions-API.patch similarity index 100% rename from patches/server/0209-Expand-Explosions-API.patch rename to patches/server/0211-Expand-Explosions-API.patch diff --git a/patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/0210-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/server/0212-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/0211-RangedEntity-API.patch b/patches/server/0213-RangedEntity-API.patch similarity index 100% rename from patches/server/0211-RangedEntity-API.patch rename to patches/server/0213-RangedEntity-API.patch diff --git a/patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0212-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/server/0214-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0213-Implement-World.getEntity-UUID-API.patch b/patches/server/0215-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/0213-Implement-World.getEntity-UUID-API.patch rename to patches/server/0215-Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/0214-InventoryCloseEvent-Reason-API.patch b/patches/server/0216-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/server/0214-InventoryCloseEvent-Reason-API.patch rename to patches/server/0216-InventoryCloseEvent-Reason-API.patch diff --git a/patches/server/0215-Vex-get-setSummoner-API.patch b/patches/server/0217-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0215-Vex-get-setSummoner-API.patch rename to patches/server/0217-Vex-get-setSummoner-API.patch diff --git a/patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/server/0216-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/server/0218-Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 100% rename from patches/server/0217-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/server/0219-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch diff --git a/patches/server/0218-add-more-information-to-Entity.toString.patch b/patches/server/0220-add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/server/0218-add-more-information-to-Entity.toString.patch rename to patches/server/0220-add-more-information-to-Entity.toString.patch diff --git a/patches/server/0219-EnderDragon-Events.patch b/patches/server/0221-EnderDragon-Events.patch similarity index 100% rename from patches/server/0219-EnderDragon-Events.patch rename to patches/server/0221-EnderDragon-Events.patch diff --git a/patches/server/0220-PlayerElytraBoostEvent.patch b/patches/server/0222-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0220-PlayerElytraBoostEvent.patch rename to patches/server/0222-PlayerElytraBoostEvent.patch diff --git a/patches/server/0221-PlayerLaunchProjectileEvent.patch b/patches/server/0223-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0221-PlayerLaunchProjectileEvent.patch rename to patches/server/0223-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0222-Improve-BlockPosition-inlining.patch b/patches/server/0224-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0222-Improve-BlockPosition-inlining.patch rename to patches/server/0224-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/0223-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/server/0225-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/0224-Vanished-players-don-t-have-rights.patch b/patches/server/0226-Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/0224-Vanished-players-don-t-have-rights.patch rename to patches/server/0226-Vanished-players-don-t-have-rights.patch diff --git a/patches/server/0225-Allow-disabling-armour-stand-ticking.patch b/patches/server/0227-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/0225-Allow-disabling-armour-stand-ticking.patch rename to patches/server/0227-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/0226-SkeletonHorse-Additions.patch b/patches/server/0228-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0226-SkeletonHorse-Additions.patch rename to patches/server/0228-SkeletonHorse-Additions.patch diff --git a/patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/0227-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/server/0229-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0228-Implement-Expanded-ArmorStand-API.patch b/patches/server/0230-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0228-Implement-Expanded-ArmorStand-API.patch rename to patches/server/0230-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0229-AnvilDamageEvent.patch b/patches/server/0231-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0229-AnvilDamageEvent.patch rename to patches/server/0231-AnvilDamageEvent.patch diff --git a/patches/server/0230-Add-TNTPrimeEvent.patch b/patches/server/0232-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0230-Add-TNTPrimeEvent.patch rename to patches/server/0232-Add-TNTPrimeEvent.patch diff --git a/patches/server/0231-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/server/0231-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/server/0233-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/server/0232-Fix-NBT-type-issues.patch b/patches/server/0234-Fix-NBT-type-issues.patch similarity index 100% rename from patches/server/0232-Fix-NBT-type-issues.patch rename to patches/server/0234-Fix-NBT-type-issues.patch diff --git a/patches/server/0233-Remove-unnecessary-itemmeta-handling.patch b/patches/server/0235-Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/0233-Remove-unnecessary-itemmeta-handling.patch rename to patches/server/0235-Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 100% rename from patches/server/0234-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/server/0236-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch diff --git a/patches/server/0235-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from patches/server/0235-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/server/0236-Use-ConcurrentHashMap-in-JsonList.patch b/patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/0236-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/server/0238-Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/0237-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/0237-Use-a-Queue-for-Queueing-Commands.patch rename to patches/server/0239-Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/0238-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/server/0238-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/server/0240-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/server/0239-Optimize-BlockPosition-helper-methods.patch b/patches/server/0241-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0239-Optimize-BlockPosition-helper-methods.patch rename to patches/server/0241-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0240-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch similarity index 100% rename from patches/server/0240-Restore-vanilla-default-mob-spawn-range-and-water-an.patch rename to patches/server/0242-Restore-vanilla-default-mob-spawn-range-and-water-an.patch diff --git a/patches/server/0241-Slime-Pathfinder-Events.patch b/patches/server/0243-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0241-Slime-Pathfinder-Events.patch rename to patches/server/0243-Slime-Pathfinder-Events.patch diff --git a/patches/server/0242-Configurable-speed-for-water-flowing-over-lava.patch b/patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/0242-Configurable-speed-for-water-flowing-over-lava.patch rename to patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0243-Optimize-CraftBlockData-Creation.patch b/patches/server/0245-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0243-Optimize-CraftBlockData-Creation.patch rename to patches/server/0245-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0244-Optimize-MappedRegistry.patch b/patches/server/0246-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0244-Optimize-MappedRegistry.patch rename to patches/server/0246-Optimize-MappedRegistry.patch diff --git a/patches/server/0245-Add-PhantomPreSpawnEvent.patch b/patches/server/0247-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0245-Add-PhantomPreSpawnEvent.patch rename to patches/server/0247-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0246-Add-More-Creeper-API.patch b/patches/server/0248-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0246-Add-More-Creeper-API.patch rename to patches/server/0248-Add-More-Creeper-API.patch diff --git a/patches/server/0247-Inventory-removeItemAnySlot.patch b/patches/server/0249-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0247-Inventory-removeItemAnySlot.patch rename to patches/server/0249-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0248-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from patches/server/0248-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/server/0250-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/server/0249-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/server/0249-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/server/0251-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch b/patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch rename to patches/server/0252-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/0251-Improve-death-events.patch b/patches/server/0253-Improve-death-events.patch similarity index 100% rename from patches/server/0251-Improve-death-events.patch rename to patches/server/0253-Improve-death-events.patch diff --git a/patches/server/0252-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0252-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/server/0254-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0253-Mob-Pathfinding-API.patch b/patches/server/0255-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0253-Mob-Pathfinding-API.patch rename to patches/server/0255-Mob-Pathfinding-API.patch diff --git a/patches/server/0254-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/0254-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/server/0256-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/0255-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from patches/server/0255-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to patches/server/0257-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/patches/server/0256-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0256-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/server/0258-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0257-Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/0259-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0257-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/server/0259-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0258-Honor-EntityAgeable.ageLock.patch b/patches/server/0260-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0258-Honor-EntityAgeable.ageLock.patch rename to patches/server/0260-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0259-Configurable-connection-throttle-kick-message.patch b/patches/server/0261-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0259-Configurable-connection-throttle-kick-message.patch rename to patches/server/0261-Configurable-connection-throttle-kick-message.patch diff --git a/patches/unapplied/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 81% rename from patches/unapplied/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch index 261d06e792..8f748f1408 100644 --- a/patches/unapplied/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch +++ b/patches/server/0262-Prevent-chunk-loading-from-Fluid-Flowing.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Prevent chunk loading from Fluid Flowing diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java -index f809a19afdfdb7df439e907531f54b2df1baf08c..00516a230073391b31795ec5af2aa7aa48db639a 100644 +index fbf699e777d45db3dcf1606d34f509ca1a5bbb7a..c694b16be7c276fbf34aed2fd2aa6d6b79625561 100644 --- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java +++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java -@@ -174,7 +174,8 @@ public abstract class FlowingFluid extends Fluid { +@@ -175,7 +175,8 @@ public abstract class FlowingFluid extends Fluid { Direction enumdirection = (Direction) entry.getKey(); FluidState fluid1 = (FluidState) entry.getValue(); BlockPos blockposition1 = pos.relative(enumdirection); @@ -18,7 +18,7 @@ index f809a19afdfdb7df439e907531f54b2df1baf08c..00516a230073391b31795ec5af2aa7aa if (this.canSpreadTo(world, pos, blockState, enumdirection, blockposition1, iblockdata1, world.getFluidState(blockposition1), fluid1.getType())) { // CraftBukkit start -@@ -201,7 +202,9 @@ public abstract class FlowingFluid extends Fluid { +@@ -202,7 +203,9 @@ public abstract class FlowingFluid extends Fluid { while (iterator.hasNext()) { Direction enumdirection = (Direction) iterator.next(); BlockPos blockposition1 = pos.relative(enumdirection); @@ -29,14 +29,14 @@ index f809a19afdfdb7df439e907531f54b2df1baf08c..00516a230073391b31795ec5af2aa7aa FluidState fluid = iblockdata1.getFluidState(); if (fluid.getType().isSame(this) && this.canPassThroughWall(enumdirection, world, pos, state, blockposition1, iblockdata1)) { -@@ -318,11 +321,18 @@ public abstract class FlowingFluid extends Fluid { - if (enumdirection1 != enumdirection) { - BlockPos blockposition2 = blockposition.relative(enumdirection1); - short short0 = FlowingFluid.getCacheKey(blockposition1, blockposition2); -- Pair pair = (Pair) short2objectmap.computeIfAbsent(short0, (short1) -> { +@@ -319,11 +322,18 @@ public abstract class FlowingFluid extends Fluid { + if (enumdirection1 != direction) { + BlockPos blockposition2 = pos.relative(enumdirection1); + short short0 = FlowingFluid.getCacheKey(fromPos, blockposition2); +- Pair pair = (Pair) stateCache.computeIfAbsent(short0, (short1) -> { - BlockState iblockdata1 = world.getBlockState(blockposition2); + // Paper start - avoid loading chunks -+ Pair pair = short2objectmap.get(short0); ++ Pair pair = stateCache.get(short0); + if (pair == null) { + BlockState iblockdatax = world.getBlockStateIfLoaded(blockposition2); + if (iblockdatax == null) { @@ -46,13 +46,13 @@ index f809a19afdfdb7df439e907531f54b2df1baf08c..00516a230073391b31795ec5af2aa7aa - return Pair.of(iblockdata1, iblockdata1.getFluidState()); - }); + pair = Pair.of(iblockdatax, iblockdatax.getFluidState()); -+ short2objectmap.put(short0, pair); ++ stateCache.put(short0, pair); + } + // Paper end BlockState iblockdata1 = (BlockState) pair.getFirst(); FluidState fluid = (FluidState) pair.getSecond(); -@@ -394,11 +404,16 @@ public abstract class FlowingFluid extends Fluid { +@@ -395,11 +405,16 @@ public abstract class FlowingFluid extends Fluid { Direction enumdirection = (Direction) iterator.next(); BlockPos blockposition1 = pos.relative(enumdirection); short short0 = FlowingFluid.getCacheKey(pos, blockposition1); diff --git a/patches/server/0260-Hook-into-CB-plugin-rewrites.patch b/patches/server/0263-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/0260-Hook-into-CB-plugin-rewrites.patch rename to patches/server/0263-Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/0261-PreSpawnerSpawnEvent.patch b/patches/server/0264-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0261-PreSpawnerSpawnEvent.patch rename to patches/server/0264-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0262-Add-LivingEntity-getTargetEntity.patch b/patches/server/0265-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/0262-Add-LivingEntity-getTargetEntity.patch rename to patches/server/0265-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/0263-Add-sun-related-API.patch b/patches/server/0266-Add-sun-related-API.patch similarity index 100% rename from patches/server/0263-Add-sun-related-API.patch rename to patches/server/0266-Add-sun-related-API.patch diff --git a/patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 95% rename from patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch index 2d0f21e58d..240ae61f5b 100644 --- a/patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch +++ b/patches/server/0267-Catch-JsonParseException-in-Entity-and-TE-names.patch @@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly No more crashing though. diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java -index 9ee4dc54039cbe6b8c9bd3018044c73f923a736e..6efb8b10f17c70b05128039376d254e6beda3841 100644 +index 4d7604a63fb996f869b5d853738cab37fc22cb15..c856a9a0d085b278da416c59996fc131811f790c 100644 --- a/src/main/java/io/papermc/paper/util/MCUtil.java +++ b/src/main/java/io/papermc/paper/util/MCUtil.java @@ -15,6 +15,8 @@ import it.unimi.dsi.fastutil.objects.ReferenceArrayList; @@ -48,7 +48,7 @@ index 9ee4dc54039cbe6b8c9bd3018044c73f923a736e..6efb8b10f17c70b05128039376d254e6 return chunk.getChunkHolderStatus(); } diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java -index a0728e95251e8110bcecd00512c7a266fe120794..7dac559fd35e7ba646b84bb28315001375723643 100644 +index 7f1efe0d9bc059a86166e8e3c5ef4ad23217f6a7..9c7b7434ccd64668eb5d7bb61d03a9cb4105ea6e 100644 --- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java +++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java @@ -72,7 +72,7 @@ public abstract class BaseCommandBlock implements CommandSource { @@ -87,7 +87,7 @@ index e85022b31f2bc2783e88f5ba4c5173ac8a096c96..f1acd19432877a833f0d4339f9de4830 } diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index 05d98a0f34ffd50449fbafcf23fe7d05ca721317..34ec79a4298bff5ef6d751dc06b6439d0fa2e077 100644 +index 8b79df496e1fad57e8c5c0aa97d0d84ab0deed1e..154e4652a93b50e9b26c93531a4e854601ed75e1 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java @@ -367,7 +367,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name diff --git a/patches/server/0264-Turtle-API.patch b/patches/server/0268-Turtle-API.patch similarity index 100% rename from patches/server/0264-Turtle-API.patch rename to patches/server/0268-Turtle-API.patch diff --git a/patches/server/0265-Call-player-spectator-target-events-and-improve-impl.patch b/patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/0265-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/server/0269-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/0266-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0266-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/server/0270-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0267-Add-more-Witch-API.patch b/patches/server/0271-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0267-Add-more-Witch-API.patch rename to patches/server/0271-Add-more-Witch-API.patch diff --git a/patches/server/0268-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0268-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/server/0272-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0269-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0269-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/server/0273-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0270-Reset-players-airTicks-on-respawn.patch b/patches/server/0274-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0270-Reset-players-airTicks-on-respawn.patch rename to patches/server/0274-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0271-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0271-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/server/0275-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0272-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/0272-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/server/0276-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/0273-Optimize-World-Time-Updates.patch b/patches/server/0277-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0273-Optimize-World-Time-Updates.patch rename to patches/server/0277-Optimize-World-Time-Updates.patch diff --git a/patches/server/0274-Restore-custom-InventoryHolder-support.patch b/patches/server/0278-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0274-Restore-custom-InventoryHolder-support.patch rename to patches/server/0278-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0275-Use-Vanilla-Minecart-Speeds.patch b/patches/server/0279-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/0275-Use-Vanilla-Minecart-Speeds.patch rename to patches/server/0279-Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/0276-Fix-SpongeAbsortEvent-handling.patch b/patches/server/0280-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0276-Fix-SpongeAbsortEvent-handling.patch rename to patches/server/0280-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0277-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/server/0277-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/server/0281-Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/server/0278-Make-the-default-permission-message-configurable.patch b/patches/server/0282-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/0278-Make-the-default-permission-message-configurable.patch rename to patches/server/0282-Make-the-default-permission-message-configurable.patch diff --git a/patches/server/0279-Prevent-rayTrace-from-loading-chunks.patch b/patches/server/0283-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0279-Prevent-rayTrace-from-loading-chunks.patch rename to patches/server/0283-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0280-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0284-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0280-Handle-Large-Packets-disconnecting-client.patch rename to patches/server/0284-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0281-force-entity-dismount-during-teleportation.patch b/patches/server/0285-force-entity-dismount-during-teleportation.patch similarity index 100% rename from patches/server/0281-force-entity-dismount-during-teleportation.patch rename to patches/server/0285-force-entity-dismount-during-teleportation.patch diff --git a/patches/server/0282-Add-more-Zombie-API.patch b/patches/server/0286-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0282-Add-more-Zombie-API.patch rename to patches/server/0286-Add-more-Zombie-API.patch diff --git a/patches/server/0283-Book-Size-Limits.patch b/patches/server/0287-Book-Size-Limits.patch similarity index 100% rename from patches/server/0283-Book-Size-Limits.patch rename to patches/server/0287-Book-Size-Limits.patch diff --git a/patches/server/0284-Add-PlayerConnectionCloseEvent.patch b/patches/server/0288-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0284-Add-PlayerConnectionCloseEvent.patch rename to patches/server/0288-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0285-Prevent-Enderman-from-loading-chunks.patch b/patches/server/0289-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/0285-Prevent-Enderman-from-loading-chunks.patch rename to patches/server/0289-Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/0286-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/server/0286-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/server/0290-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/server/0287-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from patches/server/0287-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/server/0291-Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/patches/server/0288-Block-Entity-remove-from-being-called-on-Players.patch b/patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch similarity index 100% rename from patches/server/0288-Block-Entity-remove-from-being-called-on-Players.patch rename to patches/server/0292-Block-Entity-remove-from-being-called-on-Players.patch diff --git a/patches/server/0289-BlockDestroyEvent.patch b/patches/server/0293-BlockDestroyEvent.patch similarity index 100% rename from patches/server/0289-BlockDestroyEvent.patch rename to patches/server/0293-BlockDestroyEvent.patch diff --git a/patches/server/0290-Async-command-map-building.patch b/patches/server/0294-Async-command-map-building.patch similarity index 100% rename from patches/server/0290-Async-command-map-building.patch rename to patches/server/0294-Async-command-map-building.patch diff --git a/patches/server/0291-Implement-Brigadier-Mojang-API.patch b/patches/server/0295-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/0291-Implement-Brigadier-Mojang-API.patch rename to patches/server/0295-Implement-Brigadier-Mojang-API.patch diff --git a/patches/server/0292-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/server/0296-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from patches/server/0292-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to patches/server/0296-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/patches/server/0293-Limit-Client-Sign-length-more.patch b/patches/server/0297-Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/server/0293-Limit-Client-Sign-length-more.patch rename to patches/server/0297-Limit-Client-Sign-length-more.patch diff --git a/patches/server/0294-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0294-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/server/0298-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0295-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0295-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/server/0299-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0296-Entity-getEntitySpawnReason.patch b/patches/server/0300-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/server/0296-Entity-getEntitySpawnReason.patch rename to patches/server/0300-Entity-getEntitySpawnReason.patch diff --git a/patches/server/0297-Fire-event-on-GS4-query.patch b/patches/server/0301-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0297-Fire-event-on-GS4-query.patch rename to patches/server/0301-Fire-event-on-GS4-query.patch diff --git a/patches/server/0298-Implement-PlayerPostRespawnEvent.patch b/patches/server/0302-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0298-Implement-PlayerPostRespawnEvent.patch rename to patches/server/0302-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0299-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0299-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/server/0303-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0300-Server-Tick-Events.patch b/patches/server/0304-Server-Tick-Events.patch similarity index 100% rename from patches/server/0300-Server-Tick-Events.patch rename to patches/server/0304-Server-Tick-Events.patch diff --git a/patches/server/0301-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0301-PlayerDeathEvent-getItemsToKeep.patch rename to patches/server/0305-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0302-Optimize-Captured-TileEntity-Lookup.patch b/patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0302-Optimize-Captured-TileEntity-Lookup.patch rename to patches/server/0306-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0303-Add-Heightmap-API.patch b/patches/server/0307-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0303-Add-Heightmap-API.patch rename to patches/server/0307-Add-Heightmap-API.patch diff --git a/patches/server/0304-Mob-Spawner-API-Enhancements.patch b/patches/server/0308-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0304-Mob-Spawner-API-Enhancements.patch rename to patches/server/0308-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0305-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/0305-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/server/0309-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/0306-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0306-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/server/0310-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0307-Implement-CraftBlockSoundGroup.patch b/patches/server/0311-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0307-Implement-CraftBlockSoundGroup.patch rename to patches/server/0311-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0308-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from patches/server/0308-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/patches/server/0309-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch similarity index 97% rename from patches/server/0309-Allow-Saving-of-Oversized-Chunks.patch rename to patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch index f065c57c10..8ff40f8023 100644 --- a/patches/server/0309-Allow-Saving-of-Oversized-Chunks.patch +++ b/patches/server/0313-Allow-Saving-of-Oversized-Chunks.patch @@ -33,7 +33,7 @@ this fix, as the data will remain in the oversized file. Once the server returns to a jar with this fix, the data will be restored. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index aa8972fd1a1fade05d60ab69efb8ff24f344508a..536cc15272ecea456bcdc21bd31c824cbe4315ad 100644 +index ddcc212ba83d9365adb842b3d3ced64e3d7dd155..584985272a02eb5b61a22cf2404fbd97a55a3358 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -18,8 +18,12 @@ import java.nio.file.LinkOption; @@ -142,7 +142,7 @@ index aa8972fd1a1fade05d60ab69efb8ff24f344508a..536cc15272ecea456bcdc21bd31c824c private final ChunkPos pos; diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 8bff53217d087a9d53aa3738660dde563ee125f1..3ae4dbfbfba13b4bd0379e71b35f077316aabcb9 100644 +index 4c1b1ac36ef09a9cc8da6e8ee71f82d4a67478df..96f129cb13642dc9667464b58c025fa0ed700cfd 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java @@ -11,8 +11,10 @@ import java.nio.file.Path; @@ -241,7 +241,7 @@ index 8bff53217d087a9d53aa3738660dde563ee125f1..3ae4dbfbfba13b4bd0379e71b35f0773 CompoundTag nbttagcompound; label43: { -@@ -216,6 +289,7 @@ public class RegionFileStorage implements AutoCloseable { +@@ -217,6 +290,7 @@ public class RegionFileStorage implements AutoCloseable { try { NbtIo.write(nbt, (DataOutput) dataoutputstream); diff --git a/patches/server/0310-Expose-the-internal-current-tick.patch b/patches/server/0314-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0310-Expose-the-internal-current-tick.patch rename to patches/server/0314-Expose-the-internal-current-tick.patch diff --git a/patches/server/0311-Fix-World-isChunkGenerated-calls.patch b/patches/server/0315-Fix-World-isChunkGenerated-calls.patch similarity index 97% rename from patches/server/0311-Fix-World-isChunkGenerated-calls.patch rename to patches/server/0315-Fix-World-isChunkGenerated-calls.patch index 18bb095492..6569fb2d7d 100644 --- a/patches/server/0311-Fix-World-isChunkGenerated-calls.patch +++ b/patches/server/0315-Fix-World-isChunkGenerated-calls.patch @@ -93,7 +93,7 @@ index 7495bd988a48cbb977ebac25854547aeb0c204e3..8d22f785c32eea3a8ea2b33ddc0ccf29 // Spigot start return this.anyPlayerCloseEnoughForSpawning(pos, false); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index 536cc15272ecea456bcdc21bd31c824cbe4315ad..eee5dfa165203463cb791e33530944c6b09e7eb7 100644 +index 584985272a02eb5b61a22cf2404fbd97a55a3358..cda87a66fe80bf910f629c64e36c1fecbad81d77 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -51,6 +51,30 @@ public class RegionFile implements AutoCloseable { @@ -144,10 +144,10 @@ index 536cc15272ecea456bcdc21bd31c824cbe4315ad..eee5dfa165203463cb791e33530944c6 this.padToFullSector(); } finally { diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 3ae4dbfbfba13b4bd0379e71b35f077316aabcb9..2a6738bdbd235cb93af54fe074095ad5c9f9a284 100644 +index 96f129cb13642dc9667464b58c025fa0ed700cfd..29da08c58200c24fd03003937d30eb41234cabc9 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -@@ -289,6 +289,7 @@ public class RegionFileStorage implements AutoCloseable { +@@ -290,6 +290,7 @@ public class RegionFileStorage implements AutoCloseable { try { NbtIo.write(nbt, (DataOutput) dataoutputstream); diff --git a/patches/server/0312-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0312-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/server/0316-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0313-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0313-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/server/0317-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0314-Configurable-projectile-relative-velocity.patch b/patches/server/0318-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0314-Configurable-projectile-relative-velocity.patch rename to patches/server/0318-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0315-offset-item-frame-ticking.patch b/patches/server/0319-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0315-offset-item-frame-ticking.patch rename to patches/server/0319-offset-item-frame-ticking.patch diff --git a/patches/server/0316-Fix-MC-158900.patch b/patches/server/0320-Fix-MC-158900.patch similarity index 100% rename from patches/server/0316-Fix-MC-158900.patch rename to patches/server/0320-Fix-MC-158900.patch diff --git a/patches/server/0317-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0317-Prevent-consuming-the-wrong-itemstack.patch rename to patches/server/0321-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0318-Dont-send-unnecessary-sign-update.patch b/patches/server/0322-Dont-send-unnecessary-sign-update.patch similarity index 92% rename from patches/server/0318-Dont-send-unnecessary-sign-update.patch rename to patches/server/0322-Dont-send-unnecessary-sign-update.patch index b5b27d8cc7..9102420b62 100644 --- a/patches/server/0318-Dont-send-unnecessary-sign-update.patch +++ b/patches/server/0322-Dont-send-unnecessary-sign-update.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dont send unnecessary sign update diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index 584feb744bd2aa34f788de17d43c16a04c33a2c6..41c863a104d53b6c6feb4576d5b62cead229efec 100644 +index 13705a9e42c6ffc0e403de5fb56232845169d198..eeacbf1e1fe206256944675667d0ea61c2fbe494 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java @@ -185,6 +185,7 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C diff --git a/patches/server/0319-Add-option-to-disable-pillager-patrols.patch b/patches/server/0323-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0319-Add-option-to-disable-pillager-patrols.patch rename to patches/server/0323-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0320-Flat-bedrock-generator-settings.patch b/patches/server/0324-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0320-Flat-bedrock-generator-settings.patch rename to patches/server/0324-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0321-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0321-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/server/0325-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0322-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0322-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/server/0326-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0323-Duplicate-UUID-Resolve-Option.patch b/patches/server/0327-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0323-Duplicate-UUID-Resolve-Option.patch rename to patches/server/0327-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0324-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0324-PlayerDeathEvent-shouldDropExperience.patch rename to patches/server/0328-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0325-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0325-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/server/0329-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0326-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0326-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/server/0330-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0327-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/server/0327-Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/server/0331-Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/server/0328-Fix-items-not-falling-correctly.patch b/patches/server/0332-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0328-Fix-items-not-falling-correctly.patch rename to patches/server/0332-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0329-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0329-Optimize-call-to-getFluid-for-explosions.patch rename to patches/server/0333-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0330-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0330-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/server/0334-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0331-Entity-Activation-Range-2.0.patch b/patches/server/0335-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0331-Entity-Activation-Range-2.0.patch rename to patches/server/0335-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0332-Implement-alternative-item-despawn-rate.patch b/patches/server/0336-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0332-Implement-alternative-item-despawn-rate.patch rename to patches/server/0336-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0333-Tracking-Range-Improvements.patch b/patches/server/0337-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0333-Tracking-Range-Improvements.patch rename to patches/server/0337-Tracking-Range-Improvements.patch diff --git a/patches/server/0334-Fix-items-vanishing-through-end-portal.patch b/patches/server/0338-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0334-Fix-items-vanishing-through-end-portal.patch rename to patches/server/0338-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0335-implement-optional-per-player-mob-spawns.patch b/patches/server/0339-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0335-implement-optional-per-player-mob-spawns.patch rename to patches/server/0339-implement-optional-per-player-mob-spawns.patch diff --git a/patches/server/0336-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0336-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/server/0340-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0337-Improve-Block-breakNaturally-API.patch b/patches/server/0341-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0337-Improve-Block-breakNaturally-API.patch rename to patches/server/0341-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0338-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0338-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/server/0342-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0339-Add-debug-for-sync-chunk-loads.patch b/patches/server/0343-Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/0339-Add-debug-for-sync-chunk-loads.patch rename to patches/server/0343-Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/0340-Remove-garbage-Java-version-check.patch b/patches/server/0344-Remove-garbage-Java-version-check.patch similarity index 100% rename from patches/server/0340-Remove-garbage-Java-version-check.patch rename to patches/server/0344-Remove-garbage-Java-version-check.patch diff --git a/patches/server/0341-Add-ThrownEggHatchEvent.patch b/patches/server/0345-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0341-Add-ThrownEggHatchEvent.patch rename to patches/server/0345-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0342-Entity-Jump-API.patch b/patches/server/0346-Entity-Jump-API.patch similarity index 100% rename from patches/server/0342-Entity-Jump-API.patch rename to patches/server/0346-Entity-Jump-API.patch diff --git a/patches/server/0343-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0347-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0343-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/server/0347-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0344-Make-the-GUI-graph-fancier.patch b/patches/server/0348-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0344-Make-the-GUI-graph-fancier.patch rename to patches/server/0348-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0345-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0349-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0345-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/server/0349-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0346-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0350-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0346-Validate-tripwire-hook-placement-before-update.patch rename to patches/server/0350-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0347-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0347-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/server/0351-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0348-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0352-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0348-Configurable-chance-of-villager-zombie-infection.patch rename to patches/server/0352-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0349-Optimise-Chunk-getFluid.patch b/patches/server/0353-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0349-Optimise-Chunk-getFluid.patch rename to patches/server/0353-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0350-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0354-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0350-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0354-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0351-Add-tick-times-API-and-mspt-command.patch b/patches/server/0355-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0351-Add-tick-times-API-and-mspt-command.patch rename to patches/server/0355-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0352-Expose-MinecraftServer-isRunning.patch b/patches/server/0356-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0352-Expose-MinecraftServer-isRunning.patch rename to patches/server/0356-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0353-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0357-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0353-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/server/0357-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0354-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0358-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/0354-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/server/0358-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/0355-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0355-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0356-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0356-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/server/0360-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0357-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0357-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0358-Don-t-tick-dead-players.patch b/patches/server/0362-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0358-Don-t-tick-dead-players.patch rename to patches/server/0362-Don-t-tick-dead-players.patch diff --git a/patches/server/0359-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0363-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0359-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/server/0363-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0360-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0364-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0360-Optimize-Collision-to-not-load-chunks.patch rename to patches/server/0364-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0361-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0365-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0361-Don-t-move-existing-players-to-world-spawn.patch rename to patches/server/0365-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0362-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0362-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0363-Improved-Watchdog-Support.patch b/patches/server/0367-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0363-Improved-Watchdog-Support.patch rename to patches/server/0367-Improved-Watchdog-Support.patch diff --git a/patches/server/0364-Optimize-Pathfinding.patch b/patches/server/0368-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0364-Optimize-Pathfinding.patch rename to patches/server/0368-Optimize-Pathfinding.patch diff --git a/patches/server/0365-Reduce-Either-Optional-allocation.patch b/patches/server/0369-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0365-Reduce-Either-Optional-allocation.patch rename to patches/server/0369-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0366-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0366-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0367-Prevent-opening-inventories-when-frozen.patch b/patches/server/0371-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0367-Prevent-opening-inventories-when-frozen.patch rename to patches/server/0371-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0368-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0372-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0368-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/server/0372-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0369-Implement-Player-Client-Options-API.patch b/patches/server/0373-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0369-Implement-Player-Client-Options-API.patch rename to patches/server/0373-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0370-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0370-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/server/0374-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0371-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0371-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0372-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0372-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/server/0376-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0373-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0377-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0373-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/server/0377-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0374-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0378-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0374-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/server/0378-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0375-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0379-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0375-Add-phantom-creative-and-insomniac-controls.patch rename to patches/server/0379-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0376-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/server/0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/0376-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/server/0380-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/0377-Villager-Restocks-API.patch b/patches/server/0381-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0377-Villager-Restocks-API.patch rename to patches/server/0381-Villager-Restocks-API.patch diff --git a/patches/server/0378-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0382-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0378-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/server/0382-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0379-Expose-game-version.patch b/patches/server/0383-Expose-game-version.patch similarity index 100% rename from patches/server/0379-Expose-game-version.patch rename to patches/server/0383-Expose-game-version.patch diff --git a/patches/server/0380-Optimize-Voxel-Shape-Merging.patch b/patches/server/0384-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0380-Optimize-Voxel-Shape-Merging.patch rename to patches/server/0384-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0381-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0385-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0381-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/server/0385-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0382-misc-debugging-dumps.patch b/patches/server/0386-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0382-misc-debugging-dumps.patch rename to patches/server/0386-misc-debugging-dumps.patch diff --git a/patches/server/0383-Prevent-teleporting-dead-entities.patch b/patches/server/0387-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0383-Prevent-teleporting-dead-entities.patch rename to patches/server/0387-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0384-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0384-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0385-Implement-Mob-Goal-API.patch b/patches/server/0389-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0385-Implement-Mob-Goal-API.patch rename to patches/server/0389-Implement-Mob-Goal-API.patch diff --git a/patches/server/0386-Add-villager-reputation-API.patch b/patches/server/0390-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0386-Add-villager-reputation-API.patch rename to patches/server/0390-Add-villager-reputation-API.patch diff --git a/patches/server/0387-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/server/0391-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0387-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/server/0391-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0388-ExperienceOrbMergeEvent.patch b/patches/server/0392-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0388-ExperienceOrbMergeEvent.patch rename to patches/server/0392-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0389-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0393-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0389-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/server/0393-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0390-Optimize-brigadier-child-sorting-performance.patch b/patches/server/0394-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0390-Optimize-brigadier-child-sorting-performance.patch rename to patches/server/0394-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0391-Potential-bed-API.patch b/patches/server/0395-Potential-bed-API.patch similarity index 100% rename from patches/server/0391-Potential-bed-API.patch rename to patches/server/0395-Potential-bed-API.patch diff --git a/patches/server/0392-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0396-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0392-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/server/0396-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0393-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0397-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0393-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/server/0397-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0394-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0398-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0394-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/server/0398-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0395-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0399-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0395-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/server/0399-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0396-Ensure-safe-gateway-teleport.patch b/patches/server/0400-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0396-Ensure-safe-gateway-teleport.patch rename to patches/server/0400-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0397-Add-option-for-console-having-all-permissions.patch b/patches/server/0401-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0397-Add-option-for-console-having-all-permissions.patch rename to patches/server/0401-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0398-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0402-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0398-Fix-villager-trading-demand-MC-163962.patch rename to patches/server/0402-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0399-Maps-shouldn-t-load-chunks.patch b/patches/server/0403-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0399-Maps-shouldn-t-load-chunks.patch rename to patches/server/0403-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0400-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0404-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0400-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/server/0404-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0401-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0405-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0401-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0405-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0402-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0406-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0402-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0406-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0403-Fix-sand-duping.patch b/patches/server/0407-Fix-sand-duping.patch similarity index 100% rename from patches/server/0403-Fix-sand-duping.patch rename to patches/server/0407-Fix-sand-duping.patch diff --git a/patches/server/0404-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0408-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0404-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0408-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0405-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0409-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0405-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0409-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0406-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0410-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0406-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0410-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0407-Improve-Arrow-API.patch b/patches/server/0411-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0407-Improve-Arrow-API.patch rename to patches/server/0411-Improve-Arrow-API.patch diff --git a/patches/server/0408-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0408-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0412-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0409-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0413-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0409-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0413-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0410-Add-permission-for-command-blocks.patch b/patches/server/0414-Add-permission-for-command-blocks.patch similarity index 98% rename from patches/server/0410-Add-permission-for-command-blocks.patch rename to patches/server/0414-Add-permission-for-command-blocks.patch index 81ba958f22..2a93416429 100644 --- a/patches/server/0410-Add-permission-for-command-blocks.patch +++ b/patches/server/0414-Add-permission-for-command-blocks.patch @@ -40,7 +40,7 @@ index 0f97634df91a52ac30f12f1344979d70ea28b2a0..713ffd4e415e796420a60a616ebdda56 } else { BaseCommandBlock commandblocklistenerabstract = packet.getCommandBlock(this.player.level()); diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java -index 7f1efe0d9bc059a86166e8e3c5ef4ad23217f6a7..c138678fe82e6c1dd7ce634f90bcbfcad6159276 100644 +index 9c7b7434ccd64668eb5d7bb61d03a9cb4105ea6e..e05eb08a9c229b371887676da510df948b896a85 100644 --- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java +++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java @@ -198,7 +198,7 @@ public abstract class BaseCommandBlock implements CommandSource { diff --git a/patches/server/0411-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0415-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0411-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0415-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0412-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0412-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0416-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0413-Paper-dumpitem-command.patch b/patches/server/0417-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0413-Paper-dumpitem-command.patch rename to patches/server/0417-Paper-dumpitem-command.patch diff --git a/patches/server/0414-Improve-Legacy-Component-serialization-size.patch b/patches/server/0418-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0414-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0418-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0415-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0419-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0415-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0419-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0416-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0416-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0420-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0417-incremental-chunk-and-player-saving.patch b/patches/server/0421-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0417-incremental-chunk-and-player-saving.patch rename to patches/server/0421-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0418-Support-old-UUID-format-for-NBT.patch b/patches/server/0422-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0418-Support-old-UUID-format-for-NBT.patch rename to patches/server/0422-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0419-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0423-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0419-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0423-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0420-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0420-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0424-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0421-Remove-some-streams-from-structures.patch b/patches/server/0425-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0421-Remove-some-streams-from-structures.patch rename to patches/server/0425-Remove-some-streams-from-structures.patch diff --git a/patches/server/0422-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0426-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0422-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0426-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0423-Support-components-in-ItemMeta.patch b/patches/server/0427-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0423-Support-components-in-ItemMeta.patch rename to patches/server/0427-Support-components-in-ItemMeta.patch diff --git a/patches/server/0424-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0428-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0424-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/server/0428-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0425-Add-entity-liquid-API.patch b/patches/server/0429-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0425-Add-entity-liquid-API.patch rename to patches/server/0429-Add-entity-liquid-API.patch diff --git a/patches/server/0426-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0430-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0426-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0430-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0427-Spawn-player-in-correct-world-on-login.patch b/patches/server/0431-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0427-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0431-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0428-Add-PrepareResultEvent.patch b/patches/server/0432-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0428-Add-PrepareResultEvent.patch rename to patches/server/0432-Add-PrepareResultEvent.patch diff --git a/patches/server/0429-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0429-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0433-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0430-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0434-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0430-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0434-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0431-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0431-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0435-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0432-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0432-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0436-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0433-Fix-SPIGOT-5989.patch b/patches/server/0437-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0433-Fix-SPIGOT-5989.patch rename to patches/server/0437-Fix-SPIGOT-5989.patch diff --git a/patches/server/0434-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0434-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0438-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0435-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0435-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0439-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0436-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0436-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0440-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0437-Fix-some-rails-connecting-improperly.patch b/patches/server/0441-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0437-Fix-some-rails-connecting-improperly.patch rename to patches/server/0441-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0438-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0438-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0442-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0439-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0443-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0439-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0443-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0440-Brand-support.patch b/patches/server/0444-Brand-support.patch similarity index 100% rename from patches/server/0440-Brand-support.patch rename to patches/server/0444-Brand-support.patch diff --git a/patches/server/0441-Add-setMaxPlayers-API.patch b/patches/server/0445-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0441-Add-setMaxPlayers-API.patch rename to patches/server/0445-Add-setMaxPlayers-API.patch diff --git a/patches/server/0442-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0442-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0446-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0443-Don-t-require-FACING-data.patch b/patches/server/0447-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0443-Don-t-require-FACING-data.patch rename to patches/server/0447-Don-t-require-FACING-data.patch diff --git a/patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0444-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0448-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0445-Add-moon-phase-API.patch b/patches/server/0449-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0445-Add-moon-phase-API.patch rename to patches/server/0449-Add-moon-phase-API.patch diff --git a/patches/server/0446-Prevent-headless-pistons-from-being-created.patch b/patches/server/0450-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0446-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0450-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0447-Add-BellRingEvent.patch b/patches/server/0451-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0447-Add-BellRingEvent.patch rename to patches/server/0451-Add-BellRingEvent.patch diff --git a/patches/server/0448-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0452-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0448-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0452-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0449-Buffer-joins-to-world.patch b/patches/server/0453-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0449-Buffer-joins-to-world.patch rename to patches/server/0453-Buffer-joins-to-world.patch diff --git a/patches/server/0450-Eigencraft-redstone-implementation.patch b/patches/server/0454-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0450-Eigencraft-redstone-implementation.patch rename to patches/server/0454-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0451-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0451-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0455-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0452-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0452-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0456-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0453-Fix-CraftTeam-null-check.patch b/patches/server/0457-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0453-Fix-CraftTeam-null-check.patch rename to patches/server/0457-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0454-Add-more-Evoker-API.patch b/patches/server/0458-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0454-Add-more-Evoker-API.patch rename to patches/server/0458-Add-more-Evoker-API.patch diff --git a/patches/server/0455-Add-methods-to-get-translation-keys.patch b/patches/server/0459-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0455-Add-methods-to-get-translation-keys.patch rename to patches/server/0459-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0456-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0456-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0460-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0457-Cache-block-data-strings.patch b/patches/server/0461-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0457-Cache-block-data-strings.patch rename to patches/server/0461-Cache-block-data-strings.patch diff --git a/patches/server/0458-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0458-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0462-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0459-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0459-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0463-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0460-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0460-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0464-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0461-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0461-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0465-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0462-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0462-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0466-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0463-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0463-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0467-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0464-Entity-isTicking.patch b/patches/server/0468-Entity-isTicking.patch similarity index 100% rename from patches/server/0464-Entity-isTicking.patch rename to patches/server/0468-Entity-isTicking.patch diff --git a/patches/server/0465-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0465-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0469-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0466-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0466-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0470-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0467-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0467-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0471-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0468-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0468-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0472-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0469-Optimise-getType-calls.patch b/patches/server/0473-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0469-Optimise-getType-calls.patch rename to patches/server/0473-Optimise-getType-calls.patch diff --git a/patches/server/0470-Villager-resetOffers.patch b/patches/server/0474-Villager-resetOffers.patch similarity index 100% rename from patches/server/0470-Villager-resetOffers.patch rename to patches/server/0474-Villager-resetOffers.patch diff --git a/patches/server/0471-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0471-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0475-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0472-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0472-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0476-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0473-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0477-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0473-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0477-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0474-Player-elytra-boost-API.patch b/patches/server/0478-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0474-Player-elytra-boost-API.patch rename to patches/server/0478-Player-elytra-boost-API.patch diff --git a/patches/server/0475-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0479-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0475-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0479-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0476-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0476-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0480-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0477-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0481-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0477-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0481-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0478-Add-ignore-discounts-API.patch b/patches/server/0482-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0478-Add-ignore-discounts-API.patch rename to patches/server/0482-Add-ignore-discounts-API.patch diff --git a/patches/server/0479-Toggle-for-removing-existing-dragon.patch b/patches/server/0483-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0479-Toggle-for-removing-existing-dragon.patch rename to patches/server/0483-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0480-Fix-client-lag-on-advancement-loading.patch b/patches/server/0484-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0480-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0484-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0481-Item-no-age-no-player-pickup.patch b/patches/server/0485-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0481-Item-no-age-no-player-pickup.patch rename to patches/server/0485-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0482-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0482-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0486-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0483-Beacon-API-custom-effect-ranges.patch b/patches/server/0487-Beacon-API-custom-effect-ranges.patch similarity index 98% rename from patches/server/0483-Beacon-API-custom-effect-ranges.patch rename to patches/server/0487-Beacon-API-custom-effect-ranges.patch index 0e4a27bee0..acea4bac73 100644 --- a/patches/server/0483-Beacon-API-custom-effect-ranges.patch +++ b/patches/server/0487-Beacon-API-custom-effect-ranges.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Beacon API - custom effect ranges diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index 8b79df496e1fad57e8c5c0aa97d0d84ab0deed1e..c9b0b0c3fd615bda5f6e633ec33a20751a25d8d9 100644 +index 154e4652a93b50e9b26c93531a4e854601ed75e1..f3fb7e07ca65cb1c948b110b7f7edc8b0bd83b21 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java @@ -78,6 +78,26 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name diff --git a/patches/server/0484-Add-API-for-quit-reason.patch b/patches/server/0488-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0484-Add-API-for-quit-reason.patch rename to patches/server/0488-Add-API-for-quit-reason.patch diff --git a/patches/server/0485-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0485-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0489-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0486-Expose-world-spawn-angle.patch b/patches/server/0490-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0486-Expose-world-spawn-angle.patch rename to patches/server/0490-Expose-world-spawn-angle.patch diff --git a/patches/server/0487-Add-Destroy-Speed-API.patch b/patches/server/0491-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0487-Add-Destroy-Speed-API.patch rename to patches/server/0491-Add-Destroy-Speed-API.patch diff --git a/patches/server/0488-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0488-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0492-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0489-Add-LivingEntity-clearActiveItem.patch b/patches/server/0493-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0489-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0493-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0490-Add-PlayerItemCooldownEvent.patch b/patches/server/0494-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0490-Add-PlayerItemCooldownEvent.patch rename to patches/server/0494-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0491-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0491-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0495-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0492-More-lightning-API.patch b/patches/server/0496-More-lightning-API.patch similarity index 100% rename from patches/server/0492-More-lightning-API.patch rename to patches/server/0496-More-lightning-API.patch diff --git a/patches/server/0493-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0493-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0497-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0494-Added-missing-default-perms-for-commands.patch b/patches/server/0498-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0494-Added-missing-default-perms-for-commands.patch rename to patches/server/0498-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0495-Add-PlayerShearBlockEvent.patch b/patches/server/0499-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0495-Add-PlayerShearBlockEvent.patch rename to patches/server/0499-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0496-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0496-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0500-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0497-Limit-recipe-packets.patch b/patches/server/0501-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0497-Limit-recipe-packets.patch rename to patches/server/0501-Limit-recipe-packets.patch diff --git a/patches/server/0498-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0502-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0498-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0502-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0499-Player-Chunk-Load-Unload-Events.patch b/patches/server/0503-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0499-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0503-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0500-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0500-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0504-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0501-Expose-LivingEntity-hurt-direction.patch b/patches/server/0505-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0501-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0505-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0502-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0502-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0506-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0503-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0503-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0507-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0504-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0504-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0508-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0505-Implement-TargetHitEvent.patch b/patches/server/0509-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0505-Implement-TargetHitEvent.patch rename to patches/server/0509-Implement-TargetHitEvent.patch diff --git a/patches/server/0506-MC-4-Fix-item-position-desync.patch b/patches/server/0510-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0506-MC-4-Fix-item-position-desync.patch rename to patches/server/0510-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0507-Additional-Block-Material-API-s.patch b/patches/server/0511-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0507-Additional-Block-Material-API-s.patch rename to patches/server/0511-Additional-Block-Material-API-s.patch diff --git a/patches/server/0508-Fix-harming-potion-dupe.patch b/patches/server/0512-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0508-Fix-harming-potion-dupe.patch rename to patches/server/0512-Fix-harming-potion-dupe.patch diff --git a/patches/server/0509-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0509-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0513-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0510-Cache-burn-durations.patch b/patches/server/0514-Cache-burn-durations.patch similarity index 100% rename from patches/server/0510-Cache-burn-durations.patch rename to patches/server/0514-Cache-burn-durations.patch diff --git a/patches/server/0511-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0511-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0515-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0512-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0512-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0516-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0513-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0513-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0517-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0514-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0518-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0514-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0518-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0515-Zombie-API-breaking-doors.patch b/patches/server/0519-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0515-Zombie-API-breaking-doors.patch rename to patches/server/0519-Zombie-API-breaking-doors.patch diff --git a/patches/server/0516-Fix-nerfed-slime-when-splitting.patch b/patches/server/0520-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0516-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0520-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0517-Add-EntityLoadCrossbowEvent.patch b/patches/server/0521-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0517-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0521-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0518-Added-WorldGameRuleChangeEvent.patch b/patches/server/0522-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0518-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0522-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0519-Added-ServerResourcesReloadedEvent.patch b/patches/server/0523-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0519-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0523-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0520-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0520-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0524-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0521-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0525-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0521-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0525-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0522-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0526-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0522-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0526-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0523-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0523-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0527-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0524-Configurable-door-breaking-difficulty.patch b/patches/server/0528-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0524-Configurable-door-breaking-difficulty.patch rename to patches/server/0528-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0525-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0529-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0525-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0529-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0526-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0530-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0526-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0530-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0527-Remove-stale-POIs.patch b/patches/server/0531-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0527-Remove-stale-POIs.patch rename to patches/server/0531-Remove-stale-POIs.patch diff --git a/patches/server/0528-Fix-villager-boat-exploit.patch b/patches/server/0532-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0528-Fix-villager-boat-exploit.patch rename to patches/server/0532-Fix-villager-boat-exploit.patch diff --git a/patches/server/0529-Add-sendOpLevel-API.patch b/patches/server/0533-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0529-Add-sendOpLevel-API.patch rename to patches/server/0533-Add-sendOpLevel-API.patch diff --git a/patches/server/0530-TODO-Registry-Modification-API.patch b/patches/server/0534-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0530-TODO-Registry-Modification-API.patch rename to patches/server/0534-TODO-Registry-Modification-API.patch diff --git a/patches/server/0531-Add-StructuresLocateEvent.patch b/patches/server/0535-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0531-Add-StructuresLocateEvent.patch rename to patches/server/0535-Add-StructuresLocateEvent.patch diff --git a/patches/server/0532-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0536-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0532-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0536-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0537-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0533-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0537-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0538-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0534-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0538-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0535-Make-schedule-command-per-world.patch b/patches/server/0539-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0535-Make-schedule-command-per-world.patch rename to patches/server/0539-Make-schedule-command-per-world.patch diff --git a/patches/server/0536-Configurable-max-leash-distance.patch b/patches/server/0540-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0536-Configurable-max-leash-distance.patch rename to patches/server/0540-Configurable-max-leash-distance.patch diff --git a/patches/server/0537-Implement-BlockPreDispenseEvent.patch b/patches/server/0541-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0537-Implement-BlockPreDispenseEvent.patch rename to patches/server/0541-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0542-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0538-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0542-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0543-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0539-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0543-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0544-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0540-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0544-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0545-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0541-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0545-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0542-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0546-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0542-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0546-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0543-add-DragonEggFormEvent.patch b/patches/server/0547-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0543-add-DragonEggFormEvent.patch rename to patches/server/0547-add-DragonEggFormEvent.patch diff --git a/patches/server/0544-EntityMoveEvent.patch b/patches/server/0548-EntityMoveEvent.patch similarity index 100% rename from patches/server/0544-EntityMoveEvent.patch rename to patches/server/0548-EntityMoveEvent.patch diff --git a/patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0549-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0545-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0549-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0546-Inline-shift-direction-fields.patch b/patches/server/0550-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0546-Inline-shift-direction-fields.patch rename to patches/server/0550-Inline-shift-direction-fields.patch diff --git a/patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0551-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0547-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0551-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0552-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0548-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0552-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0549-living-entity-allow-attribute-registration.patch b/patches/server/0553-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0549-living-entity-allow-attribute-registration.patch rename to patches/server/0553-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0550-fix-dead-slime-setSize-invincibility.patch b/patches/server/0554-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0550-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0554-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0555-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0551-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0555-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0552-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0556-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0552-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0556-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0553-Expose-Tracked-Players.patch b/patches/server/0557-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0553-Expose-Tracked-Players.patch rename to patches/server/0557-Expose-Tracked-Players.patch diff --git a/patches/server/0554-Remove-streams-from-SensorNearest.patch b/patches/server/0558-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0554-Remove-streams-from-SensorNearest.patch rename to patches/server/0558-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0555-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0559-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0555-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0559-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0556-Improve-ServerGUI.patch b/patches/server/0560-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0556-Improve-ServerGUI.patch rename to patches/server/0560-Improve-ServerGUI.patch diff --git a/patches/server/0557-fix-converting-txt-to-json-file.patch b/patches/server/0561-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0557-fix-converting-txt-to-json-file.patch rename to patches/server/0561-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0558-Add-worldborder-events.patch b/patches/server/0562-Add-worldborder-events.patch similarity index 100% rename from patches/server/0558-Add-worldborder-events.patch rename to patches/server/0562-Add-worldborder-events.patch diff --git a/patches/server/0559-added-PlayerNameEntityEvent.patch b/patches/server/0563-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0559-added-PlayerNameEntityEvent.patch rename to patches/server/0563-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0560-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0564-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0560-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0564-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0561-Add-recipe-to-cook-events.patch b/patches/server/0565-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0561-Add-recipe-to-cook-events.patch rename to patches/server/0565-Add-recipe-to-cook-events.patch diff --git a/patches/server/0562-Add-Block-isValidTool.patch b/patches/server/0566-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0562-Add-Block-isValidTool.patch rename to patches/server/0566-Add-Block-isValidTool.patch diff --git a/patches/server/0563-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0567-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0563-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0567-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0564-Expand-world-key-API.patch b/patches/server/0568-Expand-world-key-API.patch similarity index 100% rename from patches/server/0564-Expand-world-key-API.patch rename to patches/server/0568-Expand-world-key-API.patch diff --git a/patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0569-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0565-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0569-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0566-Item-Rarity-API.patch b/patches/server/0570-Item-Rarity-API.patch similarity index 100% rename from patches/server/0566-Item-Rarity-API.patch rename to patches/server/0570-Item-Rarity-API.patch diff --git a/patches/server/0567-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0571-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0567-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0571-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0568-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0572-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0569-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0573-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0569-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0573-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0570-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0574-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0571-Expose-protocol-version.patch b/patches/server/0575-Expose-protocol-version.patch similarity index 100% rename from patches/server/0571-Expose-protocol-version.patch rename to patches/server/0575-Expose-protocol-version.patch diff --git a/patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0572-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0576-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0573-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0577-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0574-Add-bypass-host-check.patch b/patches/server/0578-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0574-Add-bypass-host-check.patch rename to patches/server/0578-Add-bypass-host-check.patch diff --git a/patches/server/0575-Set-area-affect-cloud-rotation.patch b/patches/server/0579-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0575-Set-area-affect-cloud-rotation.patch rename to patches/server/0579-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0576-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0580-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0577-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0581-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0578-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0582-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0579-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0583-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0580-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0584-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0581-Added-PlayerDeepSleepEvent.patch b/patches/server/0585-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0581-Added-PlayerDeepSleepEvent.patch rename to patches/server/0585-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0582-More-World-API.patch b/patches/server/0586-More-World-API.patch similarity index 100% rename from patches/server/0582-More-World-API.patch rename to patches/server/0586-More-World-API.patch diff --git a/patches/server/0583-Added-PlayerBedFailEnterEvent.patch b/patches/server/0587-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0583-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0587-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0584-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0588-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0585-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0589-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0586-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0590-Introduce-beacon-activation-deactivation-events.patch similarity index 95% rename from patches/server/0586-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0590-Introduce-beacon-activation-deactivation-events.patch index 3f1d14dd0e..fc24c634c3 100644 --- a/patches/server/0586-Introduce-beacon-activation-deactivation-events.patch +++ b/patches/server/0590-Introduce-beacon-activation-deactivation-events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Introduce beacon activation/deactivation events diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index c9b0b0c3fd615bda5f6e633ec33a20751a25d8d9..da9e6b799923642e5ccb250affde386c6b3bd7f2 100644 +index f3fb7e07ca65cb1c948b110b7f7edc8b0bd83b21..147e808c7e2b3ed16861c989c1ba4a0b99a5be38 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java @@ -212,6 +212,15 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name diff --git a/patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0587-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0591-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0588-Add-Channel-initialization-listeners.patch b/patches/server/0592-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0588-Add-Channel-initialization-listeners.patch rename to patches/server/0592-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0589-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0593-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0590-Add-more-WanderingTrader-API.patch b/patches/server/0594-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0590-Add-more-WanderingTrader-API.patch rename to patches/server/0594-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0591-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0595-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0591-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0595-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0592-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0596-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0593-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0597-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0594-Inventory-close.patch b/patches/server/0598-Inventory-close.patch similarity index 100% rename from patches/server/0594-Inventory-close.patch rename to patches/server/0598-Inventory-close.patch diff --git a/patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0595-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0599-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0596-Fix-CraftPotionBrewer-cache.patch b/patches/server/0600-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0596-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0600-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0597-Add-basic-Datapack-API.patch b/patches/server/0601-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0597-Add-basic-Datapack-API.patch rename to patches/server/0601-Add-basic-Datapack-API.patch diff --git a/patches/server/0598-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0602-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0598-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0602-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0599-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0603-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0600-ItemStack-repair-check-API.patch b/patches/server/0604-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0600-ItemStack-repair-check-API.patch rename to patches/server/0604-ItemStack-repair-check-API.patch diff --git a/patches/server/0601-More-Enchantment-API.patch b/patches/server/0605-More-Enchantment-API.patch similarity index 100% rename from patches/server/0601-More-Enchantment-API.patch rename to patches/server/0605-More-Enchantment-API.patch diff --git a/patches/server/0602-Move-range-check-for-block-placing-up.patch b/patches/server/0606-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0602-Move-range-check-for-block-placing-up.patch rename to patches/server/0606-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0607-Fix-and-optimise-world-force-upgrading.patch similarity index 99% rename from patches/server/0603-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0607-Fix-and-optimise-world-force-upgrading.patch index f2ddf85a4d..04838a3a67 100644 --- a/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0607-Fix-and-optimise-world-force-upgrading.patch @@ -326,7 +326,7 @@ index 5ead2ca853983ee3d63c4c55f50d166707795af6..b953fa1bec2bd017b97a8a8b966fa790 return this.world; } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 2a6738bdbd235cb93af54fe074095ad5c9f9a284..c3d26756a716f151d3909ddfeacc47b28d05c498 100644 +index 29da08c58200c24fd03003937d30eb41234cabc9..d3d4d10a77af51cff4da201201bac325427fc20c 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java @@ -60,6 +60,31 @@ public class RegionFileStorage implements AutoCloseable { diff --git a/patches/server/0604-Add-Mob-lookAt-API.patch b/patches/server/0608-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0604-Add-Mob-lookAt-API.patch rename to patches/server/0608-Add-Mob-lookAt-API.patch diff --git a/patches/server/0605-Add-Unix-domain-socket-support.patch b/patches/server/0609-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0605-Add-Unix-domain-socket-support.patch rename to patches/server/0609-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0606-Add-EntityInsideBlockEvent.patch b/patches/server/0610-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0606-Add-EntityInsideBlockEvent.patch rename to patches/server/0610-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0607-Attributes-API-for-item-defaults.patch b/patches/server/0611-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0607-Attributes-API-for-item-defaults.patch rename to patches/server/0611-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0608-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0612-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0609-More-Lidded-Block-API.patch b/patches/server/0613-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0609-More-Lidded-Block-API.patch rename to patches/server/0613-More-Lidded-Block-API.patch diff --git a/patches/server/0610-Limit-item-frame-cursors-on-maps.patch b/patches/server/0614-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0610-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0614-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0611-Add-PlayerKickEvent-causes.patch b/patches/server/0615-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0611-Add-PlayerKickEvent-causes.patch rename to patches/server/0615-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0612-Add-PufferFishStateChangeEvent.patch b/patches/server/0616-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0612-Add-PufferFishStateChangeEvent.patch rename to patches/server/0616-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0613-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0617-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0614-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0618-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0615-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0619-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0616-Add-BellRevealRaiderEvent.patch b/patches/server/0620-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0616-Add-BellRevealRaiderEvent.patch rename to patches/server/0620-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0617-Fix-invulnerable-end-crystals.patch b/patches/server/0621-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0617-Fix-invulnerable-end-crystals.patch rename to patches/server/0621-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0618-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0622-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0618-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0622-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0619-Fix-dangerous-end-portal-logic.patch b/patches/server/0623-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0619-Fix-dangerous-end-portal-logic.patch rename to patches/server/0623-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0620-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0624-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0621-Make-item-validations-configurable.patch b/patches/server/0625-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0621-Make-item-validations-configurable.patch rename to patches/server/0625-Make-item-validations-configurable.patch diff --git a/patches/server/0622-Line-Of-Sight-Changes.patch b/patches/server/0626-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0622-Line-Of-Sight-Changes.patch rename to patches/server/0626-Line-Of-Sight-Changes.patch diff --git a/patches/server/0623-add-per-world-spawn-limits.patch b/patches/server/0627-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0623-add-per-world-spawn-limits.patch rename to patches/server/0627-add-per-world-spawn-limits.patch diff --git a/patches/server/0624-Fix-potions-splash-events.patch b/patches/server/0628-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0624-Fix-potions-splash-events.patch rename to patches/server/0628-Fix-potions-splash-events.patch diff --git a/patches/server/0625-Add-more-LimitedRegion-API.patch b/patches/server/0629-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0625-Add-more-LimitedRegion-API.patch rename to patches/server/0629-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0626-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0630-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0627-Missing-Entity-Behavior-API.patch b/patches/server/0631-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0627-Missing-Entity-Behavior-API.patch rename to patches/server/0631-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0628-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0632-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0629-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0633-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0630-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0634-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch similarity index 98% rename from patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch index 6cc0f2f2d3..aaacd2adba 100644 --- a/patches/server/0631-Fix-commands-from-signs-not-firing-command-events.patch +++ b/patches/server/0635-Fix-commands-from-signs-not-firing-command-events.patch @@ -58,7 +58,7 @@ index 0000000000000000000000000000000000000000..01a2bc1feec808790bb93618ce46adb9 + } +} diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java -index 41c863a104d53b6c6feb4576d5b62cead229efec..dab2adffbe5ac586b61371ea9234a1056fd36a51 100644 +index eeacbf1e1fe206256944675667d0ea61c2fbe494..63c0018ed6b9571b85419cbdae26e846815a3ce5 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java @@ -271,7 +271,17 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C diff --git a/patches/server/0632-Adds-PlayerArmSwingEvent.patch b/patches/server/0636-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0632-Adds-PlayerArmSwingEvent.patch rename to patches/server/0636-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0633-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0637-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0634-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0638-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0635-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0639-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0635-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0639-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0636-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0640-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0636-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0640-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0637-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0641-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0638-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0642-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0639-Stinger-API.patch b/patches/server/0643-Stinger-API.patch similarity index 100% rename from patches/server/0639-Stinger-API.patch rename to patches/server/0643-Stinger-API.patch diff --git a/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0644-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0641-Add-System.out-err-catcher.patch b/patches/server/0645-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0641-Add-System.out-err-catcher.patch rename to patches/server/0645-Add-System.out-err-catcher.patch diff --git a/patches/server/0642-Fix-test-not-bootstrapping.patch b/patches/server/0646-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0642-Fix-test-not-bootstrapping.patch rename to patches/server/0646-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0643-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0643-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0647-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0644-Improve-boat-collision-performance.patch b/patches/server/0648-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0644-Improve-boat-collision-performance.patch rename to patches/server/0648-Improve-boat-collision-performance.patch diff --git a/patches/server/0645-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0645-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0649-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0646-Add-PlayerSetSpawnEvent.patch b/patches/server/0650-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0646-Add-PlayerSetSpawnEvent.patch rename to patches/server/0650-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0647-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0648-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0652-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0648-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0652-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0649-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0653-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0649-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0653-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0650-Added-EntityDamageItemEvent.patch b/patches/server/0654-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0650-Added-EntityDamageItemEvent.patch rename to patches/server/0654-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0651-Optimize-indirect-passenger-iteration.patch b/patches/server/0655-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0651-Optimize-indirect-passenger-iteration.patch rename to patches/server/0655-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0652-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0653-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0657-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0653-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0657-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0654-Clear-bucket-NBT-after-dispense.patch b/patches/server/0658-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0654-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0658-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0655-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0656-Add-BlockBreakBlockEvent.patch b/patches/server/0660-Add-BlockBreakBlockEvent.patch similarity index 96% rename from patches/server/0656-Add-BlockBreakBlockEvent.patch rename to patches/server/0660-Add-BlockBreakBlockEvent.patch index 13ba205dea..83bda7fe59 100644 --- a/patches/server/0656-Add-BlockBreakBlockEvent.patch +++ b/patches/server/0660-Add-BlockBreakBlockEvent.patch @@ -46,10 +46,10 @@ index 9abae63e06c1dde9b8434d32bac8798808428d10..9b3d253c4224410719bf778a4688fce1 world.gameEvent(GameEvent.BLOCK_DESTROY, blockposition3, GameEvent.Context.of(iblockdata1)); if (!iblockdata1.is(BlockTags.FIRE)) { diff --git a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java -index fbf699e777d45db3dcf1606d34f509ca1a5bbb7a..37fcbca0c56b7707a0c9f5d3ae874aff7268f6fc 100644 +index c694b16be7c276fbf34aed2fd2aa6d6b79625561..5502ad143fd2575f1346334b5b4fe7846628f54e 100644 --- a/src/main/java/net/minecraft/world/level/material/FlowingFluid.java +++ b/src/main/java/net/minecraft/world/level/material/FlowingFluid.java -@@ -292,7 +292,7 @@ public abstract class FlowingFluid extends Fluid { +@@ -295,7 +295,7 @@ public abstract class FlowingFluid extends Fluid { ((LiquidBlockContainer) state.getBlock()).placeLiquid(world, pos, state, fluidState); } else { if (!state.isAir()) { @@ -58,7 +58,7 @@ index fbf699e777d45db3dcf1606d34f509ca1a5bbb7a..37fcbca0c56b7707a0c9f5d3ae874aff } world.setBlock(pos, fluidState.createLegacyBlock(), 3); -@@ -300,6 +300,7 @@ public abstract class FlowingFluid extends Fluid { +@@ -303,6 +303,7 @@ public abstract class FlowingFluid extends Fluid { } diff --git a/patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0657-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0658-More-CommandBlock-API.patch b/patches/server/0662-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0658-More-CommandBlock-API.patch rename to patches/server/0662-More-CommandBlock-API.patch diff --git a/patches/server/0659-Add-missing-team-sidebar-display-slots.patch b/patches/server/0663-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0659-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0663-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0660-Add-back-EntityPortalExitEvent.patch b/patches/server/0664-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0660-Add-back-EntityPortalExitEvent.patch rename to patches/server/0664-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0661-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0662-Get-entity-default-attributes.patch b/patches/server/0666-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0662-Get-entity-default-attributes.patch rename to patches/server/0666-Get-entity-default-attributes.patch diff --git a/patches/server/0663-Left-handed-API.patch b/patches/server/0667-Left-handed-API.patch similarity index 100% rename from patches/server/0663-Left-handed-API.patch rename to patches/server/0667-Left-handed-API.patch diff --git a/patches/server/0664-Add-more-advancement-API.patch b/patches/server/0668-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0664-Add-more-advancement-API.patch rename to patches/server/0668-Add-more-advancement-API.patch diff --git a/patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0665-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0666-Add-critical-damage-API.patch b/patches/server/0670-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0666-Add-critical-damage-API.patch rename to patches/server/0670-Add-critical-damage-API.patch diff --git a/patches/server/0667-Fix-issues-with-mob-conversion.patch b/patches/server/0671-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0667-Fix-issues-with-mob-conversion.patch rename to patches/server/0671-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0668-Add-isCollidable-methods-to-various-places.patch b/patches/server/0672-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0668-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0672-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0669-Goat-ram-API.patch b/patches/server/0673-Goat-ram-API.patch similarity index 100% rename from patches/server/0669-Goat-ram-API.patch rename to patches/server/0673-Goat-ram-API.patch diff --git a/patches/server/0670-Add-API-for-resetting-a-single-score.patch b/patches/server/0674-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0670-Add-API-for-resetting-a-single-score.patch rename to patches/server/0674-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0671-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0672-Vanilla-command-permission-fixes.patch b/patches/server/0676-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0672-Vanilla-command-permission-fixes.patch rename to patches/server/0676-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0673-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0674-Fix-GameProfileCache-concurrency.patch b/patches/server/0678-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0674-Fix-GameProfileCache-concurrency.patch rename to patches/server/0678-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0675-Improve-and-expand-AsyncCatcher.patch b/patches/server/0679-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0675-Improve-and-expand-AsyncCatcher.patch rename to patches/server/0679-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0677-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0681-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0677-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0681-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0678-Optimise-general-POI-access.patch b/patches/server/0682-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0678-Optimise-general-POI-access.patch rename to patches/server/0682-Optimise-general-POI-access.patch diff --git a/patches/server/0679-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0683-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/0679-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/server/0683-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/0680-Optimise-chunk-tick-iteration.patch b/patches/server/0684-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0680-Optimise-chunk-tick-iteration.patch rename to patches/server/0684-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0681-Execute-chunk-tasks-mid-tick.patch b/patches/server/0685-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0681-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0685-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0682-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 99% rename from patches/server/0682-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch index 23acdc59e2..dda57a5aaa 100644 --- a/patches/server/0682-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch +++ b/patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch @@ -87,7 +87,7 @@ index c8298a597818227de33a4afce4698ec0666cf758..6baceb6ce9021c489be6e79d338a9704 this.used.set(start, start + size); } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index eee5dfa165203463cb791e33530944c6b09e7eb7..98c436d84e4aedbdb805129fcdb6b871a1b4e3d9 100644 +index cda87a66fe80bf910f629c64e36c1fecbad81d77..9bae47f99336c377beb72c4b50b7f01cb4db15da 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -51,6 +51,355 @@ public class RegionFile implements AutoCloseable { @@ -685,7 +685,7 @@ index eee5dfa165203463cb791e33530944c6b09e7eb7..98c436d84e4aedbdb805129fcdb6b871 return bytebuffer; } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index c3d26756a716f151d3909ddfeacc47b28d05c498..5291bbe208397d73e6950e9f196bcd1da55c1fad 100644 +index d3d4d10a77af51cff4da201201bac325427fc20c..c2643f61fe5efb62d15f0798db691c76c7674a6e 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java @@ -25,6 +25,7 @@ public class RegionFileStorage implements AutoCloseable { diff --git a/patches/server/0683-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0687-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0683-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0687-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0684-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0688-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0684-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0688-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0685-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0689-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0685-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0689-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0686-Distance-manager-tick-timings.patch b/patches/server/0690-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0686-Distance-manager-tick-timings.patch rename to patches/server/0690-Distance-manager-tick-timings.patch diff --git a/patches/server/0687-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0691-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0687-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0691-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0688-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0692-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0688-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0692-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0689-Add-packet-limiter-config.patch b/patches/server/0693-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0689-Add-packet-limiter-config.patch rename to patches/server/0693-Add-packet-limiter-config.patch diff --git a/patches/server/0690-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0694-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0690-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0694-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0691-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0695-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0691-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0695-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0692-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0696-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0692-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0696-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0693-Time-scoreboard-search.patch b/patches/server/0697-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0693-Time-scoreboard-search.patch rename to patches/server/0697-Time-scoreboard-search.patch diff --git a/patches/server/0694-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0698-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0694-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0698-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0695-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0699-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0695-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0699-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0696-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0700-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0696-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0700-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0697-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0701-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0697-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0701-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0698-Optimise-random-block-ticking.patch b/patches/server/0702-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0698-Optimise-random-block-ticking.patch rename to patches/server/0702-Optimise-random-block-ticking.patch diff --git a/patches/server/0699-Optimise-nearby-player-lookups.patch b/patches/server/0703-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0699-Optimise-nearby-player-lookups.patch rename to patches/server/0703-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0700-Remove-streams-for-villager-AI.patch b/patches/server/0704-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0700-Remove-streams-for-villager-AI.patch rename to patches/server/0704-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0701-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0705-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0701-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0705-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0702-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0706-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0702-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0706-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0703-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0707-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0703-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0707-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0704-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0708-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0704-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0708-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0705-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0709-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0705-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0709-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0706-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0710-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0706-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0710-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0707-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0711-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0707-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0711-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0708-Ensure-valid-vehicle-status.patch b/patches/server/0712-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0708-Ensure-valid-vehicle-status.patch rename to patches/server/0712-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0709-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0713-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0709-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0713-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0710-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0714-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0710-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0714-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0711-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0715-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0711-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0715-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0712-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0716-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0712-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0716-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0713-Preserve-overstacked-loot.patch b/patches/server/0717-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0713-Preserve-overstacked-loot.patch rename to patches/server/0717-Preserve-overstacked-loot.patch diff --git a/patches/server/0714-Update-head-rotation-in-missing-places.patch b/patches/server/0718-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0714-Update-head-rotation-in-missing-places.patch rename to patches/server/0718-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0715-prevent-unintended-light-block-manipulation.patch b/patches/server/0719-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0715-prevent-unintended-light-block-manipulation.patch rename to patches/server/0719-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0716-Fix-CraftCriteria-defaults-map.patch b/patches/server/0720-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0716-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0720-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0717-Fix-upstreams-block-state-factories.patch b/patches/server/0721-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0717-Fix-upstreams-block-state-factories.patch rename to patches/server/0721-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0718-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0722-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0718-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0722-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0719-Configurable-feature-seeds.patch b/patches/server/0723-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0719-Configurable-feature-seeds.patch rename to patches/server/0723-Configurable-feature-seeds.patch diff --git a/patches/server/0720-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0724-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0720-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0724-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0721-Add-root-admin-user-detection.patch b/patches/server/0725-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0721-Add-root-admin-user-detection.patch rename to patches/server/0725-Add-root-admin-user-detection.patch diff --git a/patches/server/0722-Always-allow-item-changing-in-Fireball.patch b/patches/server/0726-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0722-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0726-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0723-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0727-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0723-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0727-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0724-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0728-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0724-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0728-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0725-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0729-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0725-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0729-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0726-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0730-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0726-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0730-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0727-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0731-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0727-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0731-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0728-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0732-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0728-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0732-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0729-Fix-Spigot-growth-modifiers.patch b/patches/server/0733-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0729-Fix-Spigot-growth-modifiers.patch rename to patches/server/0733-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0730-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0734-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0730-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0734-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0731-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0735-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0731-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0735-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0732-Add-player-health-update-API.patch b/patches/server/0736-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0732-Add-player-health-update-API.patch rename to patches/server/0736-Add-player-health-update-API.patch diff --git a/patches/server/0733-Optimize-HashMapPalette.patch b/patches/server/0737-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0733-Optimize-HashMapPalette.patch rename to patches/server/0737-Optimize-HashMapPalette.patch diff --git a/patches/server/0734-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0738-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0734-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0738-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0735-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0739-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/0735-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0739-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/0736-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0736-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0737-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0741-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0737-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0741-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0738-Add-more-Campfire-API.patch b/patches/server/0742-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0738-Add-more-Campfire-API.patch rename to patches/server/0742-Add-more-Campfire-API.patch diff --git a/patches/server/0739-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 90% rename from patches/server/0739-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch index aaa5f4a8ec..0246c3f0d5 100644 --- a/patches/server/0739-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch +++ b/patches/server/0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch @@ -8,7 +8,7 @@ This ensures at least a valid version of the chunk exists on disk, even if outdated diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index 98c436d84e4aedbdb805129fcdb6b871a1b4e3d9..536892e60d4a834161963bb587dc10c37b081a0a 100644 +index 9bae47f99336c377beb72c4b50b7f01cb4db15da..dcfe090c269d4cbcc2eb1b6f85392848bb34656c 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -1004,6 +1004,9 @@ public class RegionFile implements AutoCloseable { @@ -47,10 +47,10 @@ index 98c436d84e4aedbdb805129fcdb6b871a1b4e3d9..536892e60d4a834161963bb587dc10c3 ByteBuffer bytebuffer = ByteBuffer.wrap(this.buf, 0, this.count); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 5291bbe208397d73e6950e9f196bcd1da55c1fad..9bb8938fe3dff4cda2d1324c041f03299aa761e4 100644 +index c2643f61fe5efb62d15f0798db691c76c7674a6e..81554c321a78258ff78da3801f00d0fb90b9e113 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -@@ -344,10 +344,17 @@ public class RegionFileStorage implements AutoCloseable { +@@ -345,10 +345,17 @@ public class RegionFileStorage implements AutoCloseable { NbtIo.write(nbt, (DataOutput) dataoutputstream); regionfile.setStatus(pos.x, pos.z, ChunkSerializer.getStatus(nbt)); // Paper - cache status on disk regionfile.setOversized(pos.x, pos.z, false); // Paper - We don't do this anymore, mojang stores differently, but clear old meta flag if it exists to get rid of our own meta file once last oversized is gone @@ -69,7 +69,7 @@ index 5291bbe208397d73e6950e9f196bcd1da55c1fad..9bb8938fe3dff4cda2d1324c041f0329 } catch (Throwable throwable1) { throwable.addSuppressed(throwable1); } -@@ -355,10 +362,7 @@ public class RegionFileStorage implements AutoCloseable { +@@ -356,10 +363,7 @@ public class RegionFileStorage implements AutoCloseable { throw throwable; } @@ -79,9 +79,9 @@ index 5291bbe208397d73e6950e9f196bcd1da55c1fad..9bb8938fe3dff4cda2d1324c041f0329 - } + // Paper - move into try block to only write if successfully serialized } - - } finally { // Paper start -@@ -393,4 +397,13 @@ public class RegionFileStorage implements AutoCloseable { + // Paper start + return; +@@ -405,4 +409,13 @@ public class RegionFileStorage implements AutoCloseable { } } diff --git a/patches/server/0740-Fix-tripwire-state-inconsistency.patch b/patches/server/0744-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0740-Fix-tripwire-state-inconsistency.patch rename to patches/server/0744-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0741-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0745-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0741-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0745-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0742-Improve-scoreboard-entries.patch b/patches/server/0746-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0742-Improve-scoreboard-entries.patch rename to patches/server/0746-Improve-scoreboard-entries.patch diff --git a/patches/server/0743-Entity-powdered-snow-API.patch b/patches/server/0747-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0743-Entity-powdered-snow-API.patch rename to patches/server/0747-Entity-powdered-snow-API.patch diff --git a/patches/server/0744-Add-API-for-item-entity-health.patch b/patches/server/0748-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0744-Add-API-for-item-entity-health.patch rename to patches/server/0748-Add-API-for-item-entity-health.patch diff --git a/patches/server/0745-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0749-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0745-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0749-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0746-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0750-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0746-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0750-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0747-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0751-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0747-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0751-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0748-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0752-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0748-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0752-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0749-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0753-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0749-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0753-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0750-Fix-bees-aging-inside-hives.patch b/patches/server/0754-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0750-Fix-bees-aging-inside-hives.patch rename to patches/server/0754-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0751-Bucketable-API.patch b/patches/server/0755-Bucketable-API.patch similarity index 100% rename from patches/server/0751-Bucketable-API.patch rename to patches/server/0755-Bucketable-API.patch diff --git a/patches/server/0752-Validate-usernames.patch b/patches/server/0756-Validate-usernames.patch similarity index 100% rename from patches/server/0752-Validate-usernames.patch rename to patches/server/0756-Validate-usernames.patch diff --git a/patches/server/0753-Make-water-animal-spawn-height-configurable.patch b/patches/server/0757-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0753-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0757-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0754-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0754-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0755-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0759-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0755-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0759-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0756-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0760-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0756-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0760-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0757-Multiple-Entries-with-Scoreboards.patch b/patches/server/0761-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0757-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0761-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0758-Reset-placed-block-on-exception.patch b/patches/server/0762-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0758-Reset-placed-block-on-exception.patch rename to patches/server/0762-Reset-placed-block-on-exception.patch diff --git a/patches/server/0759-Add-configurable-height-for-slime-spawn.patch b/patches/server/0763-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0759-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0763-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0760-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0764-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0760-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0764-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0761-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0765-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0761-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0765-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0762-Kick-on-main-for-illegal-chat.patch b/patches/server/0766-Kick-on-main-for-illegal-chat.patch similarity index 100% rename from patches/server/0762-Kick-on-main-for-illegal-chat.patch rename to patches/server/0766-Kick-on-main-for-illegal-chat.patch diff --git a/patches/server/0763-Multi-Block-Change-API-Implementation.patch b/patches/server/0767-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0763-Multi-Block-Change-API-Implementation.patch rename to patches/server/0767-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0764-Fix-NotePlayEvent.patch b/patches/server/0768-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0764-Fix-NotePlayEvent.patch rename to patches/server/0768-Fix-NotePlayEvent.patch diff --git a/patches/server/0765-Freeze-Tick-Lock-API.patch b/patches/server/0769-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0765-Freeze-Tick-Lock-API.patch rename to patches/server/0769-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0766-Dolphin-API.patch b/patches/server/0770-Dolphin-API.patch similarity index 100% rename from patches/server/0766-Dolphin-API.patch rename to patches/server/0770-Dolphin-API.patch diff --git a/patches/server/0767-More-PotionEffectType-API.patch b/patches/server/0771-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0767-More-PotionEffectType-API.patch rename to patches/server/0771-More-PotionEffectType-API.patch diff --git a/patches/server/0768-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0772-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0768-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0772-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0769-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0773-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0769-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0773-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0770-Add-missing-structure-set-seed-configs.patch b/patches/server/0774-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0770-Add-missing-structure-set-seed-configs.patch rename to patches/server/0774-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0771-Implement-regenerateChunk.patch b/patches/server/0775-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0771-Implement-regenerateChunk.patch rename to patches/server/0775-Implement-regenerateChunk.patch diff --git a/patches/server/0772-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0776-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0772-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0776-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0773-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0777-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0773-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0777-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0774-Add-GameEvent-tags.patch b/patches/server/0778-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0774-Add-GameEvent-tags.patch rename to patches/server/0778-Add-GameEvent-tags.patch diff --git a/patches/server/0775-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0775-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0776-Furnace-RecipesUsed-API.patch b/patches/server/0780-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0776-Furnace-RecipesUsed-API.patch rename to patches/server/0780-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0777-Configurable-sculk-sensor-listener-range.patch b/patches/server/0781-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0777-Configurable-sculk-sensor-listener-range.patch rename to patches/server/0781-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0778-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0782-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0778-Add-missing-block-data-mins-and-maxes.patch rename to patches/server/0782-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0779-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0779-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0780-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0780-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0781-Fix-Entity-Position-Desync.patch b/patches/server/0785-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0781-Fix-Entity-Position-Desync.patch rename to patches/server/0785-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0782-Custom-Potion-Mixes.patch b/patches/server/0786-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0782-Custom-Potion-Mixes.patch rename to patches/server/0786-Custom-Potion-Mixes.patch diff --git a/patches/server/0783-Force-close-world-loading-screen.patch b/patches/server/0787-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0783-Force-close-world-loading-screen.patch rename to patches/server/0787-Force-close-world-loading-screen.patch diff --git a/patches/server/0784-Fix-falling-block-spawn-methods.patch b/patches/server/0788-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0784-Fix-falling-block-spawn-methods.patch rename to patches/server/0788-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0785-Expose-furnace-minecart-push-values.patch b/patches/server/0789-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0785-Expose-furnace-minecart-push-values.patch rename to patches/server/0789-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0786-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0790-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0786-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/server/0790-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0787-More-Projectile-API.patch b/patches/server/0791-More-Projectile-API.patch similarity index 100% rename from patches/server/0787-More-Projectile-API.patch rename to patches/server/0791-More-Projectile-API.patch diff --git a/patches/server/0788-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0792-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0788-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/server/0792-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0789-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0789-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0790-Implement-getComputedBiome-API.patch b/patches/server/0794-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0790-Implement-getComputedBiome-API.patch rename to patches/server/0794-Implement-getComputedBiome-API.patch diff --git a/patches/server/0791-Make-some-itemstacks-nonnull.patch b/patches/server/0795-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0791-Make-some-itemstacks-nonnull.patch rename to patches/server/0795-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0792-Implement-enchantWithLevels-API.patch b/patches/server/0796-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0792-Implement-enchantWithLevels-API.patch rename to patches/server/0796-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0793-Fix-saving-in-unloadWorld.patch b/patches/server/0797-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0793-Fix-saving-in-unloadWorld.patch rename to patches/server/0797-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0794-Buffer-OOB-setBlock-calls.patch b/patches/server/0798-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0794-Buffer-OOB-setBlock-calls.patch rename to patches/server/0798-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0795-Add-TameableDeathMessageEvent.patch b/patches/server/0799-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0795-Add-TameableDeathMessageEvent.patch rename to patches/server/0799-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0796-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0800-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0796-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/server/0800-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0797-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0801-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0797-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/server/0801-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0798-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0802-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0798-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/server/0802-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0799-Guard-against-invalid-entity-positions.patch b/patches/server/0803-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0799-Guard-against-invalid-entity-positions.patch rename to patches/server/0803-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0800-cache-resource-keys.patch b/patches/server/0804-cache-resource-keys.patch similarity index 100% rename from patches/server/0800-cache-resource-keys.patch rename to patches/server/0804-cache-resource-keys.patch diff --git a/patches/server/0801-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0805-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0801-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/server/0805-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0802-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0806-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0802-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/server/0806-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0803-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0807-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0803-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/server/0807-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0804-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0808-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0804-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/server/0808-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0805-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0809-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0805-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/server/0809-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0806-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0810-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0806-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/server/0810-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0807-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0807-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0808-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0812-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0808-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/server/0812-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0809-WorldCreator-keepSpawnLoaded.patch b/patches/server/0813-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0809-WorldCreator-keepSpawnLoaded.patch rename to patches/server/0813-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0810-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/server/0814-Fix-NPE-for-BlockDataMeta-getBlockData.patch similarity index 100% rename from patches/server/0810-Fix-NPE-for-BlockDataMeta-getBlockData.patch rename to patches/server/0814-Fix-NPE-for-BlockDataMeta-getBlockData.patch diff --git a/patches/server/0811-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0811-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0812-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0812-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0813-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0813-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0814-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0814-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0815-Add-PlayerStopUsingItemEvent.patch b/patches/server/0819-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0815-Add-PlayerStopUsingItemEvent.patch rename to patches/server/0819-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0816-FallingBlock-auto-expire-setting.patch b/patches/server/0820-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0816-FallingBlock-auto-expire-setting.patch rename to patches/server/0820-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0817-Don-t-tick-markers.patch b/patches/server/0821-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0817-Don-t-tick-markers.patch rename to patches/server/0821-Don-t-tick-markers.patch diff --git a/patches/server/0818-Do-not-accept-invalid-client-settings.patch b/patches/server/0822-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0818-Do-not-accept-invalid-client-settings.patch rename to patches/server/0822-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0819-Add-support-for-Proxy-Protocol.patch b/patches/server/0823-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0819-Add-support-for-Proxy-Protocol.patch rename to patches/server/0823-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0820-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0820-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0821-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0821-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0822-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0822-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0823-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0823-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0824-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0824-Prevent-entity-loading-causing-async-lookups.patch rename to patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0825-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0825-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0826-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0830-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0826-Add-Alternate-Current-redstone-implementation.patch rename to patches/server/0830-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0827-Dont-resent-entity-on-art-update.patch b/patches/server/0831-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0827-Dont-resent-entity-on-art-update.patch rename to patches/server/0831-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0828-Add-WardenAngerChangeEvent.patch b/patches/server/0832-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0828-Add-WardenAngerChangeEvent.patch rename to patches/server/0832-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0829-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0829-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0830-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0830-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0831-Nameable-Banner-API.patch b/patches/server/0835-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0831-Nameable-Banner-API.patch rename to patches/server/0835-Nameable-Banner-API.patch diff --git a/patches/server/0832-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch similarity index 95% rename from patches/server/0832-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch index f7d8a33059..df470e096d 100644 --- a/patches/server/0832-Don-t-broadcast-messages-to-command-blocks.patch +++ b/patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch @@ -8,7 +8,7 @@ in command blocks, and if called asynchronously, would throw an error diff --git a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java -index c138678fe82e6c1dd7ce634f90bcbfcad6159276..fdf1ee8504afc820df96eed0941eb3f1cd9ba392 100644 +index e05eb08a9c229b371887676da510df948b896a85..ceeedbd88c56c08ec8b047c9ca2f14cc581e12ad 100644 --- a/src/main/java/net/minecraft/world/level/BaseCommandBlock.java +++ b/src/main/java/net/minecraft/world/level/BaseCommandBlock.java @@ -172,6 +172,7 @@ public abstract class BaseCommandBlock implements CommandSource { diff --git a/patches/server/0833-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0833-Prevent-empty-items-from-being-added-to-world.patch rename to patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0834-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0834-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0835-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 100% rename from patches/server/0835-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch diff --git a/patches/server/0836-Add-Player-getFishHook.patch b/patches/server/0840-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0836-Add-Player-getFishHook.patch rename to patches/server/0840-Add-Player-getFishHook.patch diff --git a/patches/server/0837-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0837-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0838-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0838-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0839-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 100% rename from patches/server/0839-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch diff --git a/patches/server/0840-Fix-Bee-flower-NPE.patch b/patches/server/0844-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0840-Fix-Bee-flower-NPE.patch rename to patches/server/0844-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0841-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0841-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0842-More-Teleport-API.patch b/patches/server/0846-More-Teleport-API.patch similarity index 100% rename from patches/server/0842-More-Teleport-API.patch rename to patches/server/0846-More-Teleport-API.patch diff --git a/patches/server/0843-Add-EntityPortalReadyEvent.patch b/patches/server/0847-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0843-Add-EntityPortalReadyEvent.patch rename to patches/server/0847-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0844-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0844-Don-t-use-level-random-in-entity-constructors.patch rename to patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0845-Send-block-entities-after-destroy-prediction.patch b/patches/server/0849-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0845-Send-block-entities-after-destroy-prediction.patch rename to patches/server/0849-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0846-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0846-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0847-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0847-Custom-Chat-Completion-Suggestions-API.patch rename to patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0848-Add-missing-BlockFadeEvents.patch b/patches/server/0852-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0848-Add-missing-BlockFadeEvents.patch rename to patches/server/0852-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0849-Collision-API.patch b/patches/server/0853-Collision-API.patch similarity index 100% rename from patches/server/0849-Collision-API.patch rename to patches/server/0853-Collision-API.patch diff --git a/patches/server/0850-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0850-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0851-Remove-invalid-signature-login-stacktrace.patch b/patches/server/0855-Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/0851-Remove-invalid-signature-login-stacktrace.patch rename to patches/server/0855-Remove-invalid-signature-login-stacktrace.patch diff --git a/patches/server/0852-Block-Ticking-API.patch b/patches/server/0856-Block-Ticking-API.patch similarity index 100% rename from patches/server/0852-Block-Ticking-API.patch rename to patches/server/0856-Block-Ticking-API.patch diff --git a/patches/server/0853-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0857-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0853-Add-Velocity-IP-Forwarding-Support.patch rename to patches/server/0857-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0854-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0858-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0854-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/server/0858-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0855-Add-NamespacedKey-biome-methods.patch b/patches/server/0859-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0855-Add-NamespacedKey-biome-methods.patch rename to patches/server/0859-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0856-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0860-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0856-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/server/0860-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0857-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0861-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0857-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/server/0861-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0858-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0862-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0858-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/server/0862-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0859-Missing-eating-regain-reason.patch b/patches/server/0863-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0859-Missing-eating-regain-reason.patch rename to patches/server/0863-Missing-eating-regain-reason.patch diff --git a/patches/server/0860-Missing-effect-cause.patch b/patches/server/0864-Missing-effect-cause.patch similarity index 100% rename from patches/server/0860-Missing-effect-cause.patch rename to patches/server/0864-Missing-effect-cause.patch diff --git a/patches/server/0861-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0865-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0861-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/server/0865-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0862-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0866-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0862-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/server/0866-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0863-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0867-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0863-Call-BlockPhysicsEvent-more-often.patch rename to patches/server/0867-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0864-Configurable-chat-thread-limit.patch b/patches/server/0868-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0864-Configurable-chat-thread-limit.patch rename to patches/server/0868-Configurable-chat-thread-limit.patch diff --git a/patches/server/0865-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0869-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0865-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/server/0869-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0866-fix-Jigsaw-block-kicking-user.patch b/patches/server/0870-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0866-fix-Jigsaw-block-kicking-user.patch rename to patches/server/0870-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0867-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0871-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0867-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/server/0871-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0868-Add-getDrops-to-BlockState.patch b/patches/server/0872-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0868-Add-getDrops-to-BlockState.patch rename to patches/server/0872-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0869-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0873-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0869-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/server/0873-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0870-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0874-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0870-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/server/0874-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0871-Fix-custom-piglin-loved-items.patch b/patches/server/0875-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0871-Fix-custom-piglin-loved-items.patch rename to patches/server/0875-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0872-EntityPickupItemEvent-fixes.patch b/patches/server/0876-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0872-EntityPickupItemEvent-fixes.patch rename to patches/server/0876-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0873-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0877-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0873-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/server/0877-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0874-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0878-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0874-Add-PlayerInventorySlotChangeEvent.patch rename to patches/server/0878-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0875-Elder-Guardian-appearance-API.patch b/patches/server/0879-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0875-Elder-Guardian-appearance-API.patch rename to patches/server/0879-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0876-Allow-changing-bed-s-occupied-property.patch b/patches/server/0880-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0876-Allow-changing-bed-s-occupied-property.patch rename to patches/server/0880-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0877-Add-entity-knockback-API.patch b/patches/server/0881-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0877-Add-entity-knockback-API.patch rename to patches/server/0881-Add-entity-knockback-API.patch diff --git a/patches/server/0878-Detect-headless-JREs.patch b/patches/server/0882-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0878-Detect-headless-JREs.patch rename to patches/server/0882-Detect-headless-JREs.patch diff --git a/patches/server/0879-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0883-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0879-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/server/0883-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0880-optimized-dirt-and-snow-spreading.patch b/patches/server/0884-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0880-optimized-dirt-and-snow-spreading.patch rename to patches/server/0884-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0881-Added-EntityToggleSitEvent.patch b/patches/server/0885-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0881-Added-EntityToggleSitEvent.patch rename to patches/server/0885-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0882-Add-fire-tick-delay-option.patch b/patches/server/0886-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0882-Add-fire-tick-delay-option.patch rename to patches/server/0886-Add-fire-tick-delay-option.patch diff --git a/patches/server/0883-Add-Moving-Piston-API.patch b/patches/server/0887-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0883-Add-Moving-Piston-API.patch rename to patches/server/0887-Add-Moving-Piston-API.patch diff --git a/patches/server/0884-Ignore-impossible-spawn-tick.patch b/patches/server/0888-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0884-Ignore-impossible-spawn-tick.patch rename to patches/server/0888-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0885-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0889-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0885-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/server/0889-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0886-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0890-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0886-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/server/0890-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0887-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0891-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0887-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/server/0891-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0888-Prevent-compass-from-loading-chunks.patch b/patches/server/0892-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0888-Prevent-compass-from-loading-chunks.patch rename to patches/server/0892-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0889-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0893-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0889-Add-PrePlayerAttackEntityEvent.patch rename to patches/server/0893-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0890-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0894-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0890-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/server/0894-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0891-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0895-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0891-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/server/0895-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0892-Add-Player-Warden-Warning-API.patch b/patches/server/0896-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0892-Add-Player-Warden-Warning-API.patch rename to patches/server/0896-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0893-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0897-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0893-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/server/0897-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0894-Add-paper-dumplisteners-command.patch b/patches/server/0898-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0894-Add-paper-dumplisteners-command.patch rename to patches/server/0898-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0895-check-global-player-list-where-appropriate.patch b/patches/server/0899-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0895-check-global-player-list-where-appropriate.patch rename to patches/server/0899-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0896-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0900-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0896-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/server/0900-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0897-ItemStack-damage-API.patch b/patches/server/0901-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0897-ItemStack-damage-API.patch rename to patches/server/0901-ItemStack-damage-API.patch diff --git a/patches/server/0898-Friction-API.patch b/patches/server/0902-Friction-API.patch similarity index 100% rename from patches/server/0898-Friction-API.patch rename to patches/server/0902-Friction-API.patch diff --git a/patches/server/0899-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0903-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0899-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/server/0903-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0900-Fix-player-kick-on-shutdown.patch b/patches/server/0904-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0900-Fix-player-kick-on-shutdown.patch rename to patches/server/0904-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0901-Sync-offhand-slot-in-menus.patch b/patches/server/0905-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0901-Sync-offhand-slot-in-menus.patch rename to patches/server/0905-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0902-Player-Entity-Tracking-Events.patch b/patches/server/0906-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0902-Player-Entity-Tracking-Events.patch rename to patches/server/0906-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0903-Limit-pet-look-distance.patch b/patches/server/0907-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0903-Limit-pet-look-distance.patch rename to patches/server/0907-Limit-pet-look-distance.patch diff --git a/patches/server/0904-Properly-resend-entities.patch b/patches/server/0908-Properly-resend-entities.patch similarity index 100% rename from patches/server/0904-Properly-resend-entities.patch rename to patches/server/0908-Properly-resend-entities.patch diff --git a/patches/server/0905-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0909-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0905-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/server/0909-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0906-fix-Instruments.patch b/patches/server/0910-fix-Instruments.patch similarity index 100% rename from patches/server/0906-fix-Instruments.patch rename to patches/server/0910-fix-Instruments.patch diff --git a/patches/server/0907-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0911-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0907-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/server/0911-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0908-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0912-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0908-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/server/0912-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0909-Improve-logging-and-errors.patch b/patches/server/0913-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0909-Improve-logging-and-errors.patch rename to patches/server/0913-Improve-logging-and-errors.patch diff --git a/patches/server/0910-Add-BlockLockCheckEvent.patch b/patches/server/0914-Add-BlockLockCheckEvent.patch similarity index 96% rename from patches/server/0910-Add-BlockLockCheckEvent.patch rename to patches/server/0914-Add-BlockLockCheckEvent.patch index 135e39e235..29e8b68880 100644 --- a/patches/server/0910-Add-BlockLockCheckEvent.patch +++ b/patches/server/0914-Add-BlockLockCheckEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockLockCheckEvent diff --git a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java -index e85022b31f2bc2783e88f5ba4c5173ac8a096c96..61deb384d54596465acfe1451cc142c60fcc36d8 100644 +index f1acd19432877a833f0d4339f9de4830a0f7b890..8d38ebfdc976b9695ed367591e58de8ca18f00f3 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BaseContainerBlockEntity.java @@ -69,17 +69,44 @@ public abstract class BaseContainerBlockEntity extends BlockEntity implements Co @@ -56,7 +56,7 @@ index e85022b31f2bc2783e88f5ba4c5173ac8a096c96..61deb384d54596465acfe1451cc142c6 @Nullable diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index da9e6b799923642e5ccb250affde386c6b3bd7f2..29fc9e1b83487f8ebb15d7ae0f7fdd246f23efd9 100644 +index 147e808c7e2b3ed16861c989c1ba4a0b99a5be38..59246e24558569f7f50b4d4d508616798091c888 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java @@ -444,7 +444,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name diff --git a/patches/server/0911-Add-Sneaking-API-for-Entities.patch b/patches/server/0915-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0911-Add-Sneaking-API-for-Entities.patch rename to patches/server/0915-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0912-Improve-PortalEvents.patch b/patches/server/0916-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0912-Improve-PortalEvents.patch rename to patches/server/0916-Improve-PortalEvents.patch diff --git a/patches/server/0913-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0917-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0913-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/server/0917-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0914-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0918-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0914-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/server/0918-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0915-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0919-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0915-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/server/0919-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0916-Flying-Fall-Damage.patch b/patches/server/0920-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0916-Flying-Fall-Damage.patch rename to patches/server/0920-Flying-Fall-Damage.patch diff --git a/patches/server/0917-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/server/0921-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/server/0917-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/server/0921-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/server/0918-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0922-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0918-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/server/0922-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0919-config-for-disabling-entity-tag-tags.patch b/patches/server/0923-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0919-config-for-disabling-entity-tag-tags.patch rename to patches/server/0923-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0920-Use-single-player-info-update-packet-on-join.patch b/patches/server/0924-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0920-Use-single-player-info-update-packet-on-join.patch rename to patches/server/0924-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0921-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0925-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0921-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/server/0925-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0922-Win-Screen-API.patch b/patches/server/0926-Win-Screen-API.patch similarity index 100% rename from patches/server/0922-Win-Screen-API.patch rename to patches/server/0926-Win-Screen-API.patch diff --git a/patches/server/0923-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0927-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0923-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/server/0927-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0924-Fix-force-opening-enchantment-tables.patch b/patches/server/0928-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0924-Fix-force-opening-enchantment-tables.patch rename to patches/server/0928-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0925-Add-Entity-Body-Yaw-API.patch b/patches/server/0929-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0925-Add-Entity-Body-Yaw-API.patch rename to patches/server/0929-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0926-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0930-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0926-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/server/0930-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0927-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0931-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0927-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/server/0931-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0928-Add-EntityFertilizeEggEvent.patch b/patches/server/0932-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0928-Add-EntityFertilizeEggEvent.patch rename to patches/server/0932-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0929-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0933-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0929-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/server/0933-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0930-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0934-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0930-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/server/0934-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0931-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0935-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0931-Correctly-handle-ArmorStand-invisibility.patch rename to patches/server/0935-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0932-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0936-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0932-Fix-advancement-triggers-for-entity-damage.patch rename to patches/server/0936-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0933-Fix-text-display-error-on-spawn.patch b/patches/server/0937-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0933-Fix-text-display-error-on-spawn.patch rename to patches/server/0937-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0934-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0938-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0934-Fix-certain-inventories-returning-null-Locations.patch rename to patches/server/0938-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0935-Add-Shearable-API.patch b/patches/server/0939-Add-Shearable-API.patch similarity index 100% rename from patches/server/0935-Add-Shearable-API.patch rename to patches/server/0939-Add-Shearable-API.patch diff --git a/patches/server/0936-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0940-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0936-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/server/0940-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0937-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0941-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 100% rename from patches/server/0937-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/server/0941-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/patches/server/0938-Optimize-Hoppers.patch b/patches/server/0942-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0938-Optimize-Hoppers.patch rename to patches/server/0942-Optimize-Hoppers.patch diff --git a/patches/server/0939-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0943-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0939-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/server/0943-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0940-Fix-api-checking-banned-ips.patch b/patches/server/0944-Fix-api-checking-banned-ips.patch similarity index 100% rename from patches/server/0940-Fix-api-checking-banned-ips.patch rename to patches/server/0944-Fix-api-checking-banned-ips.patch diff --git a/patches/server/0941-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0945-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0941-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/server/0945-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0942-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0946-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0942-Treat-sequence-violations-like-they-should-be.patch rename to patches/server/0946-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0943-remove-duplicate-animate-packet-for-records.patch b/patches/server/0947-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0943-remove-duplicate-animate-packet-for-records.patch rename to patches/server/0947-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0944-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0948-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0944-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/server/0948-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0945-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0949-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0945-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/server/0949-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0946-Use-array-for-gamerule-storage.patch b/patches/server/0950-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0946-Use-array-for-gamerule-storage.patch rename to patches/server/0950-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0947-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0951-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0947-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/server/0951-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0948-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0952-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0948-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/server/0952-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0949-Add-Mob-Experience-reward-API.patch b/patches/server/0953-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0949-Add-Mob-Experience-reward-API.patch rename to patches/server/0953-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0950-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0954-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0950-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/server/0954-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0951-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0955-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0951-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/server/0955-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0952-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0956-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0952-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/server/0956-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0953-More-accurate-isInOpenWater-impl.patch b/patches/server/0957-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0953-More-accurate-isInOpenWater-impl.patch rename to patches/server/0957-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0954-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0958-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0954-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/server/0958-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0955-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0959-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0955-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/server/0959-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0956-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0960-Fix-destroying-beehive-without-any-players-nearby-th.patch similarity index 100% rename from patches/server/0956-Fix-destroying-beehive-without-any-players-nearby-th.patch rename to patches/server/0960-Fix-destroying-beehive-without-any-players-nearby-th.patch diff --git a/patches/server/0957-Expand-PlayerItemMendEvent.patch b/patches/server/0961-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0957-Expand-PlayerItemMendEvent.patch rename to patches/server/0961-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0958-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0962-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0958-Refresh-ProjectileSource-for-projectiles.patch rename to patches/server/0962-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0959-Add-transient-modifier-API.patch b/patches/server/0963-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0959-Add-transient-modifier-API.patch rename to patches/server/0963-Add-transient-modifier-API.patch diff --git a/patches/unapplied/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch deleted file mode 100644 index 22ffad4aa5..0000000000 --- a/patches/unapplied/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: 0x22 <0x22@futureclient.net> -Date: Thu, 26 Apr 2018 04:41:11 -0400 -Subject: [PATCH] Fix exploit that allowed colored signs to be created - - -diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d9c441f600a1f981a9dad075cba9d1d9b28e1aa0..bed9c637d7d26b758ab587eb5cdf2c7f7fb7b356 100644 ---- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3159,9 +3159,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic - FilteredText filteredtext = (FilteredText) signText.get(i); - - if (this.player.isTextFilteringEnabled()) { -- lines.add(net.kyori.adventure.text.Component.text(filteredtext.filteredOrEmpty())); // Paper - adventure -+ lines.add(net.kyori.adventure.text.Component.text(SharedConstants.filterText(filteredtext.filteredOrEmpty()))); // Paper - adventure - } else { -- lines.add(net.kyori.adventure.text.Component.text(filteredtext.raw())); // Paper - adventure -+ lines.add(net.kyori.adventure.text.Component.text(SharedConstants.filterText(filteredtext.raw()))); // Paper - adventure - } - } - SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.player.getBukkitEntity(), lines);