diff --git a/patches/removed/1.19/0435-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/removed/1.19/0435-Fix-missing-chunks-due-to-integer-overflow.patch deleted file mode 100644 index fdc884fe39..0000000000 --- a/patches/removed/1.19/0435-Fix-missing-chunks-due-to-integer-overflow.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: David Slovikosky -Date: Tue, 9 Jun 2020 00:10:03 -0700 -Subject: [PATCH] Fix missing chunks due to integer overflow - -1.19: Either no longer needed or has to take a very different form -MM - -This patch fixes a bug in the WorldChunkManagerTheEnd class where the distance -from 0,0 squared overflows the maximum size of an integer. The overflow leads -to hard chunk borders around 370,000 blocks from 0,0. After this cutoff there -is a few hundred thousand block gap before end land resuming to generate at -530,000 blocks from spawn. This is due to the integer flipping back and forth. - -The fix for the issue is quite simple, casting chunk coordinates to longs -allows the distance calculation to avoid overflow and work as intended. - -diff --git a/src/main/java/net/minecraft/world/level/biome/TheEndBiomeSource.java b/src/main/java/net/minecraft/world/level/biome/TheEndBiomeSource.java -index bbb43461ad899aae2212c32a9e839c766b3b8e37..3f9127f93c9720c89b578d36a1bcdb89fc01222a 100644 ---- a/src/main/java/net/minecraft/world/level/biome/TheEndBiomeSource.java -+++ b/src/main/java/net/minecraft/world/level/biome/TheEndBiomeSource.java -@@ -84,7 +84,7 @@ public class TheEndBiomeSource extends BiomeSource { - int l = j / 2; - int m = i % 2; - int n = j % 2; -- float f = 100.0F - Mth.sqrt((float)(i * i + j * j)) * 8.0F; -+ float f = 100.0F - Mth.sqrt((long) i * (long) i + (long) j * (long) j) * 8.0F; // Paper - cast ints to long to avoid integer overflow - f = Mth.clamp(f, -100.0F, 80.0F); - - for(int o = -12; o <= 12; ++o) { diff --git a/patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch new file mode 100644 index 0000000000..0e0c63f689 --- /dev/null +++ b/patches/server/0435-Fix-missing-chunks-due-to-integer-overflow.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: David Slovikosky +Date: Tue, 9 Jun 2020 00:10:03 -0700 +Subject: [PATCH] Fix missing chunks due to integer overflow + +This patch fixes a bug in the WorldChunkManagerTheEnd class where the distance +from 0,0 squared overflows the maximum size of an integer. The overflow leads +to hard chunk borders around 370,000 blocks from 0,0. After this cutoff there +is a few hundred thousand block gap before end land resuming to generate at +530,000 blocks from spawn. This is due to the integer flipping back and forth. + +The fix for the issue is quite simple, casting chunk coordinates to longs +allows the distance calculation to avoid overflow and work as intended. + +This issue is being tracked in Mojira ticket MC-159283 + +diff --git a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java +index 8a5826d80f9275de1a2a6a2e23369dd1920f560f..6825feea42667a0f14c4c730e5f1ac970c654c56 100644 +--- a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java ++++ b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java +@@ -501,7 +501,7 @@ public final class DensityFunctions { + int l = j / 2; + int m = i % 2; + int n = j % 2; +- float f = 100.0F - Mth.sqrt((float)(i * i + j * j)) * 8.0F; ++ float f = 100.0F - Mth.sqrt((long) i * (long) i + (long) j * (long) j) * 8.0F; // Paper - cast ints to long to avoid integer overflow + f = Mth.clamp(f, -100.0F, 80.0F); + + for(int o = -12; o <= 12; ++o) { diff --git a/patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/server/0436-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0435-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/server/0436-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0437-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0436-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/server/0437-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0437-Improve-Arrow-API.patch b/patches/server/0438-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0437-Improve-Arrow-API.patch rename to patches/server/0438-Improve-Arrow-API.patch diff --git a/patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/server/0439-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0438-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/server/0439-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0440-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0439-Hide-sync-chunk-writes-behind-flag.patch rename to patches/server/0440-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0440-Add-permission-for-command-blocks.patch b/patches/server/0441-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0440-Add-permission-for-command-blocks.patch rename to patches/server/0441-Add-permission-for-command-blocks.patch diff --git a/patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/server/0442-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0441-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/server/0442-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0443-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0442-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/server/0443-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0443-Paper-dumpitem-command.patch b/patches/server/0444-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0443-Paper-dumpitem-command.patch rename to patches/server/0444-Paper-dumpitem-command.patch diff --git a/patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch b/patches/server/0445-Don-t-allow-null-UUID-s-for-chat.patch similarity index 100% rename from patches/server/0444-Don-t-allow-null-UUID-s-for-chat.patch rename to patches/server/0445-Don-t-allow-null-UUID-s-for-chat.patch diff --git a/patches/server/0445-Improve-Legacy-Component-serialization-size.patch b/patches/server/0446-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0445-Improve-Legacy-Component-serialization-size.patch rename to patches/server/0446-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0446-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0447-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0446-Optimize-Bit-Operations-by-inlining.patch rename to patches/server/0447-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0448-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0447-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/server/0448-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0448-incremental-chunk-and-player-saving.patch b/patches/server/0449-incremental-chunk-and-player-saving.patch similarity index 99% rename from patches/server/0448-incremental-chunk-and-player-saving.patch rename to patches/server/0449-incremental-chunk-and-player-saving.patch index bb234c64b0..9106dfd98a 100644 --- a/patches/server/0448-incremental-chunk-and-player-saving.patch +++ b/patches/server/0449-incremental-chunk-and-player-saving.patch @@ -24,7 +24,7 @@ index c639557108ad9c59ccdd0b543b5507fbab1e0fa4..5e531f9fc67bd3092b39f1d3b46b9490 + } } diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 7839ee18955725463fa420a19927019f9814ee24..536fc6bf1451ea84af6084b1976eee32bf328ab0 100644 +index ac7f270f8726bf770f90d9242132ef1d90f3c390..72f622f79d8cc16c4abce1730811770cb793d9b2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -74,6 +74,21 @@ public class PaperWorldConfig { diff --git a/patches/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/server/0450-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0449-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/server/0450-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0450-Support-old-UUID-format-for-NBT.patch b/patches/server/0451-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0450-Support-old-UUID-format-for-NBT.patch rename to patches/server/0451-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0451-Clean-up-duplicated-GameProfile-Properties.patch b/patches/server/0452-Clean-up-duplicated-GameProfile-Properties.patch similarity index 96% rename from patches/server/0451-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/server/0452-Clean-up-duplicated-GameProfile-Properties.patch index a5fb33331c..c742d4af9a 100644 --- a/patches/server/0451-Clean-up-duplicated-GameProfile-Properties.patch +++ b/patches/server/0452-Clean-up-duplicated-GameProfile-Properties.patch @@ -9,7 +9,7 @@ growing to large sizes and preventing login. This now automatically cleans up the extra properties. diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java -index 07abc6f2edab5a5750199dd9c24b890becc4d073..2cb1c1475c6917a0fae498fdd2c3c9eb7927438c 100644 +index 73ee50e05a1c8d432d9967d4e879b5bb373740ad..5dda064813a0eb00438a7df909d51a4b2d48942e 100644 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java @@ -92,7 +92,8 @@ public final class NbtUtils { diff --git a/patches/server/0452-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0453-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0452-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/server/0453-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0453-Remove-some-streams-from-structures.patch b/patches/server/0454-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0453-Remove-some-streams-from-structures.patch rename to patches/server/0454-Remove-some-streams-from-structures.patch diff --git a/patches/server/0454-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0455-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0454-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/server/0455-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0455-Support-components-in-ItemMeta.patch b/patches/server/0456-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0455-Support-components-in-ItemMeta.patch rename to patches/server/0456-Support-components-in-ItemMeta.patch diff --git a/patches/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch b/patches/server/0457-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch similarity index 100% rename from patches/server/0456-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch rename to patches/server/0457-Improve-EntityTargetLivingEntityEvent-for-1.16-mobs.patch diff --git a/patches/server/0457-Add-entity-liquid-API.patch b/patches/server/0458-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0457-Add-entity-liquid-API.patch rename to patches/server/0458-Add-entity-liquid-API.patch diff --git a/patches/server/0458-Update-itemstack-legacy-name-and-lore.patch b/patches/server/0459-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0458-Update-itemstack-legacy-name-and-lore.patch rename to patches/server/0459-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0459-Spawn-player-in-correct-world-on-login.patch b/patches/server/0460-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0459-Spawn-player-in-correct-world-on-login.patch rename to patches/server/0460-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0460-Add-PrepareResultEvent.patch b/patches/server/0461-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0460-Add-PrepareResultEvent.patch rename to patches/server/0461-Add-PrepareResultEvent.patch diff --git a/patches/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0462-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0461-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/server/0462-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch b/patches/server/0463-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch similarity index 100% rename from patches/server/0462-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch rename to patches/server/0463-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch diff --git a/patches/server/0463-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0464-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0463-Optimize-NetworkManager-Exception-Handling.patch rename to patches/server/0464-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch b/patches/server/0465-Optimize-the-advancement-data-player-iteration-to-be.patch similarity index 100% rename from patches/server/0464-Optimize-the-advancement-data-player-iteration-to-be.patch rename to patches/server/0465-Optimize-the-advancement-data-player-iteration-to-be.patch diff --git a/patches/server/0465-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0466-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0465-Fix-arrows-never-despawning-MC-125757.patch rename to patches/server/0466-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0467-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0466-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/server/0467-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0467-Fix-SPIGOT-5989.patch b/patches/server/0468-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0467-Fix-SPIGOT-5989.patch rename to patches/server/0468-Fix-SPIGOT-5989.patch diff --git a/patches/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0469-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0468-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/server/0469-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0470-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0469-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/server/0470-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0471-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0470-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/server/0471-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch b/patches/server/0472-Add-missing-strikeLighting-call-to-World-spigot-stri.patch similarity index 100% rename from patches/server/0471-Add-missing-strikeLighting-call-to-World-spigot-stri.patch rename to patches/server/0472-Add-missing-strikeLighting-call-to-World-spigot-stri.patch diff --git a/patches/server/0472-Fix-some-rails-connecting-improperly.patch b/patches/server/0473-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0472-Fix-some-rails-connecting-improperly.patch rename to patches/server/0473-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0474-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0473-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/server/0474-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0475-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0474-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/server/0475-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0475-Brand-support.patch b/patches/server/0476-Brand-support.patch similarity index 97% rename from patches/server/0475-Brand-support.patch rename to patches/server/0476-Brand-support.patch index 57487cc307..cae1e4ec13 100644 --- a/patches/server/0475-Brand-support.patch +++ b/patches/server/0476-Brand-support.patch @@ -56,7 +56,7 @@ index fdf77097cff7c3af87e390b0bfd9e8aadf7c55ec..5c00238e29cfd6ed107e3bf988a9ac2e return (!this.player.joining && !this.connection.isConnected()) || this.processedDisconnect; // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index eb6834639a434fd7938b071243fb64ab2205593f..a201182e05004a08225ac4e9f5bdf75aa46d59c9 100644 +index 55f7bf62671d55cf967b55ae7233b6caa735f3af..7d70233cf3e9b63f9d1a307aa690fadbaef80993 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2692,6 +2692,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0476-Add-setMaxPlayers-API.patch b/patches/server/0477-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0476-Add-setMaxPlayers-API.patch rename to patches/server/0477-Add-setMaxPlayers-API.patch diff --git a/patches/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0478-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0477-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/server/0478-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0478-Don-t-require-FACING-data.patch b/patches/server/0479-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0478-Don-t-require-FACING-data.patch rename to patches/server/0479-Don-t-require-FACING-data.patch diff --git a/patches/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0480-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0479-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0480-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0480-Add-moon-phase-API.patch b/patches/server/0481-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0480-Add-moon-phase-API.patch rename to patches/server/0481-Add-moon-phase-API.patch diff --git a/patches/server/0481-Improve-Chunk-Status-Transition-Speed.patch b/patches/server/0482-Improve-Chunk-Status-Transition-Speed.patch similarity index 100% rename from patches/server/0481-Improve-Chunk-Status-Transition-Speed.patch rename to patches/server/0482-Improve-Chunk-Status-Transition-Speed.patch diff --git a/patches/server/0482-Prevent-headless-pistons-from-being-created.patch b/patches/server/0483-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0482-Prevent-headless-pistons-from-being-created.patch rename to patches/server/0483-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0483-Add-BellRingEvent.patch b/patches/server/0484-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0483-Add-BellRingEvent.patch rename to patches/server/0484-Add-BellRingEvent.patch diff --git a/patches/server/0484-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0485-Add-zombie-targets-turtle-egg-config.patch similarity index 95% rename from patches/server/0484-Add-zombie-targets-turtle-egg-config.patch rename to patches/server/0485-Add-zombie-targets-turtle-egg-config.patch index 4d7dac06df..a878f73986 100644 --- a/patches/server/0484-Add-zombie-targets-turtle-egg-config.patch +++ b/patches/server/0485-Add-zombie-targets-turtle-egg-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add zombie targets turtle egg config diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 536fc6bf1451ea84af6084b1976eee32bf328ab0..12a77caa7899bc6d000d48d13a504476c3f125ab 100644 +index 72f622f79d8cc16c4abce1730811770cb793d9b2..5c8891025c03ff5507a5f677ffe320689e3672fc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -68,6 +68,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0485-Buffer-joins-to-world.patch b/patches/server/0486-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0485-Buffer-joins-to-world.patch rename to patches/server/0486-Buffer-joins-to-world.patch diff --git a/patches/server/0486-Eigencraft-redstone-implementation.patch b/patches/server/0487-Eigencraft-redstone-implementation.patch similarity index 99% rename from patches/server/0486-Eigencraft-redstone-implementation.patch rename to patches/server/0487-Eigencraft-redstone-implementation.patch index 0b485a16b6..576bbd70cf 100644 --- a/patches/server/0486-Eigencraft-redstone-implementation.patch +++ b/patches/server/0487-Eigencraft-redstone-implementation.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 12a77caa7899bc6d000d48d13a504476c3f125ab..34754f8d3cc03a93d148d026780eacc7dc0a20e0 100644 +index 5c8891025c03ff5507a5f677ffe320689e3672fc..fbc909e383a43df7cff4de657cab654d79c6648f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -73,6 +73,40 @@ public class PaperWorldConfig { diff --git a/patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0488-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0487-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/server/0488-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/server/0489-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0488-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/server/0489-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0489-Fix-CraftTeam-null-check.patch b/patches/server/0490-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0489-Fix-CraftTeam-null-check.patch rename to patches/server/0490-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0490-Add-more-Evoker-API.patch b/patches/server/0491-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0490-Add-more-Evoker-API.patch rename to patches/server/0491-Add-more-Evoker-API.patch diff --git a/patches/server/0491-Add-methods-to-get-translation-keys.patch b/patches/server/0492-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0491-Add-methods-to-get-translation-keys.patch rename to patches/server/0492-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0493-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0492-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/server/0493-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0493-Cache-block-data-strings.patch b/patches/server/0494-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0493-Cache-block-data-strings.patch rename to patches/server/0494-Cache-block-data-strings.patch diff --git a/patches/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0495-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0494-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/server/0495-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0495-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0496-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0495-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/server/0496-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0497-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0496-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/server/0497-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0498-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0497-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/server/0498-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/patches/server/0499-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from patches/server/0498-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to patches/server/0499-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/patches/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0500-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0499-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/server/0500-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0500-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0501-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0500-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/server/0501-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0501-Entity-isTicking.patch b/patches/server/0502-Entity-isTicking.patch similarity index 100% rename from patches/server/0501-Entity-isTicking.patch rename to patches/server/0502-Entity-isTicking.patch diff --git a/patches/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0503-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0502-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/server/0503-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0504-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0503-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/server/0504-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0505-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0504-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/server/0505-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0506-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0505-Fix-for-large-move-vectors-crashing-server.patch rename to patches/server/0506-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0506-Optimise-getType-calls.patch b/patches/server/0507-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0506-Optimise-getType-calls.patch rename to patches/server/0507-Optimise-getType-calls.patch diff --git a/patches/server/0507-Villager-resetOffers.patch b/patches/server/0508-Villager-resetOffers.patch similarity index 100% rename from patches/server/0507-Villager-resetOffers.patch rename to patches/server/0508-Villager-resetOffers.patch diff --git a/patches/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch b/patches/server/0509-Improve-inlinig-for-some-hot-IBlockData-methods.patch similarity index 100% rename from patches/server/0508-Improve-inlinig-for-some-hot-IBlockData-methods.patch rename to patches/server/0509-Improve-inlinig-for-some-hot-IBlockData-methods.patch diff --git a/patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0510-Retain-block-place-order-when-capturing-blockstates.patch similarity index 93% rename from patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/server/0510-Retain-block-place-order-when-capturing-blockstates.patch index 15595f1fa8..d4458f2e51 100644 --- a/patches/server/0509-Retain-block-place-order-when-capturing-blockstates.patch +++ b/patches/server/0510-Retain-block-place-order-when-capturing-blockstates.patch @@ -10,7 +10,7 @@ In general, look at making this logic more robust (i.e properly handling cases where a captured entry is overriden) - but for now this will do. diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index b1cd5781620514533cf0f4d3c518ad461f98f23b..23ae163fa08311d2b41dfeafd9df32bebcc04152 100644 +index 98831768a820be4d341a9108c50636ed48816917..c2315b4eb3d62c01f117e4f00b2280114f0945f9 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -155,7 +155,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0511-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0510-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/server/0511-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0511-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0512-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0511-Fix-item-locations-dropped-from-campfires.patch rename to patches/server/0512-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0512-Player-elytra-boost-API.patch b/patches/server/0513-Player-elytra-boost-API.patch similarity index 94% rename from patches/server/0512-Player-elytra-boost-API.patch rename to patches/server/0513-Player-elytra-boost-API.patch index 7ca27969c8..0540efb765 100644 --- a/patches/server/0512-Player-elytra-boost-API.patch +++ b/patches/server/0513-Player-elytra-boost-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index a201182e05004a08225ac4e9f5bdf75aa46d59c9..89e0bbba593ad0dad2332758ad8df43095955b07 100644 +index 7d70233cf3e9b63f9d1a307aa690fadbaef80993..635b182bb6a4831c457558c629afd7a34db4160e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -592,6 +592,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0513-Fixed-TileEntityBell-memory-leak.patch b/patches/server/0514-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0513-Fixed-TileEntityBell-memory-leak.patch rename to patches/server/0514-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0515-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0514-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/server/0515-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0515-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0516-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0515-Add-getOfflinePlayerIfCached-String.patch rename to patches/server/0516-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0516-Add-ignore-discounts-API.patch b/patches/server/0517-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0516-Add-ignore-discounts-API.patch rename to patches/server/0517-Add-ignore-discounts-API.patch diff --git a/patches/server/0517-Toggle-for-removing-existing-dragon.patch b/patches/server/0518-Toggle-for-removing-existing-dragon.patch similarity index 95% rename from patches/server/0517-Toggle-for-removing-existing-dragon.patch rename to patches/server/0518-Toggle-for-removing-existing-dragon.patch index b19bbf6146..0315aae202 100644 --- a/patches/server/0517-Toggle-for-removing-existing-dragon.patch +++ b/patches/server/0518-Toggle-for-removing-existing-dragon.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for removing existing dragon diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 34754f8d3cc03a93d148d026780eacc7dc0a20e0..6d89bc4804dc0b23ab86b93a6ad030e1e633d61c 100644 +index fbc909e383a43df7cff4de657cab654d79c6648f..49c3041e1608ba91f8c39e475e32c3e712639af3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -107,6 +107,14 @@ public class PaperWorldConfig { diff --git a/patches/server/0518-Fix-client-lag-on-advancement-loading.patch b/patches/server/0519-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0518-Fix-client-lag-on-advancement-loading.patch rename to patches/server/0519-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0519-Item-no-age-no-player-pickup.patch b/patches/server/0520-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0519-Item-no-age-no-player-pickup.patch rename to patches/server/0520-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0521-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0520-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/server/0521-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0521-Beacon-API-custom-effect-ranges.patch b/patches/server/0522-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0521-Beacon-API-custom-effect-ranges.patch rename to patches/server/0522-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0522-Add-API-for-quit-reason.patch b/patches/server/0523-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0522-Add-API-for-quit-reason.patch rename to patches/server/0523-Add-API-for-quit-reason.patch diff --git a/patches/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0524-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 98% rename from patches/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/server/0524-Add-Wandering-Trader-spawn-rate-config-options.patch index 442a6ce950..d5e8b859bb 100644 --- a/patches/server/0523-Add-Wandering-Trader-spawn-rate-config-options.patch +++ b/patches/server/0524-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 6d89bc4804dc0b23ab86b93a6ad030e1e633d61c..9147b408b35b7d15ced3749e34706087d2cdffd8 100644 +index 49c3041e1608ba91f8c39e475e32c3e712639af3..c3523bb368fe9c64cc361e1e5f3c190d0f9f9b80 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -115,6 +115,19 @@ public class PaperWorldConfig { diff --git a/patches/server/0524-Expose-world-spawn-angle.patch b/patches/server/0525-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0524-Expose-world-spawn-angle.patch rename to patches/server/0525-Expose-world-spawn-angle.patch diff --git a/patches/server/0525-Add-Destroy-Speed-API.patch b/patches/server/0526-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0525-Add-Destroy-Speed-API.patch rename to patches/server/0526-Add-Destroy-Speed-API.patch diff --git a/patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0527-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 93% rename from patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/server/0527-Fix-Player-spawnParticle-x-y-z-precision-loss.patch index d956688504..b46ccc5378 100644 --- a/patches/server/0526-Fix-Player-spawnParticle-x-y-z-precision-loss.patch +++ b/patches/server/0527-Fix-Player-spawnParticle-x-y-z-precision-loss.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 89e0bbba593ad0dad2332758ad8df43095955b07..d4348385ee8330398bfe543311c9256e93334861 100644 +index 635b182bb6a4831c457558c629afd7a34db4160e..551f82b78a9deca1b702d488743e079cca744f99 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2254,7 +2254,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0527-Add-LivingEntity-clearActiveItem.patch b/patches/server/0528-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0527-Add-LivingEntity-clearActiveItem.patch rename to patches/server/0528-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0528-Add-PlayerItemCooldownEvent.patch b/patches/server/0529-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0528-Add-PlayerItemCooldownEvent.patch rename to patches/server/0529-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0529-More-lightning-API.patch b/patches/server/0530-More-lightning-API.patch similarity index 100% rename from patches/server/0529-More-lightning-API.patch rename to patches/server/0530-More-lightning-API.patch diff --git a/patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 98% rename from patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0531-Climbing-should-not-bypass-cramming-gamerule.patch index 34c78dc3e9..af79c77a70 100644 --- a/patches/server/0530-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0531-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 9147b408b35b7d15ced3749e34706087d2cdffd8..340e610b6af2dab7d916c530d3cce9aac003aa4d 100644 +index c3523bb368fe9c64cc361e1e5f3c190d0f9f9b80..4080c12fe98cba1d17da12648a8228de2720b838 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -128,6 +128,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0531-Added-missing-default-perms-for-commands.patch b/patches/server/0532-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0531-Added-missing-default-perms-for-commands.patch rename to patches/server/0532-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0532-Add-PlayerShearBlockEvent.patch b/patches/server/0533-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0532-Add-PlayerShearBlockEvent.patch rename to patches/server/0533-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0533-Fix-curing-zombie-villager-discount-exploit.patch b/patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch similarity index 96% rename from patches/server/0533-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/server/0534-Fix-curing-zombie-villager-discount-exploit.patch index 1c0096e169..f28e5d888d 100644 --- a/patches/server/0533-Fix-curing-zombie-villager-discount-exploit.patch +++ b/patches/server/0534-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 340e610b6af2dab7d916c530d3cce9aac003aa4d..d6cbd9ea2eb70e25a5e37e0bdda2396a99b3342e 100644 +index 4080c12fe98cba1d17da12648a8228de2720b838..1de165b8f62915b9a7d3a834dd344b9e8b275d2e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -133,6 +133,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0534-Limit-recipe-packets.patch b/patches/server/0535-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0534-Limit-recipe-packets.patch rename to patches/server/0535-Limit-recipe-packets.patch diff --git a/patches/server/0535-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0536-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0535-Fix-CraftSound-backwards-compatibility.patch rename to patches/server/0536-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0536-Player-Chunk-Load-Unload-Events.patch b/patches/server/0537-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0536-Player-Chunk-Load-Unload-Events.patch rename to patches/server/0537-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0537-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0537-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/server/0538-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0538-Expose-LivingEntity-hurt-direction.patch b/patches/server/0539-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0538-Expose-LivingEntity-hurt-direction.patch rename to patches/server/0539-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0539-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/server/0540-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0540-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0540-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/server/0541-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0541-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0541-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/server/0542-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0542-Implement-TargetHitEvent.patch b/patches/server/0543-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0542-Implement-TargetHitEvent.patch rename to patches/server/0543-Implement-TargetHitEvent.patch diff --git a/patches/server/0543-Additional-Block-Material-API-s.patch b/patches/server/0544-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0543-Additional-Block-Material-API-s.patch rename to patches/server/0544-Additional-Block-Material-API-s.patch diff --git a/patches/server/0544-Fix-harming-potion-dupe.patch b/patches/server/0545-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0544-Fix-harming-potion-dupe.patch rename to patches/server/0545-Fix-harming-potion-dupe.patch diff --git a/patches/server/0545-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0545-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/server/0546-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0546-Cache-burn-durations.patch b/patches/server/0547-Cache-burn-durations.patch similarity index 100% rename from patches/server/0546-Cache-burn-durations.patch rename to patches/server/0547-Cache-burn-durations.patch diff --git a/patches/server/0547-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 95% rename from patches/server/0547-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/server/0548-Allow-disabling-mob-spawner-spawn-egg-transformation.patch index 1875bd72b3..7b3383e9de 100644 --- a/patches/server/0547-Allow-disabling-mob-spawner-spawn-egg-transformation.patch +++ b/patches/server/0548-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 d6cbd9ea2eb70e25a5e37e0bdda2396a99b3342e..5fe4d2005e87a7b69e98dcd68e0fff3cc26a8c96 100644 +index 1de165b8f62915b9a7d3a834dd344b9e8b275d2e..91943aab7cce9690ebbf192b04ab970fa20e7c92 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -138,6 +138,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0548-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0548-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/server/0549-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0549-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0549-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/server/0550-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0550-Fix-interact-event-not-being-called-in-adventure.patch b/patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch similarity index 95% rename from patches/server/0550-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch index 5d2ed12e4b..32f6ee8f4e 100644 --- a/patches/server/0550-Fix-interact-event-not-being-called-in-adventure.patch +++ b/patches/server/0551-Fix-interact-event-not-being-called-in-adventure.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix interact event not being called in adventure Call PlayerInteractEvent when left-clicking on a block in adventure mode diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index ac3219f3a26f9f7fab57de0f9277695423ef46d7..bf72d96c6d6efcda40eb19d30b90f63b9bc42a83 100644 +index a9a6583d5d853623b863d61f663044437a936e55..7f8a270d46f8217f4dcbbb5ed232158bac1b7464 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1778,7 +1778,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0551-Zombie-API-breaking-doors.patch b/patches/server/0552-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0551-Zombie-API-breaking-doors.patch rename to patches/server/0552-Zombie-API-breaking-doors.patch diff --git a/patches/server/0552-Fix-nerfed-slime-when-splitting.patch b/patches/server/0553-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0552-Fix-nerfed-slime-when-splitting.patch rename to patches/server/0553-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0553-Add-EntityLoadCrossbowEvent.patch b/patches/server/0554-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0553-Add-EntityLoadCrossbowEvent.patch rename to patches/server/0554-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0554-Guardian-beam-workaround.patch b/patches/server/0555-Guardian-beam-workaround.patch similarity index 100% rename from patches/server/0554-Guardian-beam-workaround.patch rename to patches/server/0555-Guardian-beam-workaround.patch diff --git a/patches/server/0555-Added-WorldGameRuleChangeEvent.patch b/patches/server/0556-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0555-Added-WorldGameRuleChangeEvent.patch rename to patches/server/0556-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0556-Added-ServerResourcesReloadedEvent.patch b/patches/server/0557-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0556-Added-ServerResourcesReloadedEvent.patch rename to patches/server/0557-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0557-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 97% rename from patches/server/0557-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch index 1c7df308fc..4896268efb 100644 --- a/patches/server/0557-Added-world-settings-for-mobs-picking-up-loot.patch +++ b/patches/server/0558-Added-world-settings-for-mobs-picking-up-loot.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added world settings for mobs picking up loot diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 5fe4d2005e87a7b69e98dcd68e0fff3cc26a8c96..f4559f3bc7751da48a84d75a949c9df298ee48b4 100644 +index 91943aab7cce9690ebbf192b04ab970fa20e7c92..5af5b702f53f3664eac1f19a15689c92de8d40ae 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -787,6 +787,14 @@ public class PaperWorldConfig { diff --git a/patches/server/0558-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0559-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0558-Implemented-BlockFailedDispenseEvent.patch rename to patches/server/0559-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0559-Added-PlayerLecternPageChangeEvent.patch b/patches/server/0560-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0559-Added-PlayerLecternPageChangeEvent.patch rename to patches/server/0560-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0560-Added-PlayerLoomPatternSelectEvent.patch b/patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0560-Added-PlayerLoomPatternSelectEvent.patch rename to patches/server/0561-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0561-Configurable-door-breaking-difficulty.patch b/patches/server/0562-Configurable-door-breaking-difficulty.patch similarity index 97% rename from patches/server/0561-Configurable-door-breaking-difficulty.patch rename to patches/server/0562-Configurable-door-breaking-difficulty.patch index 8bbe07b9f6..fd7f614a89 100644 --- a/patches/server/0561-Configurable-door-breaking-difficulty.patch +++ b/patches/server/0562-Configurable-door-breaking-difficulty.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable door breaking difficulty Co-authored-by: Doc diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f4559f3bc7751da48a84d75a949c9df298ee48b4..96fd9803810db0f8a4b25e070a56da05862e1e4e 100644 +index 5af5b702f53f3664eac1f19a15689c92de8d40ae..5d7fe47e134b50a870e3653230ff4067b2cf9074 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -142,6 +142,27 @@ public class PaperWorldConfig { diff --git a/patches/server/0562-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0563-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0562-Empty-commands-shall-not-be-dispatched.patch rename to patches/server/0563-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0563-Implement-API-to-expose-exact-interaction-point.patch b/patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0563-Implement-API-to-expose-exact-interaction-point.patch rename to patches/server/0564-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0564-Remove-stale-POIs.patch b/patches/server/0565-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0564-Remove-stale-POIs.patch rename to patches/server/0565-Remove-stale-POIs.patch diff --git a/patches/server/0565-Fix-villager-boat-exploit.patch b/patches/server/0566-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0565-Fix-villager-boat-exploit.patch rename to patches/server/0566-Fix-villager-boat-exploit.patch diff --git a/patches/server/0566-Add-sendOpLevel-API.patch b/patches/server/0567-Add-sendOpLevel-API.patch similarity index 95% rename from patches/server/0566-Add-sendOpLevel-API.patch rename to patches/server/0567-Add-sendOpLevel-API.patch index 70b002270f..cb137d2e5f 100644 --- a/patches/server/0566-Add-sendOpLevel-API.patch +++ b/patches/server/0567-Add-sendOpLevel-API.patch @@ -32,7 +32,7 @@ index 9a27895d9528dd10e196fe7e7d2fb9d7561fa704..7662e4f590d9e3146783239a662b4527 public boolean isWhiteListed(GameProfile profile) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d4348385ee8330398bfe543311c9256e93334861..91027504dd2963806ec52f773fc768a1288e15f2 100644 +index 551f82b78a9deca1b702d488743e079cca744f99..9a213d1313f0418e4f68e40083ae764e5d1b6c78 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -606,6 +606,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0567-Add-PaperRegistry.patch b/patches/server/0568-Add-PaperRegistry.patch similarity index 100% rename from patches/server/0567-Add-PaperRegistry.patch rename to patches/server/0568-Add-PaperRegistry.patch diff --git a/patches/server/0568-Add-StructuresLocateEvent.patch b/patches/server/0569-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0568-Add-StructuresLocateEvent.patch rename to patches/server/0569-Add-StructuresLocateEvent.patch diff --git a/patches/server/0569-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0570-Collision-option-for-requiring-a-player-participant.patch similarity index 97% rename from patches/server/0569-Collision-option-for-requiring-a-player-participant.patch rename to patches/server/0570-Collision-option-for-requiring-a-player-participant.patch index 378366af6c..82b7bef551 100644 --- a/patches/server/0569-Collision-option-for-requiring-a-player-participant.patch +++ b/patches/server/0570-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 96fd9803810db0f8a4b25e070a56da05862e1e4e..2b3e034d6cddbe5c94f2be856833680dd7b3b4f0 100644 +index 5d7fe47e134b50a870e3653230ff4067b2cf9074..68c61f286c2d39fd5c463f6706a0554fbaa3c08a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -115,6 +115,18 @@ public class PaperWorldConfig { diff --git a/patches/server/0570-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0570-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/server/0571-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0571-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0571-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/server/0572-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0572-Make-schedule-command-per-world.patch b/patches/server/0573-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0572-Make-schedule-command-per-world.patch rename to patches/server/0573-Make-schedule-command-per-world.patch diff --git a/patches/server/0573-Configurable-max-leash-distance.patch b/patches/server/0574-Configurable-max-leash-distance.patch similarity index 96% rename from patches/server/0573-Configurable-max-leash-distance.patch rename to patches/server/0574-Configurable-max-leash-distance.patch index 9374556424..ac0fc211a7 100644 --- a/patches/server/0573-Configurable-max-leash-distance.patch +++ b/patches/server/0574-Configurable-max-leash-distance.patch @@ -5,7 +5,7 @@ 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 2b3e034d6cddbe5c94f2be856833680dd7b3b4f0..9bb6b6c6ac26790eaf5f8efe55f8db7407fc0065 100644 +index 68c61f286c2d39fd5c463f6706a0554fbaa3c08a..0d3133cc423d024be8fdd0f270564bf550cd8232 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -342,6 +342,12 @@ public class PaperWorldConfig { diff --git a/patches/server/0574-Implement-BlockPreDispenseEvent.patch b/patches/server/0575-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0574-Implement-BlockPreDispenseEvent.patch rename to patches/server/0575-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0575-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0575-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/server/0576-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0576-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 95% rename from patches/server/0576-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch index 0236f6f068..27f838dae5 100644 --- a/patches/server/0576-Add-toggle-for-always-placing-the-dragon-egg.patch +++ b/patches/server/0577-Add-toggle-for-always-placing-the-dragon-egg.patch @@ -5,7 +5,7 @@ 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 9bb6b6c6ac26790eaf5f8efe55f8db7407fc0065..1753a28e0dc001d55385cdf0d91edde23244d17b 100644 +index 0d3133cc423d024be8fdd0f270564bf550cd8232..d4eaf3f33b6733ddb542e1fc6837d0e46ea7aa53 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -819,6 +819,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0577-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0577-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/server/0578-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0578-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0578-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/server/0579-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0579-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0580-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0579-Reset-shield-blocking-on-dimension-change.patch rename to patches/server/0580-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0580-add-DragonEggFormEvent.patch b/patches/server/0581-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0580-add-DragonEggFormEvent.patch rename to patches/server/0581-add-DragonEggFormEvent.patch diff --git a/patches/server/0581-EntityMoveEvent.patch b/patches/server/0582-EntityMoveEvent.patch similarity index 100% rename from patches/server/0581-EntityMoveEvent.patch rename to patches/server/0582-EntityMoveEvent.patch diff --git a/patches/server/0582-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 95% rename from patches/server/0582-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch index e46498826d..1a5b928caa 100644 --- a/patches/server/0582-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0583-added-option-to-disable-pathfinding-updates-on-block.patch @@ -5,7 +5,7 @@ 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 1753a28e0dc001d55385cdf0d91edde23244d17b..2eef459c0512122425db1374f59935b0bebfc754 100644 +index d4eaf3f33b6733ddb542e1fc6837d0e46ea7aa53..f139bdead1370ae65fb6b8d2ec45b3dfd7a90653 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -824,6 +824,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0583-Inline-shift-direction-fields.patch b/patches/server/0584-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0583-Inline-shift-direction-fields.patch rename to patches/server/0584-Inline-shift-direction-fields.patch diff --git a/patches/server/0584-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0584-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/server/0585-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0585-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0585-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/server/0586-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0586-living-entity-allow-attribute-registration.patch b/patches/server/0587-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0586-living-entity-allow-attribute-registration.patch rename to patches/server/0587-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0587-fix-dead-slime-setSize-invincibility.patch b/patches/server/0588-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0587-fix-dead-slime-setSize-invincibility.patch rename to patches/server/0588-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0588-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0588-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/server/0589-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0589-Add-support-for-hex-color-codes-in-console.patch b/patches/server/0590-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0589-Add-support-for-hex-color-codes-in-console.patch rename to patches/server/0590-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0590-Expose-Tracked-Players.patch b/patches/server/0591-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0590-Expose-Tracked-Players.patch rename to patches/server/0591-Expose-Tracked-Players.patch diff --git a/patches/server/0591-Remove-streams-from-SensorNearest.patch b/patches/server/0592-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0591-Remove-streams-from-SensorNearest.patch rename to patches/server/0592-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0592-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0592-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/server/0593-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0593-Improve-ServerGUI.patch b/patches/server/0594-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0593-Improve-ServerGUI.patch rename to patches/server/0594-Improve-ServerGUI.patch diff --git a/patches/server/0594-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0594-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/server/0595-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0595-fix-converting-txt-to-json-file.patch b/patches/server/0596-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0595-fix-converting-txt-to-json-file.patch rename to patches/server/0596-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0596-Add-worldborder-events.patch b/patches/server/0597-Add-worldborder-events.patch similarity index 100% rename from patches/server/0596-Add-worldborder-events.patch rename to patches/server/0597-Add-worldborder-events.patch diff --git a/patches/server/0597-added-PlayerNameEntityEvent.patch b/patches/server/0598-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0597-added-PlayerNameEntityEvent.patch rename to patches/server/0598-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0598-Prevent-grindstones-from-overstacking-items.patch b/patches/server/0599-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0598-Prevent-grindstones-from-overstacking-items.patch rename to patches/server/0599-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0599-Add-recipe-to-cook-events.patch b/patches/server/0600-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0599-Add-recipe-to-cook-events.patch rename to patches/server/0600-Add-recipe-to-cook-events.patch diff --git a/patches/server/0600-Add-Block-isValidTool.patch b/patches/server/0601-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0600-Add-Block-isValidTool.patch rename to patches/server/0601-Add-Block-isValidTool.patch diff --git a/patches/server/0601-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0602-Allow-using-signs-inside-spawn-protection.patch similarity index 92% rename from patches/server/0601-Allow-using-signs-inside-spawn-protection.patch rename to patches/server/0602-Allow-using-signs-inside-spawn-protection.patch index 90b9bb537e..80deeaede0 100644 --- a/patches/server/0601-Allow-using-signs-inside-spawn-protection.patch +++ b/patches/server/0602-Allow-using-signs-inside-spawn-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow using signs inside spawn protection diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 2eef459c0512122425db1374f59935b0bebfc754..883c8d42c471eefe4ddf68196fac0d69428dbabd 100644 +index f139bdead1370ae65fb6b8d2ec45b3dfd7a90653..51f2859c282b453b7eea7da414a7b4a0f19c5a8b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -858,4 +858,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 2eef459c0512122425db1374f59935b0bebfc754..883c8d42c471eefe4ddf68196fac0d69 + } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index bf72d96c6d6efcda40eb19d30b90f63b9bc42a83..f8b298dcfaa8767f9a91ff674728671729e572cd 100644 +index 7f8a270d46f8217f4dcbbb5ed232158bac1b7464..f85cbe58489dc202d63c807a6d7353291d636877 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1770,7 +1770,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0602-Expand-world-key-API.patch b/patches/server/0603-Expand-world-key-API.patch similarity index 100% rename from patches/server/0602-Expand-world-key-API.patch rename to patches/server/0603-Expand-world-key-API.patch diff --git a/patches/server/0603-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0603-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/server/0604-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0604-Item-Rarity-API.patch b/patches/server/0605-Item-Rarity-API.patch similarity index 100% rename from patches/server/0604-Item-Rarity-API.patch rename to patches/server/0605-Item-Rarity-API.patch diff --git a/patches/server/0605-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0605-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/server/0606-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0606-copy-TESign-isEditable-from-snapshots.patch b/patches/server/0607-copy-TESign-isEditable-from-snapshots.patch similarity index 89% rename from patches/server/0606-copy-TESign-isEditable-from-snapshots.patch rename to patches/server/0607-copy-TESign-isEditable-from-snapshots.patch index f0478e6c82..766607080f 100644 --- a/patches/server/0606-copy-TESign-isEditable-from-snapshots.patch +++ b/patches/server/0607-copy-TESign-isEditable-from-snapshots.patch @@ -5,7 +5,7 @@ Subject: [PATCH] copy TESign#isEditable from snapshots diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -index c629755ddba58eeff6f38f9396891f98f530e08e..f8d028e0a3c2546733fc5936d9a02db91efa4539 100644 +index a0950f5902c3719dc31205ec43dca9482278c744..dfd5d05830d3892e1d640149d1aa9d70d6f8a66b 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java @@ -115,6 +115,7 @@ public class CraftSign extends CraftBlockEntityState implements diff --git a/patches/server/0607-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0607-Drop-carried-item-when-player-has-disconnected.patch rename to patches/server/0608-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0608-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0609-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0608-forced-whitelist-use-configurable-kick-message.patch rename to patches/server/0609-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0609-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 91% rename from patches/server/0609-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch index 9d3a3f0065..f3b2b96f6b 100644 --- a/patches/server/0609-Don-t-ignore-result-of-PlayerEditBookEvent.patch +++ b/patches/server/0610-Don-t-ignore-result-of-PlayerEditBookEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't ignore result of PlayerEditBookEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index f8b298dcfaa8767f9a91ff674728671729e572cd..6eda7565cfbc24d323d30ad8a3da149d2cdecd53 100644 +index f85cbe58489dc202d63c807a6d7353291d636877..7ce74b7f960a69fdb6e8dedf20b317ee92ad904b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1220,7 +1220,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0610-Entity-load-save-limit-per-chunk.patch b/patches/server/0611-Entity-load-save-limit-per-chunk.patch similarity index 98% rename from patches/server/0610-Entity-load-save-limit-per-chunk.patch rename to patches/server/0611-Entity-load-save-limit-per-chunk.patch index 8769acee87..b06b0b75fe 100644 --- a/patches/server/0610-Entity-load-save-limit-per-chunk.patch +++ b/patches/server/0611-Entity-load-save-limit-per-chunk.patch @@ -9,7 +9,7 @@ defaults are only included for certain entites, this allows setting limits for any entity type. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 883c8d42c471eefe4ddf68196fac0d69428dbabd..ba95a27012bcba97d6e7f6a07d68a476c0beb96f 100644 +index 51f2859c282b453b7eea7da414a7b4a0f19c5a8b..7942d733655838f673a3d79cab2288dec70dc6e2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -8,6 +8,8 @@ import it.unimi.dsi.fastutil.objects.Reference2IntMap; diff --git a/patches/server/0611-Expose-protocol-version.patch b/patches/server/0612-Expose-protocol-version.patch similarity index 100% rename from patches/server/0611-Expose-protocol-version.patch rename to patches/server/0612-Expose-protocol-version.patch diff --git a/patches/server/0612-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 98% rename from patches/server/0612-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch index 2e7a9ad98f..cb965157a9 100644 --- a/patches/server/0612-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch +++ b/patches/server/0613-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow for Component suggestion tooltips in diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 6eda7565cfbc24d323d30ad8a3da149d2cdecd53..34153902ac86ce6c518a840717f6bb099f45ea1f 100644 +index 7ce74b7f960a69fdb6e8dedf20b317ee92ad904b..228de7514e67e7c768e8a1e08484fa4fe2ddb9fd 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -802,12 +802,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0613-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/server/0614-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0614-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/server/0615-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0615-Add-bypass-host-check.patch b/patches/server/0616-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0615-Add-bypass-host-check.patch rename to patches/server/0616-Add-bypass-host-check.patch diff --git a/patches/server/0616-Set-area-affect-cloud-rotation.patch b/patches/server/0617-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0616-Set-area-affect-cloud-rotation.patch rename to patches/server/0617-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0617-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/server/0618-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0618-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/server/0619-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0619-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/server/0620-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0620-fix-PigZombieAngerEvent-cancellation.patch rename to patches/server/0621-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch b/patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch similarity index 100% rename from patches/server/0621-Fix-checkReach-check-for-Shulker-boxes.patch rename to patches/server/0622-Fix-checkReach-check-for-Shulker-boxes.patch diff --git a/patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 93% rename from patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch index 46b7142517..26c38ddfde 100644 --- a/patches/server/0622-fix-PlayerItemHeldEvent-firing-twice.patch +++ b/patches/server/0623-fix-PlayerItemHeldEvent-firing-twice.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix PlayerItemHeldEvent firing twice diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 34153902ac86ce6c518a840717f6bb099f45ea1f..9ff10dd4013840c5021ce178c2804ee5b09902ca 100644 +index 228de7514e67e7c768e8a1e08484fa4fe2ddb9fd..8703d877812f582174673a3063f59c346e6bcf08 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1985,6 +1985,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0623-Added-PlayerDeepSleepEvent.patch b/patches/server/0624-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0623-Added-PlayerDeepSleepEvent.patch rename to patches/server/0624-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0624-More-World-API.patch b/patches/server/0625-More-World-API.patch similarity index 100% rename from patches/server/0624-More-World-API.patch rename to patches/server/0625-More-World-API.patch diff --git a/patches/server/0625-Added-PlayerBedFailEnterEvent.patch b/patches/server/0626-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0625-Added-PlayerBedFailEnterEvent.patch rename to patches/server/0626-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0626-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/server/0627-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0627-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/server/0628-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0628-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0629-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0628-Introduce-beacon-activation-deactivation-events.patch rename to patches/server/0629-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 97% rename from patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch index 65b306c224..35dcdd5eba 100644 --- a/patches/server/0629-add-RespawnFlags-to-PlayerRespawnEvent.patch +++ b/patches/server/0630-add-RespawnFlags-to-PlayerRespawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9ff10dd4013840c5021ce178c2804ee5b09902ca..0c2ad9c0f97e90df7ea32cf58d4e8b7a16eb609e 100644 +index 8703d877812f582174673a3063f59c346e6bcf08..5a6fac2ac3befcd0c7d9b5eee5099c4a86f9dda2 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2673,7 +2673,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser diff --git a/patches/server/0630-Add-Channel-initialization-listeners.patch b/patches/server/0631-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0630-Add-Channel-initialization-listeners.patch rename to patches/server/0631-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0631-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/server/0632-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0632-Add-more-WanderingTrader-API.patch b/patches/server/0633-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0632-Add-more-WanderingTrader-API.patch rename to patches/server/0633-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0633-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0634-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0633-Add-EntityBlockStorage-clearEntities.patch rename to patches/server/0634-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0634-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/server/0635-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0635-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0636-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0636-Inventory-close.patch b/patches/server/0637-Inventory-close.patch similarity index 100% rename from patches/server/0636-Inventory-close.patch rename to patches/server/0637-Inventory-close.patch diff --git a/patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch b/patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch similarity index 100% rename from patches/server/0637-call-PortalCreateEvent-players-and-end-platform.patch rename to patches/server/0638-call-PortalCreateEvent-players-and-end-platform.patch diff --git a/patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0638-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/server/0639-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0639-Fix-CraftPotionBrewer-cache.patch b/patches/server/0640-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0639-Fix-CraftPotionBrewer-cache.patch rename to patches/server/0640-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0640-Add-basic-Datapack-API.patch b/patches/server/0641-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0640-Add-basic-Datapack-API.patch rename to patches/server/0641-Add-basic-Datapack-API.patch diff --git a/patches/server/0641-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0642-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0641-Add-environment-variable-to-disable-server-gui.patch rename to patches/server/0642-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch similarity index 97% rename from patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch rename to patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch index 7a67e17984..e3fc8ea36a 100644 --- a/patches/server/0642-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0643-additions-to-PlayerGameModeChangeEvent.patch @@ -126,7 +126,7 @@ index 06e7a8b8227260c002a88119544b99a11eec8a09..4d907501dfe7f1a4641542291f4abdd0 } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 0c2ad9c0f97e90df7ea32cf58d4e8b7a16eb609e..3009ff5a0edf8acf6f2c9285af3c6f3ee2c78b1a 100644 +index 5a6fac2ac3befcd0c7d9b5eee5099c4a86f9dda2..d216529f4cc40c99298ff823761dfe73e398f694 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -2682,7 +2682,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -139,7 +139,7 @@ index 0c2ad9c0f97e90df7ea32cf58d4e8b7a16eb609e..3009ff5a0edf8acf6f2c9285af3c6f3e } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 91027504dd2963806ec52f773fc768a1288e15f2..3f19ff22ecbc012b9432bd2e25fb3dcec4a56979 100644 +index 9a213d1313f0418e4f68e40083ae764e5d1b6c78..42e9ff7f10a63232a93dc44f220617d5140dcb20 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1377,7 +1377,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0643-ItemStack-repair-check-API.patch b/patches/server/0644-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0643-ItemStack-repair-check-API.patch rename to patches/server/0644-ItemStack-repair-check-API.patch diff --git a/patches/server/0644-More-Enchantment-API.patch b/patches/server/0645-More-Enchantment-API.patch similarity index 100% rename from patches/server/0644-More-Enchantment-API.patch rename to patches/server/0645-More-Enchantment-API.patch diff --git a/patches/server/0645-Move-range-check-for-block-placing-up.patch b/patches/server/0646-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0645-Move-range-check-for-block-placing-up.patch rename to patches/server/0646-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0646-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0647-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0646-Fix-and-optimise-world-force-upgrading.patch rename to patches/server/0647-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0647-Add-Mob-lookAt-API.patch b/patches/server/0648-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0647-Add-Mob-lookAt-API.patch rename to patches/server/0648-Add-Mob-lookAt-API.patch diff --git a/patches/server/0648-Add-Unix-domain-socket-support.patch b/patches/server/0649-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0648-Add-Unix-domain-socket-support.patch rename to patches/server/0649-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0649-Add-EntityInsideBlockEvent.patch b/patches/server/0650-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0649-Add-EntityInsideBlockEvent.patch rename to patches/server/0650-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0650-Attributes-API-for-item-defaults.patch b/patches/server/0651-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0650-Attributes-API-for-item-defaults.patch rename to patches/server/0651-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 98% rename from patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch index ebef4f9764..537e594f35 100644 --- a/patches/server/0651-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0652-Add-cause-to-Weather-ThunderChangeEvents.patch @@ -95,7 +95,7 @@ index 401787a5b55384b9ab7755e822b3b881dc45ac45..e537a8df45c31efa80cb898cbef9c3a0 if (weather.isCancelled()) { return; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index a56071592420f9b649c84437fff336b03d6c93ba..792d660b10c841876a87625f8da1910a86542ec3 100644 +index 1dd7f21b6088f94bd523578fe6a1bb2c542145c5..464dfd15ba347896ea6bf21e7e95087d4324f4f4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1189,7 +1189,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0652-More-Lidded-Block-API.patch b/patches/server/0653-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0652-More-Lidded-Block-API.patch rename to patches/server/0653-More-Lidded-Block-API.patch diff --git a/patches/server/0653-Limit-item-frame-cursors-on-maps.patch b/patches/server/0654-Limit-item-frame-cursors-on-maps.patch similarity index 95% rename from patches/server/0653-Limit-item-frame-cursors-on-maps.patch rename to patches/server/0654-Limit-item-frame-cursors-on-maps.patch index 07aa4ead8a..512ce670d0 100644 --- a/patches/server/0653-Limit-item-frame-cursors-on-maps.patch +++ b/patches/server/0654-Limit-item-frame-cursors-on-maps.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Limit item frame cursors on maps diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ba95a27012bcba97d6e7f6a07d68a476c0beb96f..b03c38b62b15b31477e22ba0ed45236ea8ee8970 100644 +index 7942d733655838f673a3d79cab2288dec70dc6e2..93aade43e28d87e631c1e61271485dd1cd24f9fc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -897,4 +897,9 @@ public class PaperWorldConfig { diff --git a/patches/server/0654-Add-PlayerKickEvent-causes.patch b/patches/server/0655-Add-PlayerKickEvent-causes.patch similarity index 99% rename from patches/server/0654-Add-PlayerKickEvent-causes.patch rename to patches/server/0655-Add-PlayerKickEvent-causes.patch index 3fbdf7590c..b8e35b48e3 100644 --- a/patches/server/0654-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0655-Add-PlayerKickEvent-causes.patch @@ -342,7 +342,7 @@ index 11b5335a7f30113da58c39aa15ca5e6f0b2588d5..3562532e446e3a6b2ecfc4aa37693b3a // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 3a61bc70b52372016ce7f50f50faa68ad6ed94ba..720ccaa64293b075c893f1e4f64a35e0fc43b869 100644 +index 42e9ff7f10a63232a93dc44f220617d5140dcb20..10ae4c1a3cd93dc89a6b43256b522cf8f430ee3e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -516,7 +516,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0655-Add-PufferFishStateChangeEvent.patch b/patches/server/0656-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0655-Add-PufferFishStateChangeEvent.patch rename to patches/server/0656-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0656-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/server/0657-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0657-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/server/0658-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch similarity index 96% rename from patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch rename to patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch index 88b09e28d5..dea0165525 100644 --- a/patches/server/0658-Add-option-to-fix-items-merging-through-walls.patch +++ b/patches/server/0659-Add-option-to-fix-items-merging-through-walls.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to fix items merging through walls diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b03c38b62b15b31477e22ba0ed45236ea8ee8970..36f22f7a02341d16d69ce1c7e14cbe50a42f92ec 100644 +index 93aade43e28d87e631c1e61271485dd1cd24f9fc..de12b0f79d58177ab2fe1c925bca43f33ba8cffe 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -902,4 +902,9 @@ public class PaperWorldConfig { diff --git a/patches/server/0659-Add-BellRevealRaiderEvent.patch b/patches/server/0660-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0659-Add-BellRevealRaiderEvent.patch rename to patches/server/0660-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0660-Fix-invulnerable-end-crystals.patch b/patches/server/0661-Fix-invulnerable-end-crystals.patch similarity index 97% rename from patches/server/0660-Fix-invulnerable-end-crystals.patch rename to patches/server/0661-Fix-invulnerable-end-crystals.patch index 69a3bbf6d0..9f55ffd619 100644 --- a/patches/server/0660-Fix-invulnerable-end-crystals.patch +++ b/patches/server/0661-Fix-invulnerable-end-crystals.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix invulnerable end crystals MC-108513 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 36f22f7a02341d16d69ce1c7e14cbe50a42f92ec..b68c2f46c7b595fe860f609b5681524ba310003e 100644 +index de12b0f79d58177ab2fe1c925bca43f33ba8cffe..554ec0e21fd4a9ede74f1012316862f41356eea3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -907,4 +907,9 @@ public class PaperWorldConfig { diff --git a/patches/server/0661-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0662-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0661-Add-ElderGuardianAppearanceEvent.patch rename to patches/server/0662-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0662-Fix-dangerous-end-portal-logic.patch b/patches/server/0663-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0662-Fix-dangerous-end-portal-logic.patch rename to patches/server/0663-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0663-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/server/0664-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0664-Make-item-validations-configurable.patch b/patches/server/0665-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0664-Make-item-validations-configurable.patch rename to patches/server/0665-Make-item-validations-configurable.patch diff --git a/patches/server/0665-Line-Of-Sight-Changes.patch b/patches/server/0666-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0665-Line-Of-Sight-Changes.patch rename to patches/server/0666-Line-Of-Sight-Changes.patch diff --git a/patches/server/0666-add-per-world-spawn-limits.patch b/patches/server/0667-add-per-world-spawn-limits.patch similarity index 94% rename from patches/server/0666-add-per-world-spawn-limits.patch rename to patches/server/0667-add-per-world-spawn-limits.patch index 2b2681c1d9..92280af242 100644 --- a/patches/server/0666-add-per-world-spawn-limits.patch +++ b/patches/server/0667-add-per-world-spawn-limits.patch @@ -6,7 +6,7 @@ Subject: [PATCH] add per world spawn limits Taken from #2982. Credit to Chasewhip8 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b68c2f46c7b595fe860f609b5681524ba310003e..1ae2e1599cb5b8612ca5b45c37367377d7f26dbf 100644 +index 554ec0e21fd4a9ede74f1012316862f41356eea3..d2c6fa510c72cd7992fb7282ef152f7e86a6c1f3 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -58,6 +58,11 @@ public class PaperWorldConfig { @@ -44,7 +44,7 @@ index b68c2f46c7b595fe860f609b5681524ba310003e..1ae2e1599cb5b8612ca5b45c37367377 private void lightQueueSize() { lightQueueSize = getInt("light-queue-size", lightQueueSize); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 792d660b10c841876a87625f8da1910a86542ec3..1274bc5324f8cbf1ae8d37190eafeb8cb9b6e233 100644 +index 464dfd15ba347896ea6bf21e7e95087d4324f4f4..aea681f994fc97390aa29a2338f9a92eb6a4a806 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -205,6 +205,13 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch b/patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch similarity index 100% rename from patches/server/0667-Fix-PotionSplashEvent-for-water-splash-potions.patch rename to patches/server/0668-Fix-PotionSplashEvent-for-water-splash-potions.patch diff --git a/patches/server/0668-Add-more-LimitedRegion-API.patch b/patches/server/0669-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0668-Add-more-LimitedRegion-API.patch rename to patches/server/0669-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0669-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/server/0670-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0670-Missing-Entity-Behavior-API.patch b/patches/server/0671-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0670-Missing-Entity-Behavior-API.patch rename to patches/server/0671-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0671-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/server/0672-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0672-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/server/0673-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 96% rename from patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch index 691e248aae..964759c364 100644 --- a/patches/server/0673-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/patches/server/0674-Use-getChunkIfLoadedImmediately-in-places.patch @@ -30,7 +30,7 @@ index e0a5e978d584bcc0e692806b3d80d01710526eb3..62bb1fd46e4dff43e9c83c05260c7dea if (chunk != null) { for (int j2 = k; j2 <= j1; ++j2) { diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 474b1dc68e138fb3fcca8c846d50fa2c04f74fd5..7a378def3702bc3e2fd20d422ec38e20d4083574 100644 +index c22e6e9d043f9afcb8c2fe24e9edd180304930dc..397afdf68e6330c5aaf465f219800985ad26e9e2 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -195,6 +195,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { diff --git a/patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch similarity index 98% rename from patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch index ebdb686959..a924dbbc05 100644 --- a/patches/server/0674-Fix-commands-from-signs-not-firing-command-events.patch +++ b/patches/server/0675-Fix-commands-from-signs-not-firing-command-events.patch @@ -10,7 +10,7 @@ This patch changes sign command logic so that `run_command` click events: - sends failure messages to the player who clicked the sign diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 1ae2e1599cb5b8612ca5b45c37367377d7f26dbf..0731dcc367b621b18c2435db053645e9f9af2a80 100644 +index d2c6fa510c72cd7992fb7282ef152f7e86a6c1f3..e55e319851e9551bcfa17ff5db5f9bb7f9ae2a00 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -932,4 +932,9 @@ public class PaperWorldConfig { diff --git a/patches/server/0675-Adds-PlayerArmSwingEvent.patch b/patches/server/0676-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0675-Adds-PlayerArmSwingEvent.patch rename to patches/server/0676-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0676-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/server/0677-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch similarity index 98% rename from patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch index 5fc0475e6b..44f08c3b19 100644 --- a/patches/server/0677-Add-config-for-mobs-immune-to-default-effects.patch +++ b/patches/server/0678-Add-config-for-mobs-immune-to-default-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add config for mobs immune to default effects diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0731dcc367b621b18c2435db053645e9f9af2a80..b7d30804bfd4f9a2f379f5b77dcb6ae7446a76e9 100644 +index e55e319851e9551bcfa17ff5db5f9bb7f9ae2a00..2c8d64c965685ca2c17b8a735e1ea28a521398c9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -730,6 +730,21 @@ public class PaperWorldConfig { diff --git a/patches/server/0678-Fix-incorrect-message-for-outdated-client.patch b/patches/server/0679-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0678-Fix-incorrect-message-for-outdated-client.patch rename to patches/server/0679-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0679-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0680-Don-t-apply-cramming-damage-to-players.patch similarity index 95% rename from patches/server/0679-Don-t-apply-cramming-damage-to-players.patch rename to patches/server/0680-Don-t-apply-cramming-damage-to-players.patch index a4364e6124..77dcc67341 100644 --- a/patches/server/0679-Don-t-apply-cramming-damage-to-players.patch +++ b/patches/server/0680-Don-t-apply-cramming-damage-to-players.patch @@ -11,7 +11,7 @@ It does not make a lot of sense to damage players if they get crammed, For those who really want it a config option is provided. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b7d30804bfd4f9a2f379f5b77dcb6ae7446a76e9..b05b400dbee7963c48478368bd4950f2910b69bc 100644 +index 2c8d64c965685ca2c17b8a735e1ea28a521398c9..b0b17ae4f0e50a13b5e630a65d965f1279f4f825 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -952,4 +952,9 @@ public class PaperWorldConfig { diff --git a/patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 99% rename from patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch index d668c3e1e5..370f722f01 100644 --- a/patches/server/0680-Rate-options-and-timings-for-sensors-and-behaviors.patch +++ b/patches/server/0681-Rate-options-and-timings-for-sensors-and-behaviors.patch @@ -28,7 +28,7 @@ index b47b7dce26805badd422c1867733ff4bfd00e9f4..b27021a42cbed3f0648a8d0903d00d03 * Get a named timer for the specified tile entity type to track type specific timings. * @param entity diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b05b400dbee7963c48478368bd4950f2910b69bc..d1a00ef7ef9ffe4f474ce3d5513df912faacf871 100644 +index b0b17ae4f0e50a13b5e630a65d965f1279f4f825..cfea4d7ecc2f4ce077a1204bc482e94adfc36d2d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -9,8 +9,10 @@ import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap; diff --git a/patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0681-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/server/0682-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0682-Stinger-API.patch b/patches/server/0683-Stinger-API.patch similarity index 100% rename from patches/server/0682-Stinger-API.patch rename to patches/server/0683-Stinger-API.patch diff --git a/patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0683-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/server/0684-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0684-Add-System.out-err-catcher.patch b/patches/server/0685-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0684-Add-System.out-err-catcher.patch rename to patches/server/0685-Add-System.out-err-catcher.patch diff --git a/patches/server/0685-Fix-test-not-bootstrapping.patch b/patches/server/0686-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0685-Fix-test-not-bootstrapping.patch rename to patches/server/0686-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0686-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/server/0687-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0687-Improve-boat-collision-performance.patch b/patches/server/0688-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0687-Improve-boat-collision-performance.patch rename to patches/server/0688-Improve-boat-collision-performance.patch diff --git a/patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0688-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/server/0689-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0689-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/server/0690-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0690-Add-PlayerSetSpawnEvent.patch b/patches/server/0691-Add-PlayerSetSpawnEvent.patch similarity index 99% rename from patches/server/0690-Add-PlayerSetSpawnEvent.patch rename to patches/server/0691-Add-PlayerSetSpawnEvent.patch index 9344cc45ac..713e30cab4 100644 --- a/patches/server/0690-Add-PlayerSetSpawnEvent.patch +++ b/patches/server/0691-Add-PlayerSetSpawnEvent.patch @@ -129,7 +129,7 @@ index c3e49a781f838e6a46cb89744f3f1846de182275..c2f3d3a09327e7cb7d3167609eb3ce68 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 720ccaa64293b075c893f1e4f64a35e0fc43b869..4b3dd5ac0a238966dce53dc7523ec2a2f753a6e7 100644 +index 10ae4c1a3cd93dc89a6b43256b522cf8f430ee3e..e1cb5c8cc3acc1596328808df3f6938776ab9b17 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1197,9 +1197,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0691-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/server/0692-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0692-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0693-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0692-Optimize-entity-tracker-passenger-checks.patch rename to patches/server/0693-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0693-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0694-Config-option-for-Piglins-guarding-chests.patch similarity index 94% rename from patches/server/0693-Config-option-for-Piglins-guarding-chests.patch rename to patches/server/0694-Config-option-for-Piglins-guarding-chests.patch index 83c1a0623d..34dd701b2d 100644 --- a/patches/server/0693-Config-option-for-Piglins-guarding-chests.patch +++ b/patches/server/0694-Config-option-for-Piglins-guarding-chests.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config option for Piglins guarding chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d1a00ef7ef9ffe4f474ce3d5513df912faacf871..ebc8ffcf19a1eb8e1e318df3aca6cc80beacb16f 100644 +index cfea4d7ecc2f4ce077a1204bc482e94adfc36d2d..11be4a7acf0338134eb7eb24600c6462ac1b582b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -82,6 +82,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0694-Added-EntityDamageItemEvent.patch b/patches/server/0695-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0694-Added-EntityDamageItemEvent.patch rename to patches/server/0695-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0695-Optimize-indirect-passenger-iteration.patch b/patches/server/0696-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0695-Optimize-indirect-passenger-iteration.patch rename to patches/server/0696-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch b/patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch similarity index 100% rename from patches/server/0696-Fix-block-drops-position-losing-precision-millions-o.patch rename to patches/server/0697-Fix-block-drops-position-losing-precision-millions-o.patch diff --git a/patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch similarity index 96% rename from patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch index f95b69a700..a67a7f126f 100644 --- a/patches/server/0697-Configurable-item-frame-map-cursor-update-interval.patch +++ b/patches/server/0698-Configurable-item-frame-map-cursor-update-interval.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable item frame map cursor update interval diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index ebc8ffcf19a1eb8e1e318df3aca6cc80beacb16f..a3e25ebe096a687de0b63f9618c49198ebea2074 100644 +index 11be4a7acf0338134eb7eb24600c6462ac1b582b..f3a28661841a194cc3a952cc54e036ff6845080b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -945,6 +945,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0698-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0699-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0698-Make-EntityUnleashEvent-cancellable.patch rename to patches/server/0699-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0699-Clear-bucket-NBT-after-dispense.patch b/patches/server/0700-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0699-Clear-bucket-NBT-after-dispense.patch rename to patches/server/0700-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0700-Change-EnderEye-target-without-changing-other-things.patch rename to patches/server/0701-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0701-Add-BlockBreakBlockEvent.patch b/patches/server/0702-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0701-Add-BlockBreakBlockEvent.patch rename to patches/server/0702-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0702-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/server/0703-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0703-More-CommandBlock-API.patch b/patches/server/0704-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0703-More-CommandBlock-API.patch rename to patches/server/0704-More-CommandBlock-API.patch diff --git a/patches/server/0704-Add-missing-team-sidebar-display-slots.patch b/patches/server/0705-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0704-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0705-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0705-Add-back-EntityPortalExitEvent.patch b/patches/server/0706-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0705-Add-back-EntityPortalExitEvent.patch rename to patches/server/0706-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 96% rename from patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch index c7e57e9756..6dd627c368 100644 --- a/patches/server/0706-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/server/0707-Add-methods-to-find-targets-for-lightning-strikes.patch @@ -29,7 +29,7 @@ index 62bb1fd46e4dff43e9c83c05260c7deaffe445a9..87d7a28aa9060b0576b443cb67cea9e7 blockposition1 = blockposition1.above(2); } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1274bc5324f8cbf1ae8d37190eafeb8cb9b6e233..ac4aaf2efa1217f4b57e483adbdb13b394619813 100644 +index aea681f994fc97390aa29a2338f9a92eb6a4a806..8187f1fd64add9b76e56df7f15024bb1eb7e393d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -691,6 +691,23 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0707-Get-entity-default-attributes.patch b/patches/server/0708-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0707-Get-entity-default-attributes.patch rename to patches/server/0708-Get-entity-default-attributes.patch diff --git a/patches/server/0708-Left-handed-API.patch b/patches/server/0709-Left-handed-API.patch similarity index 100% rename from patches/server/0708-Left-handed-API.patch rename to patches/server/0709-Left-handed-API.patch diff --git a/patches/server/0709-Add-advancement-display-API.patch b/patches/server/0710-Add-advancement-display-API.patch similarity index 100% rename from patches/server/0709-Add-advancement-display-API.patch rename to patches/server/0710-Add-advancement-display-API.patch diff --git a/patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch b/patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch similarity index 100% rename from patches/server/0710-Add-ItemFactory-getMonsterEgg-API.patch rename to patches/server/0711-Add-ItemFactory-getMonsterEgg-API.patch diff --git a/patches/server/0711-Add-critical-damage-API.patch b/patches/server/0712-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0711-Add-critical-damage-API.patch rename to patches/server/0712-Add-critical-damage-API.patch diff --git a/patches/server/0712-Fix-issues-with-mob-conversion.patch b/patches/server/0713-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0712-Fix-issues-with-mob-conversion.patch rename to patches/server/0713-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0713-Add-isCollidable-methods-to-various-places.patch b/patches/server/0714-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0713-Add-isCollidable-methods-to-various-places.patch rename to patches/server/0714-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0714-Goat-ram-API.patch b/patches/server/0715-Goat-ram-API.patch similarity index 100% rename from patches/server/0714-Goat-ram-API.patch rename to patches/server/0715-Goat-ram-API.patch diff --git a/patches/server/0715-Add-API-for-resetting-a-single-score.patch b/patches/server/0716-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0715-Add-API-for-resetting-a-single-score.patch rename to patches/server/0716-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0716-Add-Raw-Byte-Entity-Serialization.patch rename to patches/server/0717-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0717-Vanilla-command-permission-fixes.patch b/patches/server/0718-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0717-Vanilla-command-permission-fixes.patch rename to patches/server/0718-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0718-Make-CallbackExecutor-strict-again.patch b/patches/server/0719-Make-CallbackExecutor-strict-again.patch similarity index 100% rename from patches/server/0718-Make-CallbackExecutor-strict-again.patch rename to patches/server/0719-Make-CallbackExecutor-strict-again.patch diff --git a/patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 100% rename from patches/server/0719-Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/server/0720-Do-not-allow-the-server-to-unload-chunks-at-request-.patch diff --git a/patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0720-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/server/0721-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch b/patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch similarity index 100% rename from patches/server/0721-Correctly-handle-recursion-for-chunkholder-updates.patch rename to patches/server/0722-Correctly-handle-recursion-for-chunkholder-updates.patch diff --git a/patches/server/0722-Fix-GameProfileCache-concurrency.patch b/patches/server/0723-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0722-Fix-GameProfileCache-concurrency.patch rename to patches/server/0723-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch b/patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch similarity index 100% rename from patches/server/0723-Fix-chunks-refusing-to-unload-at-low-TPS.patch rename to patches/server/0724-Fix-chunks-refusing-to-unload-at-low-TPS.patch diff --git a/patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch b/patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch similarity index 100% rename from patches/server/0724-Do-not-allow-ticket-level-changes-while-unloading-pl.patch rename to patches/server/0725-Do-not-allow-ticket-level-changes-while-unloading-pl.patch diff --git a/patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch b/patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch similarity index 100% rename from patches/server/0725-Do-not-allow-ticket-level-changes-when-updating-chun.patch rename to patches/server/0726-Do-not-allow-ticket-level-changes-when-updating-chun.patch diff --git a/patches/server/0726-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0726-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/server/0727-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0727-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0728-Log-when-the-async-catcher-is-tripped.patch similarity index 100% rename from patches/server/0727-Log-when-the-async-catcher-is-tripped.patch rename to patches/server/0728-Log-when-the-async-catcher-is-tripped.patch diff --git a/patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 99% rename from patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch index 94aef47fcd..f74a663756 100644 --- a/patches/server/0728-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/server/0729-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -312,7 +312,7 @@ index 9486c53285fabb2d72b2bc3881673cd6640bd50e..a97565735bf6005b77859e8453171cd8 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ac4aaf2efa1217f4b57e483adbdb13b394619813..fdc4879ff05616dfe89b78bfae5c1d9aad87577d 100644 +index 8187f1fd64add9b76e56df7f15024bb1eb7e393d..ed2c1f50fd8baee7c291675177f1bc2d86ee9d68 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1706,9 +1706,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch b/patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch similarity index 100% rename from patches/server/0729-Prevent-unload-calls-removing-tickets-for-sync-loads.patch rename to patches/server/0730-Prevent-unload-calls-removing-tickets-for-sync-loads.patch diff --git a/patches/server/0730-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0731-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0730-Sanitize-ResourceLocation-error-logging.patch rename to patches/server/0731-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0731-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0732-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0731-Allow-controlled-flushing-for-network-manager.patch rename to patches/server/0732-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0732-Add-more-async-catchers.patch b/patches/server/0733-Add-more-async-catchers.patch similarity index 100% rename from patches/server/0732-Add-more-async-catchers.patch rename to patches/server/0733-Add-more-async-catchers.patch diff --git a/patches/server/0733-Rewrite-entity-bounding-box-lookup-calls.patch b/patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch similarity index 100% rename from patches/server/0733-Rewrite-entity-bounding-box-lookup-calls.patch rename to patches/server/0734-Rewrite-entity-bounding-box-lookup-calls.patch diff --git a/patches/server/0734-Optimise-chunk-tick-iteration.patch b/patches/server/0735-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0734-Optimise-chunk-tick-iteration.patch rename to patches/server/0735-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0735-Execute-chunk-tasks-mid-tick.patch b/patches/server/0736-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0735-Execute-chunk-tasks-mid-tick.patch rename to patches/server/0736-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0736-Do-not-copy-visible-chunks.patch b/patches/server/0737-Do-not-copy-visible-chunks.patch similarity index 99% rename from patches/server/0736-Do-not-copy-visible-chunks.patch rename to patches/server/0737-Do-not-copy-visible-chunks.patch index c49083b4a4..d3e9b80e30 100644 --- a/patches/server/0736-Do-not-copy-visible-chunks.patch +++ b/patches/server/0737-Do-not-copy-visible-chunks.patch @@ -186,7 +186,7 @@ index bb9f0614b9a2945c78f1b45a70adcb6a22bfda2b..66a627a6b58ef5b420aceb0a3a1bcf90 while (objectbidirectionaliterator.hasNext()) { Entry entry = (Entry) objectbidirectionaliterator.next(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index fdc4879ff05616dfe89b78bfae5c1d9aad87577d..24d2a9b4a1c602b8ac5960ed9668ab70f34d6620 100644 +index ed2c1f50fd8baee7c291675177f1bc2d86ee9d68..58f6348b04d776d510c0ede4e36a202e2fcb765c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -161,7 +161,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0737-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0737-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/server/0738-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0738-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0738-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/server/0739-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0739-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0740-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0739-Detail-more-information-in-watchdog-dumps.patch rename to patches/server/0740-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0740-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0741-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0740-Manually-inline-methods-in-BlockPosition.patch rename to patches/server/0741-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0741-Distance-manager-tick-timings.patch b/patches/server/0742-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0741-Distance-manager-tick-timings.patch rename to patches/server/0742-Distance-manager-tick-timings.patch diff --git a/patches/server/0742-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0742-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/server/0743-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0743-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0743-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/server/0744-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0744-Add-packet-limiter-config.patch b/patches/server/0745-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0744-Add-packet-limiter-config.patch rename to patches/server/0745-Add-packet-limiter-config.patch diff --git a/patches/server/0745-Use-correct-LevelStem-registry-when-loading-default-.patch b/patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch similarity index 100% rename from patches/server/0745-Use-correct-LevelStem-registry-when-loading-default-.patch rename to patches/server/0746-Use-correct-LevelStem-registry-when-loading-default-.patch diff --git a/patches/server/0746-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0746-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/server/0747-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0747-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0747-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/server/0748-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0748-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0748-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/server/0749-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0749-Time-scoreboard-search.patch b/patches/server/0750-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0749-Time-scoreboard-search.patch rename to patches/server/0750-Time-scoreboard-search.patch diff --git a/patches/server/0750-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0750-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/server/0751-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0751-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0751-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/server/0752-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0752-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0753-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0752-Oprimise-map-impl-for-tracked-players.patch rename to patches/server/0753-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0753-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0753-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/server/0754-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0754-Allow-removal-addition-of-entities-to-entity-ticklis.patch b/patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch similarity index 100% rename from patches/server/0754-Allow-removal-addition-of-entities-to-entity-ticklis.patch rename to patches/server/0755-Allow-removal-addition-of-entities-to-entity-ticklis.patch diff --git a/patches/server/0755-Optimise-random-block-ticking.patch b/patches/server/0756-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0755-Optimise-random-block-ticking.patch rename to patches/server/0756-Optimise-random-block-ticking.patch diff --git a/patches/server/0756-Optimise-non-flush-packet-sending.patch b/patches/server/0757-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0756-Optimise-non-flush-packet-sending.patch rename to patches/server/0757-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0757-Optimise-nearby-player-lookups.patch b/patches/server/0758-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0757-Optimise-nearby-player-lookups.patch rename to patches/server/0758-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0758-Optimise-WorldServer-notify.patch b/patches/server/0759-Optimise-WorldServer-notify.patch similarity index 100% rename from patches/server/0758-Optimise-WorldServer-notify.patch rename to patches/server/0759-Optimise-WorldServer-notify.patch diff --git a/patches/server/0759-Remove-streams-for-villager-AI.patch b/patches/server/0760-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0759-Remove-streams-for-villager-AI.patch rename to patches/server/0760-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0760-Rewrite-dataconverter-system.patch b/patches/server/0761-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0760-Rewrite-dataconverter-system.patch rename to patches/server/0761-Rewrite-dataconverter-system.patch diff --git a/patches/server/0761-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0761-Use-Velocity-compression-and-cipher-natives.patch rename to patches/server/0762-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0762-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0762-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/server/0763-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0763-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch b/patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch similarity index 100% rename from patches/server/0763-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch rename to patches/server/0764-Do-not-process-entity-loads-in-CraftChunk-getEntitie.patch diff --git a/patches/server/0764-Async-catch-modifications-to-critical-entity-state.patch b/patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch similarity index 100% rename from patches/server/0764-Async-catch-modifications-to-critical-entity-state.patch rename to patches/server/0765-Async-catch-modifications-to-critical-entity-state.patch diff --git a/patches/server/0765-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0765-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/server/0766-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0766-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0766-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/server/0767-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0767-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0767-Check-requirement-before-suggesting-root-nodes.patch rename to patches/server/0768-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0768-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0768-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/server/0769-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0769-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0769-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/server/0770-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0770-Ensure-valid-vehicle-status.patch b/patches/server/0771-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0770-Ensure-valid-vehicle-status.patch rename to patches/server/0771-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0771-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0771-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/server/0772-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/server/0773-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0773-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0774-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0773-Don-t-log-debug-logging-being-disabled.patch rename to patches/server/0774-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0774-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0775-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0774-fix-various-menus-with-empty-level-accesses.patch rename to patches/server/0775-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0775-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch b/patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch similarity index 100% rename from patches/server/0775-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch rename to patches/server/0776-Do-not-overload-I-O-threads-with-chunk-data-while-fl.patch diff --git a/patches/server/0776-Preserve-overstacked-loot.patch b/patches/server/0777-Preserve-overstacked-loot.patch similarity index 97% rename from patches/server/0776-Preserve-overstacked-loot.patch rename to patches/server/0777-Preserve-overstacked-loot.patch index 9f560636ac..6e9c5374e9 100644 --- a/patches/server/0776-Preserve-overstacked-loot.patch +++ b/patches/server/0777-Preserve-overstacked-loot.patch @@ -10,7 +10,7 @@ chunk bans via the large amount of NBT created by unstacking the items. Fixes GH-5140 and GH-4748. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a3e25ebe096a687de0b63f9618c49198ebea2074..98bcdc50770d9ebd5a07b20f872cfc7ef78daa94 100644 +index f3a28661841a194cc3a952cc54e036ff6845080b..5c43fe70f8c87b0a83f10f9608ddca556e99e634 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -970,6 +970,11 @@ public class PaperWorldConfig { diff --git a/patches/server/0777-Update-head-rotation-in-missing-places.patch b/patches/server/0778-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0777-Update-head-rotation-in-missing-places.patch rename to patches/server/0778-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0778-prevent-unintended-light-block-manipulation.patch b/patches/server/0779-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0778-prevent-unintended-light-block-manipulation.patch rename to patches/server/0779-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0779-Fix-CraftCriteria-defaults-map.patch b/patches/server/0780-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0779-Fix-CraftCriteria-defaults-map.patch rename to patches/server/0780-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0780-Fix-upstreams-block-state-factories.patch b/patches/server/0781-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0780-Fix-upstreams-block-state-factories.patch rename to patches/server/0781-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0781-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0781-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/server/0782-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0782-Configurable-feature-seeds.patch b/patches/server/0783-Configurable-feature-seeds.patch similarity index 98% rename from patches/server/0782-Configurable-feature-seeds.patch rename to patches/server/0783-Configurable-feature-seeds.patch index e0d2817cbd..e5a2c768cd 100644 --- a/patches/server/0782-Configurable-feature-seeds.patch +++ b/patches/server/0783-Configurable-feature-seeds.patch @@ -19,7 +19,7 @@ index 4092a227a540a1c5cfb95efcc2a36e049b9a979c..e2f60115370f19e935eb3b14d5de99aa } final Object val = config.get(key); diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 98bcdc50770d9ebd5a07b20f872cfc7ef78daa94..409cffcf74b32beba09b2fe800d1329ee64426f8 100644 +index 5c43fe70f8c87b0a83f10f9608ddca556e99e634..28b4188cd15d297e4b89ab98f78cecd7a5a95c52 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -1015,6 +1015,55 @@ public class PaperWorldConfig { diff --git a/patches/server/0783-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0783-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/server/0784-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0784-Add-root-admin-user-detection.patch b/patches/server/0785-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0784-Add-root-admin-user-detection.patch rename to patches/server/0785-Add-root-admin-user-detection.patch diff --git a/patches/server/0785-Always-allow-item-changing-in-Fireball.patch b/patches/server/0786-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0785-Always-allow-item-changing-in-Fireball.patch rename to patches/server/0786-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0786-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0786-don-t-attempt-to-teleport-dead-entities.patch rename to patches/server/0787-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0787-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0787-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/server/0788-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0788-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0788-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/server/0789-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0789-Rewrite-the-light-engine.patch b/patches/server/0790-Rewrite-the-light-engine.patch similarity index 100% rename from patches/server/0789-Rewrite-the-light-engine.patch rename to patches/server/0790-Rewrite-the-light-engine.patch diff --git a/patches/server/0790-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 96% rename from patches/server/0790-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch index 1216f7131c..ad67ee45f7 100644 --- a/patches/server/0790-Always-parse-protochunk-light-sources-unless-it-is-m.patch +++ b/patches/server/0791-Always-parse-protochunk-light-sources-unless-it-is-m.patch @@ -8,7 +8,7 @@ Chunks not marked as lit will always go through the light engine, so they should always have their block sources parsed. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java -index 3c220d833ca6bb9409bc71d6f61e61783dba236b..727e652cc233e983d6e7ce0e5a1937afa7355a5d 100644 +index 3a2d6200d41c9758763d7a975d62e6e6842da3e2..8038688a9a5cd691cdd6fde45662a10e4b27c782 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkSerializer.java @@ -318,16 +318,33 @@ public class ChunkSerializer { diff --git a/patches/server/0791-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0791-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/server/0792-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0792-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0792-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/server/0793-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0793-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch similarity index 98% rename from patches/server/0793-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch index 1590c5832c..005e8e673b 100644 --- a/patches/server/0793-Hide-unnecessary-itemmeta-from-clients.patch +++ b/patches/server/0794-Hide-unnecessary-itemmeta-from-clients.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Hide unnecessary itemmeta from clients diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 409cffcf74b32beba09b2fe800d1329ee64426f8..99008ac6943c56f74f912e739709a4724da322ef 100644 +index 28b4188cd15d297e4b89ab98f78cecd7a5a95c52..d618afa4dc54d0abff18e90121663e14e0416c2b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -985,6 +985,13 @@ public class PaperWorldConfig { diff --git a/patches/server/0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch b/patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch similarity index 100% rename from patches/server/0794-Fix-kelp-modifier-changing-growth-for-other-crops.patch rename to patches/server/0795-Fix-kelp-modifier-changing-growth-for-other-crops.patch diff --git a/patches/server/0795-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0795-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/server/0796-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0796-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0797-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0796-Add-PlayerItemFrameChangeEvent.patch rename to patches/server/0797-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0797-Add-player-health-update-API.patch b/patches/server/0798-Add-player-health-update-API.patch similarity index 95% rename from patches/server/0797-Add-player-health-update-API.patch rename to patches/server/0798-Add-player-health-update-API.patch index a120e81f54..0703d96a7b 100644 --- a/patches/server/0797-Add-player-health-update-API.patch +++ b/patches/server/0798-Add-player-health-update-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add player health update API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4b3dd5ac0a238966dce53dc7523ec2a2f753a6e7..1ad8ab6c9413e79385b2f796c960ea3184d72bdf 100644 +index e1cb5c8cc3acc1596328808df3f6938776ab9b17..ec42e6394a1a2f669ab52923c04500722ef9908e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2133,9 +2133,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0798-Optimize-HashMapPalette.patch b/patches/server/0799-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0798-Optimize-HashMapPalette.patch rename to patches/server/0799-Optimize-HashMapPalette.patch diff --git a/patches/server/0799-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0799-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/server/0800-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/0800-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/server/0801-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/0801-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0801-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/server/0802-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0802-Actually-unload-POI-data.patch b/patches/server/0803-Actually-unload-POI-data.patch similarity index 100% rename from patches/server/0802-Actually-unload-POI-data.patch rename to patches/server/0803-Actually-unload-POI-data.patch diff --git a/patches/server/0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0803-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/server/0804-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0804-Update-Log4j.patch b/patches/server/0805-Update-Log4j.patch similarity index 100% rename from patches/server/0804-Update-Log4j.patch rename to patches/server/0805-Update-Log4j.patch diff --git a/patches/server/0805-Add-more-Campfire-API.patch b/patches/server/0806-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0805-Add-more-Campfire-API.patch rename to patches/server/0806-Add-more-Campfire-API.patch diff --git a/patches/server/0806-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0806-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/server/0807-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0807-Fix-tripwire-state-inconsistency.patch b/patches/server/0808-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0807-Fix-tripwire-state-inconsistency.patch rename to patches/server/0808-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0808-Fix-fluid-logging-on-Block-breakNaturally.patch b/patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch similarity index 100% rename from patches/server/0808-Fix-fluid-logging-on-Block-breakNaturally.patch rename to patches/server/0809-Fix-fluid-logging-on-Block-breakNaturally.patch diff --git a/patches/server/0809-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0810-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0809-Forward-CraftEntity-in-teleport-command.patch rename to patches/server/0810-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0810-Improve-scoreboard-entries.patch b/patches/server/0811-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0810-Improve-scoreboard-entries.patch rename to patches/server/0811-Improve-scoreboard-entries.patch diff --git a/patches/server/0811-Entity-powdered-snow-API.patch b/patches/server/0812-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0811-Entity-powdered-snow-API.patch rename to patches/server/0812-Entity-powdered-snow-API.patch diff --git a/patches/server/0812-Add-API-for-item-entity-health.patch b/patches/server/0813-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0812-Add-API-for-item-entity-health.patch rename to patches/server/0813-Add-API-for-item-entity-health.patch diff --git a/patches/server/0813-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0813-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/server/0814-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0814-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch similarity index 95% rename from patches/server/0814-Configurable-max-block-light-for-monster-spawning.patch rename to patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch index a79ba16243..4602b1752a 100644 --- a/patches/server/0814-Configurable-max-block-light-for-monster-spawning.patch +++ b/patches/server/0815-Configurable-max-block-light-for-monster-spawning.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max block light for monster spawning diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 99008ac6943c56f74f912e739709a4724da322ef..b2d9dbf4e006899a932bd6bed40228d4f744d865 100644 +index d618afa4dc54d0abff18e90121663e14e0416c2b..4933961ab8bc29749c053c6c54c5d2138f2c1742 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -1083,4 +1083,9 @@ public class PaperWorldConfig { diff --git a/patches/server/0815-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0815-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/server/0816-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0816-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0816-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/server/0817-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0817-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0817-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/server/0818-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0818-Fix-bees-aging-inside-hives.patch b/patches/server/0819-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0818-Fix-bees-aging-inside-hives.patch rename to patches/server/0819-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0819-Bucketable-API.patch b/patches/server/0820-Bucketable-API.patch similarity index 100% rename from patches/server/0819-Bucketable-API.patch rename to patches/server/0820-Bucketable-API.patch diff --git a/patches/server/0820-Check-player-world-in-endPortalSoundRadius.patch b/patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch similarity index 100% rename from patches/server/0820-Check-player-world-in-endPortalSoundRadius.patch rename to patches/server/0821-Check-player-world-in-endPortalSoundRadius.patch diff --git a/patches/server/0821-Validate-usernames.patch b/patches/server/0822-Validate-usernames.patch similarity index 100% rename from patches/server/0821-Validate-usernames.patch rename to patches/server/0822-Validate-usernames.patch diff --git a/patches/server/0822-Fix-saving-configs-with-more-long-comments.patch b/patches/server/0823-Fix-saving-configs-with-more-long-comments.patch similarity index 100% rename from patches/server/0822-Fix-saving-configs-with-more-long-comments.patch rename to patches/server/0823-Fix-saving-configs-with-more-long-comments.patch diff --git a/patches/server/0823-Make-water-animal-spawn-height-configurable.patch b/patches/server/0824-Make-water-animal-spawn-height-configurable.patch similarity index 96% rename from patches/server/0823-Make-water-animal-spawn-height-configurable.patch rename to patches/server/0824-Make-water-animal-spawn-height-configurable.patch index 80ed0e4913..7fdc96c597 100644 --- a/patches/server/0823-Make-water-animal-spawn-height-configurable.patch +++ b/patches/server/0824-Make-water-animal-spawn-height-configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make water animal spawn height configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b2d9dbf4e006899a932bd6bed40228d4f744d865..100de7e366c4ea8ce158b0fc0258e4db0ee83249 100644 +index 4933961ab8bc29749c053c6c54c5d2138f2c1742..88938b54b504b10c5cb0d22f2daa5fcb4075e12c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -426,6 +426,24 @@ public class PaperWorldConfig { diff --git a/patches/server/0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0824-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/server/0825-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0825-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0825-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/server/0826-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0826-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0826-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/server/0827-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0827-Multiple-Entries-with-Scoreboards.patch b/patches/server/0828-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0827-Multiple-Entries-with-Scoreboards.patch rename to patches/server/0828-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0828-Reset-placed-block-on-exception.patch b/patches/server/0829-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0828-Reset-placed-block-on-exception.patch rename to patches/server/0829-Reset-placed-block-on-exception.patch diff --git a/patches/server/0829-Add-configurable-height-for-slime-spawn.patch b/patches/server/0830-Add-configurable-height-for-slime-spawn.patch similarity index 97% rename from patches/server/0829-Add-configurable-height-for-slime-spawn.patch rename to patches/server/0830-Add-configurable-height-for-slime-spawn.patch index cd55b20001..3e6102d344 100644 --- a/patches/server/0829-Add-configurable-height-for-slime-spawn.patch +++ b/patches/server/0830-Add-configurable-height-for-slime-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable height for slime spawn diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 100de7e366c4ea8ce158b0fc0258e4db0ee83249..b13d4dc311f25f9d3132697381e52beb06122b30 100644 +index 88938b54b504b10c5cb0d22f2daa5fcb4075e12c..145c9fb394ec18bc18c43157d7e4ed2b9c8380fa 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -464,6 +464,16 @@ public class PaperWorldConfig { diff --git a/patches/server/0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0830-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/server/0831-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0831-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0832-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0831-Fix-xp-reward-for-baby-zombies.patch rename to patches/server/0832-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0832-Kick-on-main-for-illegal-chars.patch b/patches/server/0833-Kick-on-main-for-illegal-chars.patch similarity index 100% rename from patches/server/0832-Kick-on-main-for-illegal-chars.patch rename to patches/server/0833-Kick-on-main-for-illegal-chars.patch diff --git a/patches/server/0833-Multi-Block-Change-API-Implementation.patch b/patches/server/0834-Multi-Block-Change-API-Implementation.patch similarity index 97% rename from patches/server/0833-Multi-Block-Change-API-Implementation.patch rename to patches/server/0834-Multi-Block-Change-API-Implementation.patch index c3a6b47e42..68af38205f 100644 --- a/patches/server/0833-Multi-Block-Change-API-Implementation.patch +++ b/patches/server/0834-Multi-Block-Change-API-Implementation.patch @@ -25,7 +25,7 @@ index 82ea4fabd5732052a286d50bcff8bbcc2c4aa7d7..652bea6868a03a5315965f79c76172fb public void write(FriendlyByteBuf buf) { buf.writeLong(this.sectionPos.asLong()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1ad8ab6c9413e79385b2f796c960ea3184d72bdf..01ac24f0999c9829bffeb76c228779f80a571687 100644 +index ec42e6394a1a2f669ab52923c04500722ef9908e..9bda669683a3062f99e798ea0a60d76373d46f4f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -29,6 +29,7 @@ import java.util.logging.Logger; diff --git a/patches/server/0834-Fix-NotePlayEvent.patch b/patches/server/0835-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0834-Fix-NotePlayEvent.patch rename to patches/server/0835-Fix-NotePlayEvent.patch diff --git a/patches/server/0835-Freeze-Tick-Lock-API.patch b/patches/server/0836-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0835-Freeze-Tick-Lock-API.patch rename to patches/server/0836-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0836-Dolphin-API.patch b/patches/server/0837-Dolphin-API.patch similarity index 100% rename from patches/server/0836-Dolphin-API.patch rename to patches/server/0837-Dolphin-API.patch diff --git a/patches/server/0837-More-PotionEffectType-API.patch b/patches/server/0838-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0837-More-PotionEffectType-API.patch rename to patches/server/0838-More-PotionEffectType-API.patch diff --git a/patches/server/0838-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0838-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/server/0839-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0839-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 98% rename from patches/server/0839-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch index 17126330a4..a14c960f96 100644 --- a/patches/server/0839-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/server/0840-API-for-creating-command-sender-which-forwards-feedb.patch @@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ebf70b414c63cdb715d739c3333adbafc3bd01e7..4895f27be18157ae7fa6837cc970828554b9ced5 100644 +index 1cde2ce9cf081f28ec93cd4d79d8d72500e641a7..08599184848a95884545cdc5a2a5cf1c08c53715 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1970,6 +1970,13 @@ public final class CraftServer implements Server { diff --git a/patches/server/0840-Add-config-for-stronghold-seed.patch b/patches/server/0841-Add-config-for-stronghold-seed.patch similarity index 100% rename from patches/server/0840-Add-config-for-stronghold-seed.patch rename to patches/server/0841-Add-config-for-stronghold-seed.patch diff --git a/patches/server/0841-Implement-regenerateChunk.patch b/patches/server/0842-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0841-Implement-regenerateChunk.patch rename to patches/server/0842-Implement-regenerateChunk.patch diff --git a/patches/server/0842-Log-exceptions-thrown-during-chat-processing.patch b/patches/server/0843-Log-exceptions-thrown-during-chat-processing.patch similarity index 100% rename from patches/server/0842-Log-exceptions-thrown-during-chat-processing.patch rename to patches/server/0843-Log-exceptions-thrown-during-chat-processing.patch diff --git a/patches/server/0843-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0844-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0843-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/server/0844-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0844-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 91% rename from patches/server/0844-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch index 3f3f31f50c..5f470d4ad8 100644 --- a/patches/server/0844-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch +++ b/patches/server/0845-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit Copies appropriate checks from CraftWorld#getSpawnLimit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4895f27be18157ae7fa6837cc970828554b9ced5..1d9fc45d3fcf8a704f9bb286daa13ba027215f0a 100644 +index 08599184848a95884545cdc5a2a5cf1c08c53715..feca9ee02e4b8fc30e9e29a36c7e6225c82f4bab 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2139,6 +2139,8 @@ public final class CraftServer implements Server { diff --git a/patches/server/0845-Add-GameEvent-tags.patch b/patches/server/0846-Add-GameEvent-tags.patch similarity index 97% rename from patches/server/0845-Add-GameEvent-tags.patch rename to patches/server/0846-Add-GameEvent-tags.patch index 513b938e8b..6b61237c17 100644 --- a/patches/server/0845-Add-GameEvent-tags.patch +++ b/patches/server/0846-Add-GameEvent-tags.patch @@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..cb78a3d4e21376ea24347187478525d5 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1d9fc45d3fcf8a704f9bb286daa13ba027215f0a..5706c8ded10f775c4834c1c9c3ed4be4c7afde55 100644 +index feca9ee02e4b8fc30e9e29a36c7e6225c82f4bab..303385d6c05102f56b696023cc1bd3d364f448f8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2545,6 +2545,15 @@ public final class CraftServer implements Server { diff --git a/patches/server/0846-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 94% rename from patches/server/0846-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch index 3d55321e07..ae9a89b362 100644 --- a/patches/server/0846-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch +++ b/patches/server/0847-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch @@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether, for example. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 718b477b2f53a3b2decb4c045ece12ab75aee23d..47966d87c525067f0bc3d587cdf869d89cf5710c 100644 +index 6d86f794228bf3617563f2096877957bf2d0e764..90a06ecb242bb5222eccf3839d6d1bcbfde6f680 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1312,6 +1312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop