diff --git a/patches/server/0455-incremental-chunk-saving.patch b/patches/removed/1.17/0455-incremental-chunk-saving.patch similarity index 99% rename from patches/server/0455-incremental-chunk-saving.patch rename to patches/removed/1.17/0455-incremental-chunk-saving.patch index e114a9ace5..26796dc778 100644 --- a/patches/server/0455-incremental-chunk-saving.patch +++ b/patches/removed/1.17/0455-incremental-chunk-saving.patch @@ -3,6 +3,7 @@ From: Shane Freeder Date: Sun, 9 Jun 2019 03:53:22 +0100 Subject: [PATCH] incremental chunk saving +1.17 Update note: Patch has been applied already, needs updating to properly save entities diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java index 2216fc05ef5f1c2f7e4dcab7bb20b9944838c5f4..66c8e729b1e01c0ecf7c7c58bda8e06f202a31fe 100644 diff --git a/patches/server/0499-Incremental-player-saving.patch b/patches/removed/1.17/0499-Incremental-player-saving.patch similarity index 98% rename from patches/server/0499-Incremental-player-saving.patch rename to patches/removed/1.17/0499-Incremental-player-saving.patch index d288885d6f..eecba40662 100644 --- a/patches/server/0499-Incremental-player-saving.patch +++ b/patches/removed/1.17/0499-Incremental-player-saving.patch @@ -3,6 +3,7 @@ From: Aikar Date: Sun, 9 Aug 2020 08:59:25 +0300 Subject: [PATCH] Incremental player saving +1.17 Update note: Patch has been updated already, re-removed temporarily as it depends on 'incremental chunk saving' patch diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java index b67ba8f75e4a3358d7c2462918b85b0bf9b5a922..fdbd8b89bb8bf3b61f60b812b90483c98a3d5ccb 100644 diff --git a/patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0456-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0455-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0457-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/server/0456-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0458-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/server/0457-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0459-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/server/0458-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0460-Fix-sand-duping.patch b/patches/server/0459-Fix-sand-duping.patch similarity index 100% rename from patches/server/0460-Fix-sand-duping.patch rename to patches/server/0459-Fix-sand-duping.patch diff --git a/patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0461-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0460-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0462-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0461-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0463-Expose-Arrow-getItemStack.patch b/patches/server/0462-Expose-Arrow-getItemStack.patch similarity index 100% rename from patches/server/0463-Expose-Arrow-getItemStack.patch rename to patches/server/0462-Expose-Arrow-getItemStack.patch diff --git a/patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0464-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0463-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0465-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0464-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0466-Add-permission-for-command-blocks.patch b/patches/server/0465-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0466-Add-permission-for-command-blocks.patch rename to patches/server/0465-Add-permission-for-command-blocks.patch diff --git a/patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0467-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0466-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch b/patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch similarity index 100% rename from patches/server/0468-Optimize-WorldBorder-collision-checks-and-air.patch rename to patches/server/0467-Optimize-WorldBorder-collision-checks-and-air.patch diff --git a/patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 96% rename from patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index 74c27d6ed9..5c6d630dda 100644 --- a/patches/server/0469-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/server/0468-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -8,10 +8,10 @@ makes it so that the server keeps the last difficulty used instead of restoring the server.properties every single load. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 363dcebb3b2d5a2512776a191f6716ed3d0e8aff..1feda8b44364c748497174944b26abc4f058f354 100644 +index 11dbe48c8a8c29cd28d725c43505e326a6e626ff..f87409af9218e8003da370444ea97695023de439 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1721,11 +1721,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 100) ? 10 : 20; - } +@@ -446,4 +446,9 @@ public class PaperConfig { + config.set("settings.unsupported-settings.allow-headless-pistons-readme", "This setting controls if players should be able to create headless pistons."); + allowHeadlessPistons = getBoolean("settings.unsupported-settings.allow-headless-pistons", false); } + + public static int maxJoinsPerTick; diff --git a/patches/server/0513-Optimize-redstone-algorithm.patch b/patches/server/0511-Optimize-redstone-algorithm.patch similarity index 99% rename from patches/server/0513-Optimize-redstone-algorithm.patch rename to patches/server/0511-Optimize-redstone-algorithm.patch index 0ceaeaa472..88314fe880 100644 --- a/patches/server/0513-Optimize-redstone-algorithm.patch +++ b/patches/server/0511-Optimize-redstone-algorithm.patch @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 2355dd0c75e4981edbb180b65cd12f1d17aa0d26..d25a8965524046ea24dbf5ed2096a5a4c73c0a94 100644 +index f3d98b40b5adb5b6aa76371e9d3eb974b551d4f3..b1ae749b2178dc8c49a7adf4a3e93339d8b99dfb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -43,6 +43,16 @@ public class PaperWorldConfig { diff --git a/patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0512-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0514-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0512-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0513-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0515-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0513-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0516-Fix-CraftTeam-null-check.patch b/patches/server/0514-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0516-Fix-CraftTeam-null-check.patch rename to patches/server/0514-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0517-Add-more-Evoker-API.patch b/patches/server/0515-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0517-Add-more-Evoker-API.patch rename to patches/server/0515-Add-more-Evoker-API.patch diff --git a/patches/server/0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/server/0516-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 100% rename from patches/server/0518-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to patches/server/0516-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch diff --git a/patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0517-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0519-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0517-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0520-Cache-block-data-strings.patch b/patches/server/0518-Cache-block-data-strings.patch similarity index 95% rename from patches/server/0520-Cache-block-data-strings.patch rename to patches/server/0518-Cache-block-data-strings.patch index 90aa71661d..49d39787e1 100644 --- a/patches/server/0520-Cache-block-data-strings.patch +++ b/patches/server/0518-Cache-block-data-strings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Cache block data strings diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1889de77a5e3d9371005b6bd451e2c0e57e96a93..dd51341115450a38ea5b0ea34dbadc2a8e191f60 100644 +index f87409af9218e8003da370444ea97695023de439..c3fc81457b534bf7a41ce2b021790cb3396ea56e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2038,6 +2038,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop cachedSingleHashSet; // Paper boolean needsChunkCenterUpdate; // Paper - no-tick view distance @@ -49,10 +49,10 @@ index f3b7a9203bca8246789b293f0d043a4f253ce57f..52a23465cbb76a164bf2163045d09bde this.connection.disconnect(ichatbasecomponent); }); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 2f73f1f770e5e1fa422bec9c27e5bd10e86b7538..fe548b8625a123798f8d966cb3bffd899971cb34 100644 +index 31dd2c4a41e172c7eeb835ae61a45c954d0e647a..b7e3ed5a6298774a315300daef771f278aa20af7 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -588,7 +588,7 @@ public abstract class PlayerList { +@@ -587,7 +587,7 @@ public abstract class PlayerList { entityplayer.closeContainer(org.bukkit.event.inventory.InventoryCloseEvent.Reason.DISCONNECT); // Paper } diff --git a/patches/server/0551-Seed-based-feature-search.patch b/patches/server/0549-Seed-based-feature-search.patch similarity index 96% rename from patches/server/0551-Seed-based-feature-search.patch rename to patches/server/0549-Seed-based-feature-search.patch index 8ca9e2fdee..0beec6efd0 100644 --- a/patches/server/0551-Seed-based-feature-search.patch +++ b/patches/server/0549-Seed-based-feature-search.patch @@ -21,10 +21,10 @@ changes but this should usually not happen. A config option to disable this completely is added though in case that should ever be necessary. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 81afddeadbece05f3d9ef604a3d2b3cc0a731cde..e3ca2c9d72e16dabd888234d069fbfa21c1d6fa1 100644 +index c484da4558e918c1456588e540a3b34e78581f81..cac404e1c7ede7b1076532555d35e6c18f158b16 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -376,6 +376,14 @@ public class PaperWorldConfig { +@@ -361,6 +361,14 @@ public class PaperWorldConfig { } } diff --git a/patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 98% rename from patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch index 555110f58c..83f41c4939 100644 --- a/patches/server/0552-Add-Wandering-Trader-spawn-rate-config-options.patch +++ b/patches/server/0550-Add-Wandering-Trader-spawn-rate-config-options.patch @@ -11,7 +11,7 @@ in IWorldServerData are removed as they were only used in certain places, with h values used in other places. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e3ca2c9d72e16dabd888234d069fbfa21c1d6fa1..e5effa6c735ac268ee9b5d3428ad42a3618a2fda 100644 +index cac404e1c7ede7b1076532555d35e6c18f158b16..f4b533b8e8b6c4bb59d032e91a94353f4b201b69 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -61,6 +61,19 @@ public class PaperWorldConfig { diff --git a/patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0551-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0553-Significantly-improve-performance-of-the-end-generat.patch rename to patches/server/0551-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0554-Expose-world-spawn-angle.patch b/patches/server/0552-Expose-world-spawn-angle.patch similarity index 93% rename from patches/server/0554-Expose-world-spawn-angle.patch rename to patches/server/0552-Expose-world-spawn-angle.patch index 419b678486..30ed2166d8 100644 --- a/patches/server/0554-Expose-world-spawn-angle.patch +++ b/patches/server/0552-Expose-world-spawn-angle.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose world spawn angle diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index fe548b8625a123798f8d966cb3bffd899971cb34..ce6d9b460f0f55fc6d5544d5c8d2b78e5fcc3937 100644 +index b7e3ed5a6298774a315300daef771f278aa20af7..d8278190323d00c186d81f578f77fa335529baad 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -865,7 +865,7 @@ public abstract class PlayerList { +@@ -864,7 +864,7 @@ public abstract class PlayerList { if (location == null) { worldserver1 = this.server.getLevel(Level.OVERWORLD); blockposition = entityplayer1.getSpawnPoint(worldserver1); diff --git a/patches/server/0555-Add-Destroy-Speed-API.patch b/patches/server/0553-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0555-Add-Destroy-Speed-API.patch rename to patches/server/0553-Add-Destroy-Speed-API.patch diff --git a/patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0556-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0554-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0557-Add-LivingEntity-clearActiveItem.patch b/patches/server/0555-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0557-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0555-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0558-Add-PlayerItemCooldownEvent.patch b/patches/server/0556-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0558-Add-PlayerItemCooldownEvent.patch rename to patches/server/0556-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0559-More-lightning-API.patch b/patches/server/0557-More-lightning-API.patch similarity index 100% rename from patches/server/0559-More-lightning-API.patch rename to patches/server/0557-More-lightning-API.patch diff --git a/patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch index b63dced87b..4b47e8324e 100644 --- a/patches/server/0560-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0558-Climbing-should-not-bypass-cramming-gamerule.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e5effa6c735ac268ee9b5d3428ad42a3618a2fda..e51c66ca0005ecb22ca99d33d2e37900eccf9c73 100644 +index f4b533b8e8b6c4bb59d032e91a94353f4b201b69..5344d25e7bef34954aa058ec019b4ba8ab4de515 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -74,6 +74,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0561-Added-missing-default-perms-for-commands.patch b/patches/server/0559-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0561-Added-missing-default-perms-for-commands.patch rename to patches/server/0559-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0562-Add-PlayerShearBlockEvent.patch b/patches/server/0560-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0562-Add-PlayerShearBlockEvent.patch rename to patches/server/0560-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0561-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0563-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/server/0561-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch similarity index 96% rename from patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch index 67f06078ca..559a2303d4 100644 --- a/patches/server/0564-Fix-curing-zombie-villager-discount-exploit.patch +++ b/patches/server/0562-Fix-curing-zombie-villager-discount-exploit.patch @@ -8,7 +8,7 @@ and curing a villager on repeat by simply resetting the relevant part of the reputation when it is cured. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e51c66ca0005ecb22ca99d33d2e37900eccf9c73..ba39026cc7ba904d6f9d8226fae01943544445e9 100644 +index 5344d25e7bef34954aa058ec019b4ba8ab4de515..cf8bc5432de023968ecdae6e48045c93021ad243 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -79,6 +79,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0565-Limit-recipe-packets.patch b/patches/server/0563-Limit-recipe-packets.patch similarity index 97% rename from patches/server/0565-Limit-recipe-packets.patch rename to patches/server/0563-Limit-recipe-packets.patch index 2843cd99c8..208f8aafb2 100644 --- a/patches/server/0565-Limit-recipe-packets.patch +++ b/patches/server/0563-Limit-recipe-packets.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit recipe packets diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 7d50aded88f5b7dfebaea1aebc86231f7b5c4e25..652d87fc5d566dba8018c81676329f0e0bca471b 100644 +index 649e46115260259820a9d2255ad669b926319a3f..f9d438325aed9d488d8aa60e0ae68a3789ae8c39 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -334,6 +334,13 @@ public class PaperConfig { diff --git a/patches/server/0566-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0564-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0566-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0564-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0567-MC-4-Fix-item-position-desync.patch b/patches/server/0565-MC-4-Fix-item-position-desync.patch similarity index 95% rename from patches/server/0567-MC-4-Fix-item-position-desync.patch rename to patches/server/0565-MC-4-Fix-item-position-desync.patch index 8bffcb67c3..33d1969ff1 100644 --- a/patches/server/0567-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0565-MC-4-Fix-item-position-desync.patch @@ -9,10 +9,10 @@ loss, which forces the server to lose the same precision as the client keeping them in sync. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 652d87fc5d566dba8018c81676329f0e0bca471b..c56e7fb18f9a56c8025eb70a524f028b5942da37 100644 +index f9d438325aed9d488d8aa60e0ae68a3789ae8c39..8900ba1b0aad1c1112bde31dc5b66a96ab24d8e7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java -@@ -474,4 +474,9 @@ public class PaperConfig { +@@ -463,4 +463,9 @@ public class PaperConfig { private static void trackPluginScoreboards() { trackPluginScoreboards = getBoolean("settings.track-plugin-scoreboards", false); } diff --git a/patches/server/0568-Player-Chunk-Load-Unload-Events.patch b/patches/server/0566-Player-Chunk-Load-Unload-Events.patch similarity index 90% rename from patches/server/0568-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0566-Player-Chunk-Load-Unload-Events.patch index 863c2c7671..31fb97f969 100644 --- a/patches/server/0568-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0566-Player-Chunk-Load-Unload-Events.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index dcde52c720334ee647569afa91e50278f919956a..f916b1450fb0c46f6675ff8d1973d95814c980e3 100644 +index a361701e3be790ca7477d178a8fd73f932efe797..28eb1f6e323d50fe8dc0587724ae73c6939f6721 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2065,11 +2065,21 @@ public class ServerPlayer extends Player { +@@ -2064,11 +2064,21 @@ public class ServerPlayer extends Player { public void trackChunk(ChunkPos chunkcoordintpair, Packet packet, Packet packet1) { this.connection.send(packet1); this.connection.send(packet); diff --git a/patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0567-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0569-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0567-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0570-Expose-LivingEntity-hurt-direction.patch b/patches/server/0568-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0570-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0568-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0571-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0569-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0572-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0570-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0573-added-PlayerTradeEvent.patch b/patches/server/0571-added-PlayerTradeEvent.patch similarity index 100% rename from patches/server/0573-added-PlayerTradeEvent.patch rename to patches/server/0571-added-PlayerTradeEvent.patch diff --git a/patches/server/0574-Implement-TargetHitEvent.patch b/patches/server/0572-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0574-Implement-TargetHitEvent.patch rename to patches/server/0572-Implement-TargetHitEvent.patch diff --git a/patches/server/0575-Additional-Block-Material-API-s.patch b/patches/server/0573-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0575-Additional-Block-Material-API-s.patch rename to patches/server/0573-Additional-Block-Material-API-s.patch diff --git a/patches/server/0576-Fix-harming-potion-dupe.patch b/patches/server/0574-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0576-Fix-harming-potion-dupe.patch rename to patches/server/0574-Fix-harming-potion-dupe.patch diff --git a/patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0577-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0575-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0578-Cache-burn-durations.patch b/patches/server/0576-Cache-burn-durations.patch similarity index 100% rename from patches/server/0578-Cache-burn-durations.patch rename to patches/server/0576-Cache-burn-durations.patch diff --git a/patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 95% rename from patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch index 3606c0d287..11b781e1d2 100644 --- a/patches/server/0579-Allow-disabling-mob-spawner-spawn-egg-transformation.patch +++ b/patches/server/0577-Allow-disabling-mob-spawner-spawn-egg-transformation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow disabling mob spawner spawn egg transformation diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ba39026cc7ba904d6f9d8226fae01943544445e9..71774634c4adef5102ba931d88b00c23113cc642 100644 +index cf8bc5432de023968ecdae6e48045c93021ad243..f1cc0579654877fde716a3f99e4ea28044941b4b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -84,6 +84,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0578-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0580-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0578-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0579-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0581-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0579-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0580-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0582-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0580-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0583-Zombie-API-breaking-doors.patch b/patches/server/0581-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0583-Zombie-API-breaking-doors.patch rename to patches/server/0581-Zombie-API-breaking-doors.patch diff --git a/patches/server/0584-Fix-nerfed-slime-when-splitting.patch b/patches/server/0582-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0584-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0582-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0585-Add-EntityLoadCrossbowEvent.patch b/patches/server/0583-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0585-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0583-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0586-Guardian-beam-workaround.patch b/patches/server/0584-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0586-Guardian-beam-workaround.patch rename to patches/server/0584-Guardian-beam-workaround.patch diff --git a/patches/server/0587-Added-WorldGameRuleChangeEvent.patch b/patches/server/0585-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0587-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0585-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0588-Added-ServerResourcesReloadedEvent.patch b/patches/server/0586-Added-ServerResourcesReloadedEvent.patch similarity index 93% rename from patches/server/0588-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0586-Added-ServerResourcesReloadedEvent.patch index 173ddd64aa..fa0d2a543b 100644 --- a/patches/server/0588-Added-ServerResourcesReloadedEvent.patch +++ b/patches/server/0586-Added-ServerResourcesReloadedEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9bd2255d31bcfd4574f8d1caf598f9141aa9e3c1..51bbb11ff8d3da95fa6d9890be3135a34b3eafac 100644 +index 75e4d69e69509a94f0e112fe121369a6f8952ee7..e73c211627f7aa5d6aa5525dba7e9601fbbc6794 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2017,7 +2017,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop completablefuture = CompletableFuture.supplyAsync(() -> { Stream stream = datapacks.stream(); // CraftBukkit - decompile error PackRepository resourcepackrepository = this.packRepository; -@@ -2033,6 +2039,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { this.getServer().execute(() -> { diff --git a/patches/server/0597-Fix-villager-boat-exploit.patch b/patches/server/0595-Fix-villager-boat-exploit.patch similarity index 89% rename from patches/server/0597-Fix-villager-boat-exploit.patch rename to patches/server/0595-Fix-villager-boat-exploit.patch index edc990c633..fb232b2f72 100644 --- a/patches/server/0597-Fix-villager-boat-exploit.patch +++ b/patches/server/0595-Fix-villager-boat-exploit.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix villager boat exploit diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index ce6d9b460f0f55fc6d5544d5c8d2b78e5fcc3937..9a37a962b141e9faecc9f6f4906a9d727d20c20a 100644 +index d8278190323d00c186d81f578f77fa335529baad..eed8b1055c4c5026ebe3ebf1541ac94beda3112e 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -613,6 +613,15 @@ public abstract class PlayerList { +@@ -612,6 +612,15 @@ public abstract class PlayerList { PlayerList.LOGGER.debug("Removing player mount"); entityplayer.stopRiding(); entity.getPassengersAndSelf().forEach((entity1) -> { diff --git a/patches/server/0598-Add-sendOpLevel-API.patch b/patches/server/0596-Add-sendOpLevel-API.patch similarity index 94% rename from patches/server/0598-Add-sendOpLevel-API.patch rename to patches/server/0596-Add-sendOpLevel-API.patch index 3059f7c30d..e113220db2 100644 --- a/patches/server/0598-Add-sendOpLevel-API.patch +++ b/patches/server/0596-Add-sendOpLevel-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 9a37a962b141e9faecc9f6f4906a9d727d20c20a..d01712cad42c078a726d6f757a4d8f0e3f186274 100644 +index eed8b1055c4c5026ebe3ebf1541ac94beda3112e..235c9aef7615948be74b336fd922b80f6b4e6fac 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1113,22 +1113,29 @@ public abstract class PlayerList { +@@ -1112,22 +1112,29 @@ public abstract class PlayerList { } private void sendPlayerPermissionLevel(ServerPlayer player, int permissionLevel) { diff --git a/patches/server/0599-Add-StructureLocateEvent.patch b/patches/server/0597-Add-StructureLocateEvent.patch similarity index 100% rename from patches/server/0599-Add-StructureLocateEvent.patch rename to patches/server/0597-Add-StructureLocateEvent.patch diff --git a/patches/server/0600-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0598-Collision-option-for-requiring-a-player-participant.patch similarity index 98% rename from patches/server/0600-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0598-Collision-option-for-requiring-a-player-participant.patch index e0aaa1a3b4..62ec0515ef 100644 --- a/patches/server/0600-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0598-Collision-option-for-requiring-a-player-participant.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Collision option for requiring a player participant diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 5443d5d924f0dc9cb453f43d79372a31a87cee75..6f28e7d153ad1ccd99bb3cd53a6632caea139414 100644 +index aefc43e5fdcecb268a83a31cb6d4e4c4facebe4d..cc15735a8a63952724facf3e053c6776dc6ad017 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -64,6 +64,18 @@ public class PaperWorldConfig { diff --git a/patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0601-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0599-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0600-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0602-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0600-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0603-Make-schedule-command-per-world.patch b/patches/server/0601-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0603-Make-schedule-command-per-world.patch rename to patches/server/0601-Make-schedule-command-per-world.patch diff --git a/patches/server/0604-Configurable-max-leash-distance.patch b/patches/server/0602-Configurable-max-leash-distance.patch similarity index 94% rename from patches/server/0604-Configurable-max-leash-distance.patch rename to patches/server/0602-Configurable-max-leash-distance.patch index d13c4c4960..0ea9f2b138 100644 --- a/patches/server/0604-Configurable-max-leash-distance.patch +++ b/patches/server/0602-Configurable-max-leash-distance.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Configurable max leash distance diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6f28e7d153ad1ccd99bb3cd53a6632caea139414..7c663f667e7ab1c0b04d4517e0cbd3446847d938 100644 +index cc15735a8a63952724facf3e053c6776dc6ad017..3c1a84a33743b635e789024a5575fbe59b83bfe0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -263,6 +263,12 @@ public class PaperWorldConfig { +@@ -248,6 +248,12 @@ public class PaperWorldConfig { } } diff --git a/patches/server/0605-Implement-BlockPreDispenseEvent.patch b/patches/server/0603-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0605-Implement-BlockPreDispenseEvent.patch rename to patches/server/0603-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0606-Added-Vanilla-Entity-Tags.patch b/patches/server/0604-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from patches/server/0606-Added-Vanilla-Entity-Tags.patch rename to patches/server/0604-Added-Vanilla-Entity-Tags.patch diff --git a/patches/server/0607-added-Wither-API.patch b/patches/server/0605-added-Wither-API.patch similarity index 100% rename from patches/server/0607-added-Wither-API.patch rename to patches/server/0605-added-Wither-API.patch diff --git a/patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0608-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0606-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0609-Fix-console-spam-when-removing-chests-in-water.patch b/patches/server/0607-Fix-console-spam-when-removing-chests-in-water.patch similarity index 100% rename from patches/server/0609-Fix-console-spam-when-removing-chests-in-water.patch rename to patches/server/0607-Fix-console-spam-when-removing-chests-in-water.patch diff --git a/patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0608-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 92% rename from patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0608-Add-toggle-for-always-placing-the-dragon-egg.patch index 5bbe45027f..26135b7e1d 100644 --- a/patches/server/0610-Add-toggle-for-always-placing-the-dragon-egg.patch +++ b/patches/server/0608-Add-toggle-for-always-placing-the-dragon-egg.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for always placing the dragon egg diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7c663f667e7ab1c0b04d4517e0cbd3446847d938..ef8906762b0bb95399fe57a8b8efb282a3c26020 100644 +index 3c1a84a33743b635e789024a5575fbe59b83bfe0..5e24a7eb6108dbec54192874e9d8fb292d73fbb6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -755,5 +755,10 @@ public class PaperWorldConfig { +@@ -740,5 +740,10 @@ public class PaperWorldConfig { private void perPlayerMobSpawns() { perPlayerMobSpawns = getBoolean("per-player-mob-spawns", false); } diff --git a/patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0609-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0611-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0609-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0610-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0612-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0610-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch b/patches/server/0611-Skip-distance-map-update-when-spawning-disabled.patch similarity index 87% rename from patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch rename to patches/server/0611-Skip-distance-map-update-when-spawning-disabled.patch index 55cd4d6540..2df4e684e4 100644 --- a/patches/server/0613-Skip-distance-map-update-when-spawning-disabled.patch +++ b/patches/server/0611-Skip-distance-map-update-when-spawning-disabled.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Skip distance map update when spawning disabled. diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 094c07c3208b0c05f918b7ee19f1d5b9ceeece47..40f0af6a3c27927c2a2bde00e94e24000a4d54f7 100644 +index e46ccbca0cfa63dd5143080375193a95a9249d60..71b90decb77dbc5a5e0b491db72ca7a239deff2a 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -@@ -779,7 +779,7 @@ public class ServerChunkCache extends ChunkSource { +@@ -770,7 +770,7 @@ public class ServerChunkCache extends ChunkSource { int l = this.distanceManager.getNaturalSpawnChunkCount(); // Paper start - per player mob spawning NaturalSpawner.SpawnState spawnercreature_d; // moved down diff --git a/patches/server/0614-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0612-Reset-shield-blocking-on-dimension-change.patch similarity index 83% rename from patches/server/0614-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0612-Reset-shield-blocking-on-dimension-change.patch index a294b0525e..43310e7206 100644 --- a/patches/server/0614-Reset-shield-blocking-on-dimension-change.patch +++ b/patches/server/0612-Reset-shield-blocking-on-dimension-change.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Reset shield blocking on dimension change diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f916b1450fb0c46f6675ff8d1973d95814c980e3..c17637e5796fda8632c2fe399dbcd63fafa4133e 100644 +index 28eb1f6e323d50fe8dc0587724ae73c6939f6721..547f4fe601d5846e339aba23fb20f6684c0e901f 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1117,6 +1117,11 @@ public class ServerPlayer extends Player { +@@ -1116,6 +1116,11 @@ public class ServerPlayer extends Player { this.level.getCraftServer().getPluginManager().callEvent(changeEvent); // CraftBukkit end } diff --git a/patches/server/0615-add-DragonEggFormEvent.patch b/patches/server/0613-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0615-add-DragonEggFormEvent.patch rename to patches/server/0613-add-DragonEggFormEvent.patch diff --git a/patches/server/0616-EntityMoveEvent.patch b/patches/server/0614-EntityMoveEvent.patch similarity index 93% rename from patches/server/0616-EntityMoveEvent.patch rename to patches/server/0614-EntityMoveEvent.patch index 5f445a6e26..53cd1898ac 100644 --- a/patches/server/0616-EntityMoveEvent.patch +++ b/patches/server/0614-EntityMoveEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 51bbb11ff8d3da95fa6d9890be3135a34b3eafac..c8213692e658f6eb82d3bd843b9525ff6565cc81 100644 +index e73c211627f7aa5d6aa5525dba7e9601fbbc6794..d66d93c0eb5a26b61821029f9c470a73e6a0ca93 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1524,6 +1524,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0; // Paper @@ -17,7 +17,7 @@ index 51bbb11ff8d3da95fa6d9890be3135a34b3eafac..c8213692e658f6eb82d3bd843b9525ff this.profiler.push(() -> { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index bbdabc00ea2ca0db7fd50ddb4ecd3e14661199f3..e5e2beb8be3976a3f6dfa55e3398d80d84a7fd44 100644 +index 520db20a1589a2f82c7fa5aa65b3b040af270c0b..6e510a168316d615122aa12b1453bed6e185c041 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -200,6 +200,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl diff --git a/patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0615-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 82% rename from patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0615-added-option-to-disable-pathfinding-updates-on-block.patch index 71ede24461..27344cdd5c 100644 --- a/patches/server/0617-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0615-added-option-to-disable-pathfinding-updates-on-block.patch @@ -5,10 +5,10 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ef8906762b0bb95399fe57a8b8efb282a3c26020..56fb03d950a7a12f2758421ca2b2204eb3aff563 100644 +index 5e24a7eb6108dbec54192874e9d8fb292d73fbb6..25a284491e5029ecf8d574ca821d18a6c06fa1d8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -@@ -760,5 +760,10 @@ public class PaperWorldConfig { +@@ -745,5 +745,10 @@ public class PaperWorldConfig { private void enderDragonsDeathAlwaysPlacesDragonEgg() { enderDragonsDeathAlwaysPlacesDragonEgg = getBoolean("ender-dragons-death-always-places-dragon-egg", enderDragonsDeathAlwaysPlacesDragonEgg); } @@ -20,10 +20,10 @@ index ef8906762b0bb95399fe57a8b8efb282a3c26020..56fb03d950a7a12f2758421ca2b2204e } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index e5e2beb8be3976a3f6dfa55e3398d80d84a7fd44..9a8b3647c161be8d8b87df8fff3b2d204dab6a8b 100644 +index 6e510a168316d615122aa12b1453bed6e185c041..344c6d6dd99819ac1103c065b0410bafb3537581 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1366,6 +1366,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl +@@ -1334,6 +1334,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl @Override public void sendBlockUpdated(BlockPos pos, BlockState oldState, BlockState newState, int flags) { this.getChunkSource().blockChanged(pos); @@ -31,7 +31,7 @@ index e5e2beb8be3976a3f6dfa55e3398d80d84a7fd44..9a8b3647c161be8d8b87df8fff3b2d20 VoxelShape voxelshape = oldState.getCollisionShape(this, pos); VoxelShape voxelshape1 = newState.getCollisionShape(this, pos); -@@ -1393,6 +1394,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl +@@ -1361,6 +1362,7 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl } } diff --git a/patches/server/0618-Inline-shift-direction-fields.patch b/patches/server/0616-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0618-Inline-shift-direction-fields.patch rename to patches/server/0616-Inline-shift-direction-fields.patch diff --git a/patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0617-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0619-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0617-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0618-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0620-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0618-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0621-living-entity-allow-attribute-registration.patch b/patches/server/0619-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0621-living-entity-allow-attribute-registration.patch rename to patches/server/0619-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0622-fix-dead-slime-setSize-invincibility.patch b/patches/server/0620-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0622-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0620-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0621-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0623-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0621-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0624-misc-debugging-dumps.patch b/patches/server/0622-misc-debugging-dumps.patch similarity index 93% rename from patches/server/0624-misc-debugging-dumps.patch rename to patches/server/0622-misc-debugging-dumps.patch index 5e9c0b75bf..5a04da65b1 100644 --- a/patches/server/0624-misc-debugging-dumps.patch +++ b/patches/server/0622-misc-debugging-dumps.patch @@ -29,10 +29,10 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c8213692e658f6eb82d3bd843b9525ff6565cc81..f1c1d715d509aeb13e465cd57a82896db6c51838 100644 +index d66d93c0eb5a26b61821029f9c470a73e6a0ca93..ed0e697e290ea6504ba337763aabc8c689a44523 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -913,6 +913,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0.0F) { diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 8d52041f8afa065516289cdbf41c373a2529e7f2..22df6afd5f915665d26488e80f730112c9800a91 100644 +index 2f07e0b17ac1593473e64212889170f50e7845d5..accd579a4122760b84dec48ec165ce113fb9de57 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -799,6 +799,12 @@ public abstract class PlayerList { +@@ -798,6 +798,12 @@ public abstract class PlayerList { } public ServerPlayer moveToWorld(ServerPlayer entityplayer, ServerLevel worldserver, boolean flag, Location location, boolean avoidSuffocation) { @@ -34,7 +34,7 @@ index 8d52041f8afa065516289cdbf41c373a2529e7f2..22df6afd5f915665d26488e80f730112 entityplayer.stopRiding(); // CraftBukkit this.players.remove(entityplayer); this.playersByName.remove(entityplayer.getScoreboardName().toLowerCase(java.util.Locale.ROOT)); // Spigot -@@ -889,7 +895,7 @@ public abstract class PlayerList { +@@ -888,7 +894,7 @@ public abstract class PlayerList { } Player respawnPlayer = this.cserver.getPlayer(entityplayer1); diff --git a/patches/server/0668-Add-Channel-initialization-listeners.patch b/patches/server/0666-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0668-Add-Channel-initialization-listeners.patch rename to patches/server/0666-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0669-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0667-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0669-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0667-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0670-Add-more-WanderingTrader-API.patch b/patches/server/0668-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0670-Add-more-WanderingTrader-API.patch rename to patches/server/0668-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0671-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0669-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0671-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0669-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0672-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0670-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0673-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0671-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0674-Inventory-close.patch b/patches/server/0672-Inventory-close.patch similarity index 100% rename from patches/server/0674-Inventory-close.patch rename to patches/server/0672-Inventory-close.patch diff --git a/patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch similarity index 94% rename from patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch index 38f91a6f8b..4f809295ff 100644 --- a/patches/server/0675-call-PortalCreateEvent-players-and-end-platform.patch +++ b/patches/server/0673-call-PortalCreateEvent-players-and-end-platform.patch @@ -17,10 +17,10 @@ index 8f0cf4297015f3cbe709e2eb82280cac72489925..22ea0da3836b61bb018ae974d2b8c754 return this.set(this.getX() + dx, this.getY() + dy, this.getZ() + dz); } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c17637e5796fda8632c2fe399dbcd63fafa4133e..23be74285d0756b5020130289c43140c1cdaa90a 100644 +index 547f4fe601d5846e339aba23fb20f6684c0e901f..9a776f228891f256876dc0acba403dedddbbd5df 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1144,15 +1144,21 @@ public class ServerPlayer extends Player { +@@ -1143,15 +1143,21 @@ public class ServerPlayer extends Player { private void createEndPlatform(ServerLevel world, BlockPos centerPos) { BlockPos.MutableBlockPos blockposition_mutableblockposition = centerPos.mutable(); diff --git a/patches/server/0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0676-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0674-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0677-Fix-CraftPotionBrewer-cache.patch b/patches/server/0675-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0677-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0675-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0678-Add-basic-Datapack-API.patch b/patches/server/0676-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0678-Add-basic-Datapack-API.patch rename to patches/server/0676-Add-basic-Datapack-API.patch diff --git a/patches/server/0679-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0677-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0679-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0677-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch similarity index 96% rename from patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch index d168da32c8..ba82d83519 100644 --- a/patches/server/0680-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0678-additions-to-PlayerGameModeChangeEvent.patch @@ -45,10 +45,10 @@ index d75f78d2e3fb1376e8f6a8668c98a04a693c99e1..79f6089b934124c3309c6bee2e48b36b } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 23be74285d0756b5020130289c43140c1cdaa90a..f170a80e9461945a0f745fe62590d84b34804864 100644 +index 9a776f228891f256876dc0acba403dedddbbd5df..d23a86e6896cefea9eba0e354b25eaaffa09fa8c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1761,8 +1761,15 @@ public class ServerPlayer extends Player { +@@ -1760,8 +1760,15 @@ public class ServerPlayer extends Player { } public boolean setGameMode(GameType gameMode) { @@ -66,7 +66,7 @@ index 23be74285d0756b5020130289c43140c1cdaa90a..f170a80e9461945a0f745fe62590d84b } else { this.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.CHANGE_GAME_MODE, (float) gameMode.getId())); if (gameMode == GameType.SPECTATOR) { -@@ -1774,7 +1781,7 @@ public class ServerPlayer extends Player { +@@ -1773,7 +1780,7 @@ public class ServerPlayer extends Player { this.onUpdateAbilities(); this.updateEffectVisibility(); @@ -75,7 +75,7 @@ index 23be74285d0756b5020130289c43140c1cdaa90a..f170a80e9461945a0f745fe62590d84b } } -@@ -2156,6 +2163,14 @@ public class ServerPlayer extends Player { +@@ -2155,6 +2162,14 @@ public class ServerPlayer extends Player { } public void loadGameTypes(@Nullable CompoundTag nbt) { diff --git a/patches/server/0681-Clear-SyncLoadInfo.patch b/patches/server/0679-Clear-SyncLoadInfo.patch similarity index 100% rename from patches/server/0681-Clear-SyncLoadInfo.patch rename to patches/server/0679-Clear-SyncLoadInfo.patch diff --git a/patches/server/0682-ItemStack-repair-check-API.patch b/patches/server/0680-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0682-ItemStack-repair-check-API.patch rename to patches/server/0680-ItemStack-repair-check-API.patch diff --git a/patches/server/0683-More-Enchantment-API.patch b/patches/server/0681-More-Enchantment-API.patch similarity index 100% rename from patches/server/0683-More-Enchantment-API.patch rename to patches/server/0681-More-Enchantment-API.patch diff --git a/patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0684-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/server/0682-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0685-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0683-Fix-and-optimise-world-force-upgrading.patch similarity index 98% rename from patches/server/0685-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0683-Fix-and-optimise-world-force-upgrading.patch index 3b245a1442..410e1b01dc 100644 --- a/patches/server/0685-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0683-Fix-and-optimise-world-force-upgrading.patch @@ -263,10 +263,10 @@ index cf0a74b8a1c31d4bc493eb09a69ee2bd94cb6485..6fa1a7da70896d0ff34d38698769195a Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, worlds, eraseCache); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 73ac55de9059a1d0f1da5bec0688dcd4bf5c8973..db2d6e7b2dc82c60d524dd2a018d28c2068552fa 100644 +index 8ab99b04ef3e85b64ea78680aa85df1a0894399f..43f9143e892111aa9901454b3de7b57945ecb707 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -563,13 +563,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop