diff --git a/patches/server/0010-Player-saving-async-FileIO.patch b/patches/removed/server/0010-Player-saving-async-FileIO.patch similarity index 100% rename from patches/server/0010-Player-saving-async-FileIO.patch rename to patches/removed/server/0010-Player-saving-async-FileIO.patch diff --git a/patches/server/0011-Modify-default-configs.patch b/patches/server/0010-Modify-default-configs.patch similarity index 100% rename from patches/server/0011-Modify-default-configs.patch rename to patches/server/0010-Modify-default-configs.patch diff --git a/patches/server/0012-lithium-MixinDirection.patch b/patches/server/0011-lithium-MixinDirection.patch similarity index 100% rename from patches/server/0012-lithium-MixinDirection.patch rename to patches/server/0011-lithium-MixinDirection.patch diff --git a/patches/server/0013-lithium-MixinBox.patch b/patches/server/0012-lithium-MixinBox.patch similarity index 100% rename from patches/server/0013-lithium-MixinBox.patch rename to patches/server/0012-lithium-MixinBox.patch diff --git a/patches/server/0014-lithium-enum_values.patch b/patches/server/0013-lithium-enum_values.patch similarity index 100% rename from patches/server/0014-lithium-enum_values.patch rename to patches/server/0013-lithium-enum_values.patch diff --git a/patches/server/0015-lithium-MixinGoalSelector.patch b/patches/server/0014-lithium-MixinGoalSelector.patch similarity index 100% rename from patches/server/0015-lithium-MixinGoalSelector.patch rename to patches/server/0014-lithium-MixinGoalSelector.patch diff --git a/patches/server/0016-lithium-MixinLandPathNodeMaker.patch b/patches/server/0015-lithium-MixinLandPathNodeMaker.patch similarity index 100% rename from patches/server/0016-lithium-MixinLandPathNodeMaker.patch rename to patches/server/0015-lithium-MixinLandPathNodeMaker.patch diff --git a/patches/server/0017-lithium-MixinBiome.patch b/patches/server/0016-lithium-MixinBiome.patch similarity index 100% rename from patches/server/0017-lithium-MixinBiome.patch rename to patches/server/0016-lithium-MixinBiome.patch diff --git a/patches/server/0018-Item-stuck-sleep-config.patch b/patches/server/0017-Item-stuck-sleep-config.patch similarity index 100% rename from patches/server/0018-Item-stuck-sleep-config.patch rename to patches/server/0017-Item-stuck-sleep-config.patch diff --git a/patches/server/0019-Option-for-simpler-Villagers.patch b/patches/server/0018-Option-for-simpler-Villagers.patch similarity index 100% rename from patches/server/0019-Option-for-simpler-Villagers.patch rename to patches/server/0018-Option-for-simpler-Villagers.patch diff --git a/patches/server/0020-Heavily-optimize-furnance-fuel-and-recipe-lookups.patch b/patches/server/0019-Heavily-optimize-furnance-fuel-and-recipe-lookups.patch similarity index 100% rename from patches/server/0020-Heavily-optimize-furnance-fuel-and-recipe-lookups.patch rename to patches/server/0019-Heavily-optimize-furnance-fuel-and-recipe-lookups.patch diff --git a/patches/server/0021-Add-GlueList.patch b/patches/server/0020-Add-GlueList.patch similarity index 100% rename from patches/server/0021-Add-GlueList.patch rename to patches/server/0020-Add-GlueList.patch diff --git a/patches/server/0022-Optimize-TileEntity-load-unload.patch b/patches/server/0021-Optimize-TileEntity-load-unload.patch similarity index 100% rename from patches/server/0022-Optimize-TileEntity-load-unload.patch rename to patches/server/0021-Optimize-TileEntity-load-unload.patch diff --git a/patches/server/0023-Global-Eula-file.patch b/patches/server/0022-Global-Eula-file.patch similarity index 100% rename from patches/server/0023-Global-Eula-file.patch rename to patches/server/0022-Global-Eula-file.patch diff --git a/patches/server/0024-Redirect-Configs.patch b/patches/server/0023-Redirect-Configs.patch similarity index 100% rename from patches/server/0024-Redirect-Configs.patch rename to patches/server/0023-Redirect-Configs.patch diff --git a/patches/server/0025-Akarin-Updated-Save-json-list-async.patch b/patches/server/0024-Akarin-Updated-Save-json-list-async.patch similarity index 100% rename from patches/server/0025-Akarin-Updated-Save-json-list-async.patch rename to patches/server/0024-Akarin-Updated-Save-json-list-async.patch diff --git a/patches/server/0026-lithium-MixinChunkGeneratorAbstract.patch b/patches/server/0025-lithium-MixinChunkGeneratorAbstract.patch similarity index 100% rename from patches/server/0026-lithium-MixinChunkGeneratorAbstract.patch rename to patches/server/0025-lithium-MixinChunkGeneratorAbstract.patch diff --git a/patches/server/0027-lithium-MixinDataWatcher.patch b/patches/server/0026-lithium-MixinDataWatcher.patch similarity index 100% rename from patches/server/0027-lithium-MixinDataWatcher.patch rename to patches/server/0026-lithium-MixinDataWatcher.patch diff --git a/patches/server/0028-Fix-lead-fall-dmg-config.patch b/patches/server/0027-Fix-lead-fall-dmg-config.patch similarity index 100% rename from patches/server/0028-Fix-lead-fall-dmg-config.patch rename to patches/server/0027-Fix-lead-fall-dmg-config.patch diff --git a/patches/server/0029-Optimize-player-loops-around-weather.patch b/patches/server/0028-Optimize-player-loops-around-weather.patch similarity index 100% rename from patches/server/0029-Optimize-player-loops-around-weather.patch rename to patches/server/0028-Optimize-player-loops-around-weather.patch diff --git a/patches/server/0030-Optimize-BehaviorController.patch b/patches/server/0029-Optimize-BehaviorController.patch similarity index 100% rename from patches/server/0030-Optimize-BehaviorController.patch rename to patches/server/0029-Optimize-BehaviorController.patch diff --git a/patches/server/0031-Use-block-distance-in-portal-search-radius.patch b/patches/server/0030-Use-block-distance-in-portal-search-radius.patch similarity index 100% rename from patches/server/0031-Use-block-distance-in-portal-search-radius.patch rename to patches/server/0030-Use-block-distance-in-portal-search-radius.patch diff --git a/patches/server/0032-Add-timings-for-Pathfinder.patch b/patches/server/0031-Add-timings-for-Pathfinder.patch similarity index 100% rename from patches/server/0032-Add-timings-for-Pathfinder.patch rename to patches/server/0031-Add-timings-for-Pathfinder.patch diff --git a/patches/server/0033-Send-more-packets-immediately.patch b/patches/server/0032-Send-more-packets-immediately.patch similarity index 100% rename from patches/server/0033-Send-more-packets-immediately.patch rename to patches/server/0032-Send-more-packets-immediately.patch diff --git a/patches/server/0034-Use-offline-uuids-if-we-need-to.patch b/patches/server/0033-Use-offline-uuids-if-we-need-to.patch similarity index 96% rename from patches/server/0034-Use-offline-uuids-if-we-need-to.patch rename to patches/server/0033-Use-offline-uuids-if-we-need-to.patch index 6e5266c4..5899408f 100644 --- a/patches/server/0034-Use-offline-uuids-if-we-need-to.patch +++ b/patches/server/0033-Use-offline-uuids-if-we-need-to.patch @@ -20,10 +20,10 @@ Thanks to Gabriele C for pointing this issue to us, as he have any interest fixing this. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index a52c0391b171c8a57de75f87c534ce1e0e78c44a..6ae35c96978b6d16bc45d3eff435f35647fd1555 100644 +index ce4ebc96c01f3dacf4e4d0569d86f52140440d43..5cf7699f439eb7ef310f0ab02b120836c4a56bfc 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1923,7 +1923,7 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1914,7 +1914,7 @@ public abstract class EntityHuman extends EntityLiving { public static UUID a(GameProfile gameprofile) { UUID uuid = gameprofile.getId(); diff --git a/patches/server/0035-lithium-collision-optimizations.patch b/patches/server/0034-lithium-collision-optimizations.patch similarity index 100% rename from patches/server/0035-lithium-collision-optimizations.patch rename to patches/server/0034-lithium-collision-optimizations.patch diff --git a/patches/server/0036-lithium-VoxelShapesMixin.patch b/patches/server/0035-lithium-VoxelShapesMixin.patch similarity index 100% rename from patches/server/0036-lithium-VoxelShapesMixin.patch rename to patches/server/0035-lithium-VoxelShapesMixin.patch diff --git a/patches/server/0037-lithium-MixinChunkSection.patch b/patches/server/0036-lithium-MixinChunkSection.patch similarity index 100% rename from patches/server/0037-lithium-MixinChunkSection.patch rename to patches/server/0036-lithium-MixinChunkSection.patch diff --git a/patches/server/0038-Fix-recipe-crash.patch b/patches/server/0037-Fix-recipe-crash.patch similarity index 100% rename from patches/server/0038-Fix-recipe-crash.patch rename to patches/server/0037-Fix-recipe-crash.patch diff --git a/patches/server/0039-Load-also-the-chunk-that-you-re-teleporting-to.patch b/patches/server/0038-Load-also-the-chunk-that-you-re-teleporting-to.patch similarity index 100% rename from patches/server/0039-Load-also-the-chunk-that-you-re-teleporting-to.patch rename to patches/server/0038-Load-also-the-chunk-that-you-re-teleporting-to.patch diff --git a/patches/server/0040-Highly-optimize-VillagePlace-filtering.patch b/patches/server/0039-Highly-optimize-VillagePlace-filtering.patch similarity index 100% rename from patches/server/0040-Highly-optimize-VillagePlace-filtering.patch rename to patches/server/0039-Highly-optimize-VillagePlace-filtering.patch diff --git a/patches/server/0041-Nuke-streams-off-BlockPosition.patch b/patches/server/0040-Nuke-streams-off-BlockPosition.patch similarity index 100% rename from patches/server/0041-Nuke-streams-off-BlockPosition.patch rename to patches/server/0040-Nuke-streams-off-BlockPosition.patch diff --git a/patches/server/0042-Nuke-streams-off-SectionPosition.patch b/patches/server/0041-Nuke-streams-off-SectionPosition.patch similarity index 100% rename from patches/server/0042-Nuke-streams-off-SectionPosition.patch rename to patches/server/0041-Nuke-streams-off-SectionPosition.patch diff --git a/patches/server/0043-Stop-wasting-resources-on-JsonList-get.patch b/patches/server/0042-Stop-wasting-resources-on-JsonList-get.patch similarity index 97% rename from patches/server/0043-Stop-wasting-resources-on-JsonList-get.patch rename to patches/server/0042-Stop-wasting-resources-on-JsonList-get.patch index 9942aa8b..f08591cb 100644 --- a/patches/server/0043-Stop-wasting-resources-on-JsonList-get.patch +++ b/patches/server/0042-Stop-wasting-resources-on-JsonList-get.patch @@ -56,7 +56,7 @@ index 3fb72d6ee587d66a9b7e1dec27fc4f64b82ab4df..596815d70e69fd645bec5b6e8c1ebc7b Throwable throwable = null; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 437698cf4fee266c87eebb8b5f05509b587913e7..01d95a9946a6db0f03e4e1e1eaa66d162ae4c6e8 100644 +index 5760b40bdbee417f5bb5210f1271241ff8f36350..f84bec53b9ed7f8ae4cbb391530dc675f42e2a7a 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -637,6 +637,7 @@ public abstract class PlayerList { diff --git a/patches/server/0044-ProxyForwardDataEvent.patch b/patches/server/0043-ProxyForwardDataEvent.patch similarity index 100% rename from patches/server/0044-ProxyForwardDataEvent.patch rename to patches/server/0043-ProxyForwardDataEvent.patch diff --git a/patches/server/0045-Fix-Unable-to-save-chunk-error.patch b/patches/server/0044-Fix-Unable-to-save-chunk-error.patch similarity index 100% rename from patches/server/0045-Fix-Unable-to-save-chunk-error.patch rename to patches/server/0044-Fix-Unable-to-save-chunk-error.patch diff --git a/patches/server/0046-Fix-LightEngineThreaded-memory-leak.patch b/patches/server/0045-Fix-LightEngineThreaded-memory-leak.patch similarity index 100% rename from patches/server/0046-Fix-LightEngineThreaded-memory-leak.patch rename to patches/server/0045-Fix-LightEngineThreaded-memory-leak.patch diff --git a/patches/server/0047-Respect-PlayerKickEvent-leaveMessage.patch b/patches/server/0046-Respect-PlayerKickEvent-leaveMessage.patch similarity index 97% rename from patches/server/0047-Respect-PlayerKickEvent-leaveMessage.patch rename to patches/server/0046-Respect-PlayerKickEvent-leaveMessage.patch index e83b6476..77d89475 100644 --- a/patches/server/0047-Respect-PlayerKickEvent-leaveMessage.patch +++ b/patches/server/0046-Respect-PlayerKickEvent-leaveMessage.patch @@ -39,7 +39,7 @@ index cb4f173774b46793bc3744cb3242edd9272df463..4fac720564b8687fae59c0f2e4898a48 this.minecraftServer.getPlayerList().sendMessage(CraftChatMessage.fromString(quitMessage)); } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 01d95a9946a6db0f03e4e1e1eaa66d162ae4c6e8..3df9a91c0474df8a2884f4a4ae7d016bd31600e9 100644 +index f84bec53b9ed7f8ae4cbb391530dc675f42e2a7a..7095396f3c92c023111c659986f3fae384a7f9c6 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -500,6 +500,11 @@ public abstract class PlayerList { diff --git a/patches/server/0048-Shutdown-Bootstrap-thread-pool.patch b/patches/server/0047-Shutdown-Bootstrap-thread-pool.patch similarity index 100% rename from patches/server/0048-Shutdown-Bootstrap-thread-pool.patch rename to patches/server/0047-Shutdown-Bootstrap-thread-pool.patch diff --git a/patches/server/0049-Optimize-Villagers.patch b/patches/server/0048-Optimize-Villagers.patch similarity index 100% rename from patches/server/0049-Optimize-Villagers.patch rename to patches/server/0048-Optimize-Villagers.patch diff --git a/patches/server/0050-Fix-villager-dupe.patch b/patches/server/0049-Fix-villager-dupe.patch similarity index 100% rename from patches/server/0050-Fix-villager-dupe.patch rename to patches/server/0049-Fix-villager-dupe.patch diff --git a/patches/server/0051-Optimize-whitelist-command-for-multiple-additions-re.patch b/patches/server/0050-Optimize-whitelist-command-for-multiple-additions-re.patch similarity index 98% rename from patches/server/0051-Optimize-whitelist-command-for-multiple-additions-re.patch rename to patches/server/0050-Optimize-whitelist-command-for-multiple-additions-re.patch index f134d294..eeaa20c6 100644 --- a/patches/server/0051-Optimize-whitelist-command-for-multiple-additions-re.patch +++ b/patches/server/0050-Optimize-whitelist-command-for-multiple-additions-re.patch @@ -111,7 +111,7 @@ index 893d2c1c74ed28dcdb83b71762ccdcbfd50a8f9d..f9e97d28ab182ff1b9e216b2c4516428 private static int b(CommandListenerWrapper commandlistenerwrapper) throws CommandSyntaxException { diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 6ae35c96978b6d16bc45d3eff435f35647fd1555..a64683d1d21c282b249e2dd07cbb497721f1052d 100644 +index 5cf7699f439eb7ef310f0ab02b120836c4a56bfc..9fa597b49f156be49777a5b51e7c231c7728a42f 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -77,6 +77,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -122,7 +122,7 @@ index 6ae35c96978b6d16bc45d3eff435f35647fd1555..a64683d1d21c282b249e2dd07cbb4977 @Override public CraftHumanEntity getBukkitEntity() { -@@ -1892,6 +1893,15 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1883,6 +1884,15 @@ public abstract class EntityHuman extends EntityLiving { return this.getProfile().getName(); } diff --git a/patches/server/0052-PlayerAttackEntityEvent.patch b/patches/server/0051-PlayerAttackEntityEvent.patch similarity index 94% rename from patches/server/0052-PlayerAttackEntityEvent.patch rename to patches/server/0051-PlayerAttackEntityEvent.patch index a64d3c54..46a8efbd 100644 --- a/patches/server/0052-PlayerAttackEntityEvent.patch +++ b/patches/server/0051-PlayerAttackEntityEvent.patch @@ -6,10 +6,10 @@ Subject: [PATCH] PlayerAttackEntityEvent Added per request diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index a64683d1d21c282b249e2dd07cbb497721f1052d..a7758c07270aedabe19dc6b1aa96e58ebe87648b 100644 +index 9fa597b49f156be49777a5b51e7c231c7728a42f..ff6a8473027d82db1fbf3ab18fd0cfe08e2d9d78 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1058,11 +1058,47 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1049,11 +1049,47 @@ public abstract class EntityHuman extends EntityLiving { flag2 = flag2 && !world.paperConfig.disablePlayerCrits; // Paper flag2 = flag2 && !this.isSprinting(); diff --git a/patches/server/0053-Fix-watchdog-termination-hanging-indefinitely.patch b/patches/server/0052-Fix-watchdog-termination-hanging-indefinitely.patch similarity index 100% rename from patches/server/0053-Fix-watchdog-termination-hanging-indefinitely.patch rename to patches/server/0052-Fix-watchdog-termination-hanging-indefinitely.patch diff --git a/patches/server/0054-Add-StructureLocateEvent.patch b/patches/server/0053-Add-StructureLocateEvent.patch similarity index 100% rename from patches/server/0054-Add-StructureLocateEvent.patch rename to patches/server/0053-Add-StructureLocateEvent.patch diff --git a/patches/server/0055-Add-IntelliJ-IDEA-runnable.patch b/patches/server/0054-Add-IntelliJ-IDEA-runnable.patch similarity index 100% rename from patches/server/0055-Add-IntelliJ-IDEA-runnable.patch rename to patches/server/0054-Add-IntelliJ-IDEA-runnable.patch diff --git a/patches/server/0056-Respect-rotation-when-respawning.patch b/patches/server/0055-Respect-rotation-when-respawning.patch similarity index 92% rename from patches/server/0056-Respect-rotation-when-respawning.patch rename to patches/server/0055-Respect-rotation-when-respawning.patch index b69bf876..7d853ac3 100644 --- a/patches/server/0056-Respect-rotation-when-respawning.patch +++ b/patches/server/0055-Respect-rotation-when-respawning.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Respect rotation when respawning diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 3df9a91c0474df8a2884f4a4ae7d016bd31600e9..171aa373e1ecd30211ec04810441c8f9cc1039f7 100644 +index 7095396f3c92c023111c659986f3fae384a7f9c6..31239ca101cf168ce8f7f599c4ab05a389e760db 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -815,7 +815,7 @@ public abstract class PlayerList { diff --git a/patches/server/0057-Fix-merging-spawning-values.patch b/patches/server/0056-Fix-merging-spawning-values.patch similarity index 100% rename from patches/server/0057-Fix-merging-spawning-values.patch rename to patches/server/0056-Fix-merging-spawning-values.patch diff --git a/patches/server/0058-tic-tacs-Threading-Fix.patch b/patches/server/0057-tic-tacs-Threading-Fix.patch similarity index 100% rename from patches/server/0058-tic-tacs-Threading-Fix.patch rename to patches/server/0057-tic-tacs-Threading-Fix.patch diff --git a/patches/server/0059-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch b/patches/server/0058-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch similarity index 100% rename from patches/server/0059-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch rename to patches/server/0058-Fix-IndexOutOfBoundsException-when-sending-too-many-.patch diff --git a/patches/server/0060-Use-faster-block-collision-check-for-entity-suffocat.patch b/patches/server/0059-Use-faster-block-collision-check-for-entity-suffocat.patch similarity index 100% rename from patches/server/0060-Use-faster-block-collision-check-for-entity-suffocat.patch rename to patches/server/0059-Use-faster-block-collision-check-for-entity-suffocat.patch diff --git a/patches/server/0061-Add-nspt-command.patch b/patches/server/0060-Add-nspt-command.patch similarity index 100% rename from patches/server/0061-Add-nspt-command.patch rename to patches/server/0060-Add-nspt-command.patch diff --git a/patches/server/0062-Configurable-flight-checks.patch b/patches/server/0061-Configurable-flight-checks.patch similarity index 100% rename from patches/server/0062-Configurable-flight-checks.patch rename to patches/server/0061-Configurable-flight-checks.patch diff --git a/patches/server/0063-Use-GlueList-as-delegate-for-NonNullList.patch b/patches/server/0062-Use-GlueList-as-delegate-for-NonNullList.patch similarity index 100% rename from patches/server/0063-Use-GlueList-as-delegate-for-NonNullList.patch rename to patches/server/0062-Use-GlueList-as-delegate-for-NonNullList.patch diff --git a/patches/server/0064-Heavily-optimize-recipe-lookups-in-CraftingManager.patch b/patches/server/0063-Heavily-optimize-recipe-lookups-in-CraftingManager.patch similarity index 100% rename from patches/server/0064-Heavily-optimize-recipe-lookups-in-CraftingManager.patch rename to patches/server/0063-Heavily-optimize-recipe-lookups-in-CraftingManager.patch