From 714f0a04d07d59ad355d31513b8b84f6e62471c0 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 10 Jul 2020 23:08:29 -0500 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appears to apply and compile correctly Paper Changes: 60135676 [Auto] Updated Upstream (CraftBukkit) fa90052a Fix MC-125757 (#3859) 071c08d7 Only convert lore lines that actually look legacy 8c4787e3 Misc Improvements to Async Teleporting and Light patch 6133c83b [Auto] Updated Upstream (Bukkit/CraftBukkit) --- Paper | 2 +- current-paper | 2 +- .../server/0001-Tuinity-Server-Changes.patch | 209 ++++++++++-------- ...ways-increment-arrow-despawn-counter.patch | 26 --- ...72-Fix-Add-turtle-egg-block-options.patch} | 0 ... 0031-MC-4-Fix-Item-position-desync.patch} | 0 ...-vanilla-command-permission-handler.patch} | 0 ...settings-suppressing-pointless-logs.patch} | 2 +- ...> 0034-Disable-outdated-build-check.patch} | 2 +- ...gs.patch => 0035-Giants-AI-settings.patch} | 0 ...tch => 0036-Illusioners-AI-settings.patch} | 0 ...> 0037-Zombie-horse-naturally-spawn.patch} | 2 +- ...038-Charged-creeper-naturally-spawn.patch} | 0 ...it-naturally-spawn-toast-and-killer.patch} | 2 +- ...er-showing-in-ping-before-server-fu.patch} | 0 ...patch => 0041-Make-Iron-Golems-Swim.patch} | 0 ...42-Dont-send-useless-entity-packets.patch} | 0 ...atch => 0043-Tulips-change-fox-type.patch} | 0 ...patch => 0044-Breedable-Polar-Bears.patch} | 0 ...atch => 0045-Chickens-can-retaliate.patch} | 0 ...ption-to-set-armorstand-step-height.patch} | 0 ....patch => 0047-Cat-spawning-options.patch} | 2 +- ...n-black-cats-spawning-in-swamp-huts.patch} | 0 ...ms.patch => 0049-Cows-eat-mushrooms.patch} | 8 +- ...ow-rotation-when-shearing-mooshroom.patch} | 0 ...patch => 0051-Pigs-give-saddle-back.patch} | 0 ...2-Snowman-drop-and-put-back-pumpkin.patch} | 0 ...> 0053-Ender-dragon-always-drop-egg.patch} | 0 ...4-Ender-dragon-always-drop-full-exp.patch} | 0 ... 0055-Signs-editable-on-right-click.patch} | 0 ...tch => 0056-Signs-allow-color-codes.patch} | 2 +- ...oisten-from-water-directly-under-it.patch} | 0 ...atch => 0058-Controllable-Minecarts.patch} | 10 +- ...ble-loot-drops-on-death-by-cramming.patch} | 2 +- ...60-Players-should-not-cram-to-death.patch} | 2 +- ...tion-to-toggle-milk-curing-bad-omen.patch} | 0 ...ould-check-if-entity-can-use-portal.patch} | 0 ...g-stick-should-not-update-neighbors.patch} | 4 +- ...tch => 0064-Fix-reloading-paper.yml.patch} | 0 ...065-Fix-the-dead-lagging-the-server.patch} | 4 +- ...Skip-events-if-there-s-no-listeners.patch} | 0 ... 0067-Add-permission-for-F3-N-debug.patch} | 2 +- ...skeleton-takes-wither-damage-option.patch} | 0 ...ch => 0069-Configurable-TPS-Catchup.patch} | 0 ...ow-loyalty-on-tridents-to-work-in-t.patch} | 0 ...erman-and-creeper-griefing-controls.patch} | 0 ...p-loot-bypass-mob-griefing-gamerule.patch} | 0 ...ng-can-bypass-mob-griefing-gamerule.patch} | 0 ...074-Villagers-follow-emerald-blocks.patch} | 0 ...ch => 0075-Allow-leashing-villagers.patch} | 0 ...rable-search-radius-for-villagers-t.patch} | 0 ...tch => 0077-Implement-infinite-lava.patch} | 0 ...8-Make-lava-flow-speed-configurable.patch} | 0 ...dd-player-death-exp-control-options.patch} | 0 ...-disable-saving-projectiles-to-disk.patch} | 4 +- ...081-Configurable-void-damage-height.patch} | 2 +- ...-for-zombies-targetting-turtle-eggs.patch} | 0 ...spenser-curse-of-binding-protection.patch} | 0 ...-for-boats-to-eject-players-on-land.patch} | 0 ... 0085-Add-obfhelpers-for-plugin-use.patch} | 4 +- ...-mends-most-damages-equipment-first.patch} | 10 +- ...87-Implement-bamboo-growth-settings.patch} | 0 ...should-not-bypass-cramming-gamerule.patch} | 22 +- ...089-Add-5-second-tps-average-in-tps.patch} | 6 +- ...h => 0090-Implement-elytra-settings.patch} | 14 +- ...tch => 0091-Add-item-entity-options.patch} | 6 +- ...mand.patch => 0092-Add-ping-command.patch} | 0 ...=> 0093-Configurable-jockey-options.patch} | 0 ...d-to-crystals-and-crystals-shoot-ph.patch} | 10 +- ...095-Customizable-EnderDragon-Health.patch} | 0 ...tural-spawns-per-biome-configurable.patch} | 6 +- ...> 0097-Add-phantom-spawning-options.patch} | 14 +- ...098-Implement-bed-explosion-options.patch} | 4 +- ...nt-respawn-anchor-explosion-options.patch} | 4 +- ...tity-lookups-paper.yml-setting-not-.patch} | 4 +- ...Add-allow-water-in-end-world-option.patch} | 8 +- ...p-kicking-non-whitelisted-player-wh.patch} | 2 +- ...5885-Unable-to-disable-advancements.patch} | 0 ...-Bukkit-world-container-is-not-used.patch} | 0 ... => 0105-ALlow-color-codes-in-books.patch} | 0 ...107-Ridables.patch => 0106-Ridables.patch} | 4 +- 81 files changed, 205 insertions(+), 202 deletions(-) delete mode 100644 patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch rename patches/server/{0031-MC-168772-Fix-Add-turtle-egg-block-options.patch => 0030-MC-168772-Fix-Add-turtle-egg-block-options.patch} (100%) rename patches/server/{0032-MC-4-Fix-Item-position-desync.patch => 0031-MC-4-Fix-Item-position-desync.patch} (100%) rename patches/server/{0033-Fix-vanilla-command-permission-handler.patch => 0032-Fix-vanilla-command-permission-handler.patch} (100%) rename patches/server/{0034-Logger-settings-suppressing-pointless-logs.patch => 0033-Logger-settings-suppressing-pointless-logs.patch} (98%) rename patches/server/{0035-Disable-outdated-build-check.patch => 0034-Disable-outdated-build-check.patch} (97%) rename patches/server/{0036-Giants-AI-settings.patch => 0035-Giants-AI-settings.patch} (100%) rename patches/server/{0037-Illusioners-AI-settings.patch => 0036-Illusioners-AI-settings.patch} (100%) rename patches/server/{0038-Zombie-horse-naturally-spawn.patch => 0037-Zombie-horse-naturally-spawn.patch} (98%) rename patches/server/{0039-Charged-creeper-naturally-spawn.patch => 0038-Charged-creeper-naturally-spawn.patch} (100%) rename patches/server/{0040-Rabbit-naturally-spawn-toast-and-killer.patch => 0039-Rabbit-naturally-spawn-toast-and-killer.patch} (98%) rename patches/server/{0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (100%) rename patches/server/{0042-Make-Iron-Golems-Swim.patch => 0041-Make-Iron-Golems-Swim.patch} (100%) rename patches/server/{0043-Dont-send-useless-entity-packets.patch => 0042-Dont-send-useless-entity-packets.patch} (100%) rename patches/server/{0044-Tulips-change-fox-type.patch => 0043-Tulips-change-fox-type.patch} (100%) rename patches/server/{0045-Breedable-Polar-Bears.patch => 0044-Breedable-Polar-Bears.patch} (100%) rename patches/server/{0046-Chickens-can-retaliate.patch => 0045-Chickens-can-retaliate.patch} (100%) rename patches/server/{0047-Add-option-to-set-armorstand-step-height.patch => 0046-Add-option-to-set-armorstand-step-height.patch} (100%) rename patches/server/{0048-Cat-spawning-options.patch => 0047-Cat-spawning-options.patch} (99%) rename patches/server/{0049-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch => 0048-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch} (100%) rename patches/server/{0050-Cows-eat-mushrooms.patch => 0049-Cows-eat-mushrooms.patch} (98%) rename patches/server/{0051-Fix-cow-rotation-when-shearing-mooshroom.patch => 0050-Fix-cow-rotation-when-shearing-mooshroom.patch} (100%) rename patches/server/{0052-Pigs-give-saddle-back.patch => 0051-Pigs-give-saddle-back.patch} (100%) rename patches/server/{0053-Snowman-drop-and-put-back-pumpkin.patch => 0052-Snowman-drop-and-put-back-pumpkin.patch} (100%) rename patches/server/{0054-Ender-dragon-always-drop-egg.patch => 0053-Ender-dragon-always-drop-egg.patch} (100%) rename patches/server/{0055-Ender-dragon-always-drop-full-exp.patch => 0054-Ender-dragon-always-drop-full-exp.patch} (100%) rename patches/server/{0056-Signs-editable-on-right-click.patch => 0055-Signs-editable-on-right-click.patch} (100%) rename patches/server/{0057-Signs-allow-color-codes.patch => 0056-Signs-allow-color-codes.patch} (99%) rename patches/server/{0058-Allow-soil-to-moisten-from-water-directly-under-it.patch => 0057-Allow-soil-to-moisten-from-water-directly-under-it.patch} (100%) rename patches/server/{0059-Controllable-Minecarts.patch => 0058-Controllable-Minecarts.patch} (97%) rename patches/server/{0060-Disable-loot-drops-on-death-by-cramming.patch => 0059-Disable-loot-drops-on-death-by-cramming.patch} (98%) rename patches/server/{0061-Players-should-not-cram-to-death.patch => 0060-Players-should-not-cram-to-death.patch} (96%) rename patches/server/{0062-Option-to-toggle-milk-curing-bad-omen.patch => 0061-Option-to-toggle-milk-curing-bad-omen.patch} (100%) rename patches/server/{0063-End-gateway-should-check-if-entity-can-use-portal.patch => 0062-End-gateway-should-check-if-entity-can-use-portal.patch} (100%) rename patches/server/{0064-Debug-stick-should-not-update-neighbors.patch => 0063-Debug-stick-should-not-update-neighbors.patch} (91%) rename patches/server/{0065-Fix-reloading-paper.yml.patch => 0064-Fix-reloading-paper.yml.patch} (100%) rename patches/server/{0066-Fix-the-dead-lagging-the-server.patch => 0065-Fix-the-dead-lagging-the-server.patch} (95%) rename patches/server/{0067-Skip-events-if-there-s-no-listeners.patch => 0066-Skip-events-if-there-s-no-listeners.patch} (100%) rename patches/server/{0068-Add-permission-for-F3-N-debug.patch => 0067-Add-permission-for-F3-N-debug.patch} (95%) rename patches/server/{0069-Add-wither-skeleton-takes-wither-damage-option.patch => 0068-Add-wither-skeleton-takes-wither-damage-option.patch} (100%) rename patches/server/{0070-Configurable-TPS-Catchup.patch => 0069-Configurable-TPS-Catchup.patch} (100%) rename patches/server/{0071-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0070-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (100%) rename patches/server/{0072-Add-enderman-and-creeper-griefing-controls.patch => 0071-Add-enderman-and-creeper-griefing-controls.patch} (100%) rename patches/server/{0073-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch => 0072-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch} (100%) rename patches/server/{0074-Villagers-farming-can-bypass-mob-griefing-gamerule.patch => 0073-Villagers-farming-can-bypass-mob-griefing-gamerule.patch} (100%) rename patches/server/{0075-Villagers-follow-emerald-blocks.patch => 0074-Villagers-follow-emerald-blocks.patch} (100%) rename patches/server/{0076-Allow-leashing-villagers.patch => 0075-Allow-leashing-villagers.patch} (100%) rename patches/server/{0077-Implement-configurable-search-radius-for-villagers-t.patch => 0076-Implement-configurable-search-radius-for-villagers-t.patch} (100%) rename patches/server/{0078-Implement-infinite-lava.patch => 0077-Implement-infinite-lava.patch} (100%) rename patches/server/{0079-Make-lava-flow-speed-configurable.patch => 0078-Make-lava-flow-speed-configurable.patch} (100%) rename patches/server/{0080-Add-player-death-exp-control-options.patch => 0079-Add-player-death-exp-control-options.patch} (100%) rename patches/server/{0081-Add-option-to-disable-saving-projectiles-to-disk.patch => 0080-Add-option-to-disable-saving-projectiles-to-disk.patch} (98%) rename patches/server/{0082-Configurable-void-damage-height.patch => 0081-Configurable-void-damage-height.patch} (98%) rename patches/server/{0083-Add-option-for-zombies-targetting-turtle-eggs.patch => 0082-Add-option-for-zombies-targetting-turtle-eggs.patch} (100%) rename patches/server/{0084-Dispenser-curse-of-binding-protection.patch => 0083-Dispenser-curse-of-binding-protection.patch} (100%) rename patches/server/{0085-Add-option-for-boats-to-eject-players-on-land.patch => 0084-Add-option-for-boats-to-eject-players-on-land.patch} (100%) rename patches/server/{0086-Add-obfhelpers-for-plugin-use.patch => 0085-Add-obfhelpers-for-plugin-use.patch} (89%) rename patches/server/{0087-Mending-mends-most-damages-equipment-first.patch => 0086-Mending-mends-most-damages-equipment-first.patch} (96%) rename patches/server/{0088-Implement-bamboo-growth-settings.patch => 0087-Implement-bamboo-growth-settings.patch} (100%) rename patches/server/{0089-Climbing-should-not-bypass-cramming-gamerule.patch => 0088-Climbing-should-not-bypass-cramming-gamerule.patch} (95%) rename patches/server/{0090-Add-5-second-tps-average-in-tps.patch => 0089-Add-5-second-tps-average-in-tps.patch} (97%) rename patches/server/{0091-Implement-elytra-settings.patch => 0090-Implement-elytra-settings.patch} (96%) rename patches/server/{0092-Add-item-entity-options.patch => 0091-Add-item-entity-options.patch} (96%) rename patches/server/{0093-Add-ping-command.patch => 0092-Add-ping-command.patch} (100%) rename patches/server/{0094-Configurable-jockey-options.patch => 0093-Configurable-jockey-options.patch} (100%) rename patches/server/{0095-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0094-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (98%) rename patches/server/{0096-Customizable-EnderDragon-Health.patch => 0095-Customizable-EnderDragon-Health.patch} (100%) rename patches/server/{0097-Make-natural-spawns-per-biome-configurable.patch => 0096-Make-natural-spawns-per-biome-configurable.patch} (99%) rename patches/server/{0098-Add-phantom-spawning-options.patch => 0097-Add-phantom-spawning-options.patch} (98%) rename patches/server/{0099-Implement-bed-explosion-options.patch => 0098-Implement-bed-explosion-options.patch} (97%) rename patches/server/{0100-Implement-respawn-anchor-explosion-options.patch => 0099-Implement-respawn-anchor-explosion-options.patch} (98%) rename patches/server/{0101-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch => 0100-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch} (96%) rename patches/server/{0102-Add-allow-water-in-end-world-option.patch => 0101-Add-allow-water-in-end-world-option.patch} (97%) rename patches/server/{0103-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch => 0102-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch} (96%) rename patches/server/{0104-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch => 0103-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch} (100%) rename patches/server/{0105-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch => 0104-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch} (100%) rename patches/server/{0106-ALlow-color-codes-in-books.patch => 0105-ALlow-color-codes-in-books.patch} (100%) rename patches/server/{0107-Ridables.patch => 0106-Ridables.patch} (99%) diff --git a/Paper b/Paper index 2c9b37919..601356760 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 2c9b37919611260a1fb77977edb59a935e8d5073 +Subproject commit 601356760cc18decb4229f4543058fd3f170e191 diff --git a/current-paper b/current-paper index c3f1025d8..627c36e38 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.1--b427cf439285b4bf439cc0b4acbfe372de2e121e +1.16.1--0a9e35360868bb50344aa75df1ada180cc19e9bb diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index 4da3c4ae3..d827abd63 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Tuinity Server Changes diff --git a/pom.xml b/pom.xml -index ef8ee637a8..6fd5968178 100644 +index ef8ee637a..6fd596817 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -65,7 +65,7 @@ index ef8ee637a8..6fd5968178 100644 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index dd07223978..2966c57317 100644 +index dd0722397..2966c5731 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -43,6 +43,8 @@ public final class MinecraftTimings { @@ -78,7 +78,7 @@ index dd07223978..2966c57317 100644 private MinecraftTimings() {} diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index e33e889c29..5dfa065883 100644 +index e33e889c2..5dfa06588 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -229,7 +229,8 @@ public class TimingsExport extends Thread { @@ -92,7 +92,7 @@ index e33e889c29..5dfa065883 100644 new TimingsExport(listeners, parent, history).start(); diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 49a38c6608..255bbd6e48 100644 +index 49a38c660..255bbd6e4 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -24,8 +24,8 @@ public class PaperVersionFetcher implements VersionFetcher { @@ -123,7 +123,7 @@ index 49a38c6608..255bbd6e48 100644 switch (distance) { case -1: diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java -index 0692fe33bb..4263eb9172 100644 +index 0692fe33b..4263eb917 100644 --- a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java @@ -188,6 +188,7 @@ public final class PaperTickList extends TickListServer { // extend to avo @@ -200,7 +200,7 @@ index 0692fe33bb..4263eb9172 100644 diff --git a/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java b/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java new file mode 100644 -index 0000000000..97c4100c5d +index 000000000..97c4100c5 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java @@ -0,0 +1,159 @@ @@ -366,7 +366,7 @@ index 0000000000..97c4100c5d \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java new file mode 100644 -index 0000000000..1ae1fd7505 +index 000000000..1ae1fd750 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java @@ -0,0 +1,277 @@ @@ -650,7 +650,7 @@ index 0000000000..1ae1fd7505 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/CachedLists.java b/src/main/java/com/tuinity/tuinity/util/CachedLists.java new file mode 100644 -index 0000000000..a54f516ba7 +index 000000000..a54f516ba --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/CachedLists.java @@ -0,0 +1,53 @@ @@ -709,7 +709,7 @@ index 0000000000..a54f516ba7 +} diff --git a/src/main/java/com/tuinity/tuinity/util/TickThread.java b/src/main/java/com/tuinity/tuinity/util/TickThread.java new file mode 100644 -index 0000000000..08ed243259 +index 000000000..08ed24325 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/TickThread.java @@ -0,0 +1,41 @@ @@ -757,7 +757,7 @@ index 0000000000..08ed243259 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java new file mode 100644 -index 0000000000..e12d096456 +index 000000000..e12d09645 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java @@ -0,0 +1,265 @@ @@ -1028,7 +1028,7 @@ index 0000000000..e12d096456 +} diff --git a/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java b/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java new file mode 100644 -index 0000000000..76593df295 +index 000000000..76593df29 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java @@ -0,0 +1,246 @@ @@ -1279,7 +1279,7 @@ index 0000000000..76593df295 + } +} diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index ed9b2f9adf..d54bf71409 100644 +index ed9b2f9ad..d54bf7140 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -13,6 +13,119 @@ public class AxisAlignedBB { @@ -1427,7 +1427,7 @@ index ed9b2f9adf..d54bf71409 100644 return d0 >= this.minX && d0 < this.maxX && d1 >= this.minY && d1 < this.maxY && d2 >= this.minZ && d2 < this.maxZ; } diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index 1842e69839..dab89b0c69 100644 +index 1842e6983..dab89b0c6 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -16,9 +16,9 @@ public class BaseBlockPosition implements Comparable { @@ -1463,7 +1463,7 @@ index 1842e69839..dab89b0c69 100644 } diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index db198811dd..52ebdfcc03 100644 +index db198811d..52ebdfcc0 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -92,6 +92,18 @@ public class BiomeBase { @@ -1486,7 +1486,7 @@ index db198811dd..52ebdfcc03 100644 if (biomebase_a.a != null && biomebase_a.b != null && biomebase_a.c != null && biomebase_a.d != null && biomebase_a.e != null && biomebase_a.f != null && biomebase_a.g != null && biomebase_a.j != null) { this.m = biomebase_a.a; diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java -index ff770a3b0e..12027ecad7 100644 +index ff770a3b0..12027ecad 100644 --- a/src/main/java/net/minecraft/server/BlockBase.java +++ b/src/main/java/net/minecraft/server/BlockBase.java @@ -176,8 +176,8 @@ public abstract class BlockBase { @@ -1609,7 +1609,7 @@ index ff770a3b0e..12027ecad7 100644 public SoundEffectType getStepSound() { diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index 44b9bfcdc7..dba774018c 100644 +index 44b9bfcdc..dba774018 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -10,7 +10,7 @@ import javax.annotation.Nullable; @@ -1631,7 +1631,7 @@ index 44b9bfcdc7..dba774018c 100644 if (tileentity instanceof IInventory) { InventoryUtils.dropInventory(world, blockposition, (IInventory) tileentity); diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java -index c3133814f1..4f10ca5ada 100644 +index c3133814f..4f10ca5ad 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -270,7 +270,10 @@ public class BlockPiston extends BlockDirectional { @@ -1688,7 +1688,7 @@ index c3133814f1..4f10ca5ada 100644 aiblockdata[j++] = iblockdata1; } diff --git a/src/main/java/net/minecraft/server/BlockPistonMoving.java b/src/main/java/net/minecraft/server/BlockPistonMoving.java -index 4bf66420f5..bf76615d72 100644 +index 4bf66420f..bf76615d7 100644 --- a/src/main/java/net/minecraft/server/BlockPistonMoving.java +++ b/src/main/java/net/minecraft/server/BlockPistonMoving.java @@ -21,7 +21,12 @@ public class BlockPistonMoving extends BlockTileEntity { @@ -1706,7 +1706,7 @@ index 4bf66420f5..bf76615d72 100644 @Override diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 8c2a4b57ab..7ff4948a47 100644 +index 8c2a4b57a..7ff4948a4 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -386,11 +386,11 @@ public class BlockPosition extends BaseBlockPosition { @@ -1808,7 +1808,7 @@ index 8c2a4b57ab..7ff4948a47 100644 @Override diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 84dc89d961..09b8f9a3f6 100644 +index 84dc89d96..09b8f9a3f 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -375,7 +375,7 @@ public class Chunk implements IChunkAccess { @@ -1916,7 +1916,7 @@ index 84dc89d961..09b8f9a3f6 100644 int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D); diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 893c0085bc..d83d3b54d3 100644 +index 893c0085b..d83d3b54d 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -31,7 +31,7 @@ public abstract class ChunkMapDistance { @@ -2085,7 +2085,7 @@ index 893c0085bc..d83d3b54d3 100644 for (java.util.Iterator>>> iterator = this.tickets.long2ObjectEntrySet().fastIterator(); iterator.hasNext();) { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index ef980f9859..0459a591ac 100644 +index ef980f985..0459a591a 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -120,7 +120,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -2496,7 +2496,7 @@ index ef980f9859..0459a591ac 100644 try { boolean execChunkTask = com.destroystokyo.paper.io.chunk.ChunkTaskManager.pollChunkWaitQueue() || ChunkProviderServer.this.world.asyncChunkTaskManager.pollNextChunkTask(); // Paper diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index ac58fcb798..742c59cb05 100644 +index ac58fcb79..742c59cb0 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -24,6 +24,14 @@ public class ChunkRegionLoader { @@ -2528,7 +2528,7 @@ index ac58fcb798..742c59cb05 100644 nbttagcompound1.setString("Status", ichunkaccess.getChunkStatus().d()); ChunkConverter chunkconverter = ichunkaccess.p(); diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 8d45588ecf..4ab7419855 100644 +index 8d45588ec..4ab741985 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -96,6 +96,7 @@ public class ChunkSection { @@ -2540,7 +2540,7 @@ index 8d45588ecf..4ab7419855 100644 return this.nonEmptyBlockCount == 0; } diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java -index 36c2651229..dd8a3dc4fe 100644 +index 36c265122..dd8a3dc4f 100644 --- a/src/main/java/net/minecraft/server/ChunkStatus.java +++ b/src/main/java/net/minecraft/server/ChunkStatus.java @@ -109,7 +109,7 @@ public class ChunkStatus { @@ -2562,7 +2562,7 @@ index 36c2651229..dd8a3dc4fe 100644 } diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index 235c9ec37c..dba3c407c1 100644 +index 235c9ec37..dba3c407c 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -52,6 +52,7 @@ public class DataBits { @@ -2590,7 +2590,7 @@ index 235c9ec37c..dba3c407c1 100644 //Validate.inclusiveBetween(0L, (long) (this.e - 1), (long) i); // Paper int j = this.b(i); diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 1cb45f97b6..e60ad41b22 100644 +index 1cb45f97b..e60ad41b2 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -163,6 +163,7 @@ public class DataPaletteBlock implements DataPaletteExpandable { @@ -2602,7 +2602,7 @@ index 1cb45f97b6..e60ad41b22 100644 T t0 = this.h.a(this.a.a(i)); diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 8b2755a3b9..578f7809cb 100644 +index 8b2755a3b..578f7809c 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -170,6 +170,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -2614,7 +2614,7 @@ index 8b2755a3b9..578f7809cb 100644 this.setPVP(dedicatedserverproperties.pvp); this.setAllowFlight(dedicatedserverproperties.allowFlight); diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index 550232cb38..229c3b0f0c 100644 +index 550232cb3..229c3b0f0 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -70,7 +70,7 @@ public class EULA { @@ -2627,7 +2627,7 @@ index 550232cb38..229c3b0f0c 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9c4b02d776..3db19a9bab 100644 +index 9c4b02d77..3db19a9ba 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -2906,7 +2906,7 @@ index 9c4b02d776..3db19a9bab 100644 int j = MathHelper.floor(d1); int k = MathHelper.floor(d2); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index c388999d10..4545bd371c 100644 +index c388999d1..4545bd371 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2835,7 +2835,11 @@ public abstract class EntityLiving extends Entity { @@ -2933,7 +2933,7 @@ index c388999d10..4545bd371c 100644 } diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index f75c09d44a..bfb931268d 100644 +index f75c09d44..bfb931268 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -74,6 +74,7 @@ public class EntityTrackerEntry { @@ -2945,7 +2945,7 @@ index f75c09d44a..bfb931268d 100644 if (!list.equals(this.p)) { diff --git a/src/main/java/net/minecraft/server/Fluid.java b/src/main/java/net/minecraft/server/Fluid.java -index 05fa52c0b1..8ffc5db509 100644 +index 05fa52c0b..8ffc5db50 100644 --- a/src/main/java/net/minecraft/server/Fluid.java +++ b/src/main/java/net/minecraft/server/Fluid.java @@ -9,8 +9,12 @@ public final class Fluid extends IBlockDataHolder { @@ -2971,7 +2971,7 @@ index 05fa52c0b1..8ffc5db509 100644 public float getHeight(IBlockAccess iblockaccess, BlockPosition blockposition) { diff --git a/src/main/java/net/minecraft/server/HeightMap.java b/src/main/java/net/minecraft/server/HeightMap.java -index 068b92c5c4..a43c4ca3ea 100644 +index 068b92c5c..a43c4ca3e 100644 --- a/src/main/java/net/minecraft/server/HeightMap.java +++ b/src/main/java/net/minecraft/server/HeightMap.java @@ -19,7 +19,25 @@ public class HeightMap { @@ -3055,7 +3055,7 @@ index 068b92c5c4..a43c4ca3ea 100644 this.i = heightmap_use; this.j = predicate; diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index 10a5901db1..9117504767 100644 +index 10a5901db..911750476 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -8,6 +8,19 @@ public class IBlockData extends BlockBase.BlockData { @@ -3079,7 +3079,7 @@ index 10a5901db1..9117504767 100644 super(block, immutablemap, mapcodec); } diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java -index 582a5695ba..5601088cd5 100644 +index 582a5695b..5601088cd 100644 --- a/src/main/java/net/minecraft/server/IChunkLoader.java +++ b/src/main/java/net/minecraft/server/IChunkLoader.java @@ -21,7 +21,7 @@ public class IChunkLoader implements AutoCloseable { @@ -3092,7 +3092,7 @@ index 582a5695ba..5601088cd5 100644 // Paper - nuke IOWorker } diff --git a/src/main/java/net/minecraft/server/ICollisionAccess.java b/src/main/java/net/minecraft/server/ICollisionAccess.java -index 1cc40b1f0a..3ce2f7497a 100644 +index 1cc40b1f0..3ce2f7497 100644 --- a/src/main/java/net/minecraft/server/ICollisionAccess.java +++ b/src/main/java/net/minecraft/server/ICollisionAccess.java @@ -46,6 +46,11 @@ public interface ICollisionAccess extends IBlockAccess { @@ -3108,7 +3108,7 @@ index 1cc40b1f0a..3ce2f7497a 100644 return this.d(entity, axisalignedbb, predicate).allMatch(VoxelShape::isEmpty); } finally { if (entity != null) entity.collisionLoadChunks = false; } // Paper diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index 267a6baae8..0edcb775e9 100644 +index 267a6baae..0edcb775e 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -69,6 +69,7 @@ public interface IEntityAccess { @@ -3120,7 +3120,7 @@ index 267a6baae8..0edcb775e9 100644 return entity == null || !entity.isSameVehicle(entity1); }); diff --git a/src/main/java/net/minecraft/server/LightEngineStorage.java b/src/main/java/net/minecraft/server/LightEngineStorage.java -index b98e60772b..e0bbfe1422 100644 +index b98e60772..e0bbfe142 100644 --- a/src/main/java/net/minecraft/server/LightEngineStorage.java +++ b/src/main/java/net/minecraft/server/LightEngineStorage.java @@ -23,7 +23,8 @@ public abstract class LightEngineStorage> e @@ -3152,7 +3152,7 @@ index b98e60772b..e0bbfe1422 100644 while (objectiterator.hasNext()) { entry = (Entry) objectiterator.next(); diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index e9cedbc8b6..a29d54c775 100644 +index e9cedbc8b..a29d54c77 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -48,6 +48,20 @@ public final class MCUtil { @@ -3177,7 +3177,7 @@ index e9cedbc8b6..a29d54c775 100644 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 26f230a801..eb71fa6e39 100644 +index 26f230a80..eb71fa6e3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -986,7 +986,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant> { @@ -3489,7 +3489,7 @@ index d5cc2af83a..327bb3e744 100644 } return true; diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 8335d00336..e0ee524093 100644 +index 8335d0033..e0ee52409 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -19,7 +19,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -3659,7 +3659,7 @@ index 8335d00336..e0ee524093 100644 } } diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index d7f0df123b..ec55785af2 100644 +index d7f0df123..ec55785af 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -538,7 +538,7 @@ public class PathfinderNormal extends PathfinderAbstract { @@ -3672,7 +3672,7 @@ index d7f0df123b..ec55785af2 100644 return fluid.a((Tag) TagsFluid.WATER) ? PathType.WATER : (fluid.a((Tag) TagsFluid.LAVA) ? PathType.LAVA : PathType.OPEN); } diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index a3bce8f13b..a483ec0e2b 100644 +index a3bce8f13..a483ec0e2 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java @@ -494,6 +494,7 @@ public class PlayerChunk { @@ -3773,7 +3773,7 @@ index a3bce8f13b..a483ec0e2b 100644 if (chunk != null) { playerchunkmap.callbackExecutor.execute(() -> { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 8c5639fa55..4dd6f48caf 100644 +index 5544254a6..ab751b48d 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -119,31 +119,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -3940,7 +3940,7 @@ index 8c5639fa55..4dd6f48caf 100644 // Paper end - optimised tracker diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index cf83059fec..37f55c66b6 100644 +index cf83059fe..37f55c66b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -322,19 +322,24 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -4045,7 +4045,7 @@ index cf83059fec..37f55c66b6 100644 } else { // CraftBukkit start - fire PlayerMoveEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java -index 7ea293f38d..e698dd2260 100644 +index 7ea293f38..e698dd226 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -13,10 +13,30 @@ public class PlayerConnectionUtils { @@ -4093,7 +4093,7 @@ index 7ea293f38d..e698dd2260 100644 }); throw CancelledPacketHandleException.INSTANCE; diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 6d192b2744..f5de49e3e3 100644 +index 6d192b274..f5de49e3e 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -21,14 +21,29 @@ public class PlayerInteractManager { @@ -4228,7 +4228,7 @@ index 6d192b2744..f5de49e3e3 100644 this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196 } diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java -index 3b03c28ee5..6ac9f437e8 100644 +index 3b03c28ee..6ac9f437e 100644 --- a/src/main/java/net/minecraft/server/ProtoChunk.java +++ b/src/main/java/net/minecraft/server/ProtoChunk.java @@ -179,14 +179,11 @@ public class ProtoChunk implements IChunkAccess { @@ -4264,7 +4264,7 @@ index 3b03c28ee5..6ac9f437e8 100644 } diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 93797395c3..6928b1730f 100644 +index 93797395c..6928b1730 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -28,14 +28,349 @@ public class RegionFile implements AutoCloseable { @@ -4826,7 +4826,7 @@ index 93797395c3..6928b1730f 100644 ((java.nio.Buffer) this.f).position(0); this.dataFile.write(this.f, 0L); diff --git a/src/main/java/net/minecraft/server/RegionFileBitSet.java b/src/main/java/net/minecraft/server/RegionFileBitSet.java -index 1ebdf73cc9..cfa3ecb031 100644 +index 1ebdf73cc..cfa3ecb03 100644 --- a/src/main/java/net/minecraft/server/RegionFileBitSet.java +++ b/src/main/java/net/minecraft/server/RegionFileBitSet.java @@ -4,18 +4,42 @@ import java.util.BitSet; @@ -4874,7 +4874,7 @@ index 1ebdf73cc9..cfa3ecb031 100644 int j = 0; diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 867dc074bc..60b4171a3a 100644 +index 867dc074b..60b4171a3 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -14,12 +14,43 @@ public class RegionFileCache implements AutoCloseable { // Paper - no final @@ -4965,7 +4965,7 @@ index 867dc074bc..60b4171a3a 100644 } diff --git a/src/main/java/net/minecraft/server/RegionFileCompression.java b/src/main/java/net/minecraft/server/RegionFileCompression.java -index 3382d678e6..29137f4959 100644 +index 3382d678e..29137f495 100644 --- a/src/main/java/net/minecraft/server/RegionFileCompression.java +++ b/src/main/java/net/minecraft/server/RegionFileCompression.java @@ -13,7 +13,7 @@ import javax.annotation.Nullable; @@ -4997,7 +4997,7 @@ index 3382d678e6..29137f4959 100644 return (InputStream) this.f.wrap(inputstream); } diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java -index e41cb8613e..c19ffb925a 100644 +index e41cb8613..c19ffb925 100644 --- a/src/main/java/net/minecraft/server/Ticket.java +++ b/src/main/java/net/minecraft/server/Ticket.java @@ -5,17 +5,17 @@ import java.util.Objects; @@ -5034,7 +5034,7 @@ index e41cb8613e..c19ffb925a 100644 return j != 0L && i - this.d > j; } diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java -index 5c789b25f1..4657b05a42 100644 +index 5c789b25f..4657b05a4 100644 --- a/src/main/java/net/minecraft/server/TicketType.java +++ b/src/main/java/net/minecraft/server/TicketType.java @@ -26,7 +26,8 @@ public class TicketType { @@ -5048,7 +5048,7 @@ index 5c789b25f1..4657b05a42 100644 public static TicketType a(String s, Comparator comparator) { return new TicketType<>(s, comparator, 0L); diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 67fda8bd5a..e1f1d6e33f 100644 +index 67fda8bd5..e1f1d6e33 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -12,7 +12,7 @@ import org.bukkit.inventory.InventoryHolder; @@ -5122,7 +5122,7 @@ index 67fda8bd5a..e1f1d6e33f 100644 private String tileEntityKeyString = null; private MinecraftKey tileEntityKey = null; diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java -index 2858ea1f3e..453f1301b4 100644 +index 2858ea1f3..453f1301b 100644 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java @@ -35,7 +35,7 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic @@ -5173,7 +5173,7 @@ index 2858ea1f3e..453f1301b4 100644 public void tick() { int i = this.position.getX(); diff --git a/src/main/java/net/minecraft/server/TileEntityBeehive.java b/src/main/java/net/minecraft/server/TileEntityBeehive.java -index 66ac41db79..016b063645 100644 +index 6dc91d985..9da356de6 100644 --- a/src/main/java/net/minecraft/server/TileEntityBeehive.java +++ b/src/main/java/net/minecraft/server/TileEntityBeehive.java @@ -12,6 +12,13 @@ public class TileEntityBeehive extends TileEntity implements ITickable { @@ -5191,7 +5191,7 @@ index 66ac41db79..016b063645 100644 super(TileEntityTypes.BEEHIVE); } diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java -index 276eba954b..e38a494d7b 100644 +index 276eba954..e38a494d7 100644 --- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java +++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java @@ -24,7 +24,7 @@ public class TileEntityBrewingStand extends TileEntityContainer implements IWorl @@ -5242,7 +5242,7 @@ index 276eba954b..e38a494d7b 100644 protected IChatBaseComponent getContainerName() { return new ChatMessage("container.brewing"); diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index f6f2743892..f9a878bd0b 100644 +index f6f274389..f9a878bd0 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -45,6 +45,22 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic @@ -5269,7 +5269,7 @@ index f6f2743892..f9a878bd0b 100644 super(tileentitytypes); this.items = NonNullList.a(27, ItemStack.b); diff --git a/src/main/java/net/minecraft/server/TileEntityConduit.java b/src/main/java/net/minecraft/server/TileEntityConduit.java -index ade8301227..7e9470caa5 100644 +index ade830122..7e9470caa 100644 --- a/src/main/java/net/minecraft/server/TileEntityConduit.java +++ b/src/main/java/net/minecraft/server/TileEntityConduit.java @@ -16,15 +16,32 @@ public class TileEntityConduit extends TileEntity implements ITickable { @@ -5308,7 +5308,7 @@ index ade8301227..7e9470caa5 100644 this(TileEntityTypes.CONDUIT); } diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index f4f50fb837..59aa2f8a79 100644 +index f4f50fb83..59aa2f8a7 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -32,14 +32,14 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I @@ -5356,7 +5356,7 @@ index f4f50fb837..59aa2f8a79 100644 } diff --git a/src/main/java/net/minecraft/server/TileEntityJukeBox.java b/src/main/java/net/minecraft/server/TileEntityJukeBox.java -index 33c7dc56da..75eb1b8b29 100644 +index 33c7dc56d..75eb1b8b2 100644 --- a/src/main/java/net/minecraft/server/TileEntityJukeBox.java +++ b/src/main/java/net/minecraft/server/TileEntityJukeBox.java @@ -4,6 +4,13 @@ public class TileEntityJukeBox extends TileEntity implements Clearable { @@ -5374,7 +5374,7 @@ index 33c7dc56da..75eb1b8b29 100644 super(TileEntityTypes.JUKEBOX); this.a = ItemStack.b; diff --git a/src/main/java/net/minecraft/server/TileEntityLectern.java b/src/main/java/net/minecraft/server/TileEntityLectern.java -index b2ceb6c179..b955d5d661 100644 +index b2ceb6c17..b955d5d66 100644 --- a/src/main/java/net/minecraft/server/TileEntityLectern.java +++ b/src/main/java/net/minecraft/server/TileEntityLectern.java @@ -17,7 +17,7 @@ import org.bukkit.inventory.InventoryHolder; @@ -5451,7 +5451,7 @@ index b2ceb6c179..b955d5d661 100644 super(TileEntityTypes.LECTERN); this.book = ItemStack.b; diff --git a/src/main/java/net/minecraft/server/TileEntityPiston.java b/src/main/java/net/minecraft/server/TileEntityPiston.java -index e7b7e468fc..38d0e841ca 100644 +index e7b7e468f..38d0e841c 100644 --- a/src/main/java/net/minecraft/server/TileEntityPiston.java +++ b/src/main/java/net/minecraft/server/TileEntityPiston.java @@ -5,10 +5,10 @@ import java.util.List; @@ -5581,7 +5581,7 @@ index e7b7e468fc..38d0e841ca 100644 } diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java -index 3048ba0081..84858ba392 100644 +index 3048ba008..84858ba39 100644 --- a/src/main/java/net/minecraft/server/Vec3D.java +++ b/src/main/java/net/minecraft/server/Vec3D.java @@ -4,7 +4,7 @@ import java.util.EnumSet; @@ -5615,7 +5615,7 @@ index 3048ba0081..84858ba392 100644 return this.x * this.x + this.y * this.y + this.z * this.z; } diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java -index 303f6b0953..c1e149f204 100644 +index 303f6b095..c1e149f20 100644 --- a/src/main/java/net/minecraft/server/VillagePlace.java +++ b/src/main/java/net/minecraft/server/VillagePlace.java @@ -155,7 +155,7 @@ public class VillagePlace extends RegionFileSection { @@ -5628,7 +5628,7 @@ index 303f6b0953..c1e149f204 100644 } // Paper end diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java -index c2b8c98206..3a98e242e0 100644 +index c2b8c9820..3a98e242e 100644 --- a/src/main/java/net/minecraft/server/VoxelShape.java +++ b/src/main/java/net/minecraft/server/VoxelShape.java @@ -8,11 +8,11 @@ import javax.annotation.Nullable; @@ -5667,7 +5667,7 @@ index c2b8c98206..3a98e242e0 100644 List list = Lists.newArrayList(); diff --git a/src/main/java/net/minecraft/server/VoxelShapeArray.java b/src/main/java/net/minecraft/server/VoxelShapeArray.java -index caf297fe97..8d68c783f6 100644 +index caf297fe9..8d68c783f 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeArray.java +++ b/src/main/java/net/minecraft/server/VoxelShapeArray.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -5774,7 +5774,7 @@ index caf297fe97..8d68c783f6 100644 + // Tuinity end - optimise multi-aabb shapes } diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java -index 1fa7061f7a..52aee91d2d 100644 +index 1fa7061f7..52aee91d2 100644 --- a/src/main/java/net/minecraft/server/VoxelShapes.java +++ b/src/main/java/net/minecraft/server/VoxelShapes.java @@ -17,18 +17,81 @@ public final class VoxelShapes { @@ -5901,7 +5901,7 @@ index 1fa7061f7a..52aee91d2d 100644 return voxelshape != b() && voxelshape1 != b() ? (voxelshape.isEmpty() && voxelshape1.isEmpty() ? false : !c(b(), b(voxelshape, voxelshape1, OperatorBoolean.OR), OperatorBoolean.ONLY_FIRST)) : true; } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 5f81997db7..4a956f3681 100644 +index 5f81997db..4a956f368 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -94,6 +94,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -6023,7 +6023,7 @@ index 5f81997db7..4a956f3681 100644 int j = MathHelper.floor((axisalignedbb.maxX + 2.0D) / 16.0D); int k = MathHelper.floor((axisalignedbb.minZ - 2.0D) / 16.0D); diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index b651eb87bb..5cba3b0e61 100644 +index b651eb87b..5cba3b0e6 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -47,11 +47,43 @@ public class WorldBorder { @@ -6095,7 +6095,7 @@ index b651eb87bb..5cba3b0e61 100644 return this.j.d(); } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3a740f5669..fff694c370 100644 +index 3a740f566..fff694c37 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -55,7 +55,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { @@ -6789,7 +6789,7 @@ index 3a740f5669..fff694c370 100644 this.tickingEntities = wasTicking; // Paper } diff --git a/src/main/java/net/minecraft/server/WorldUpgrader.java b/src/main/java/net/minecraft/server/WorldUpgrader.java -index 5ccdc0b87b..888dae2d5e 100644 +index 5ccdc0b87..888dae2d5 100644 --- a/src/main/java/net/minecraft/server/WorldUpgrader.java +++ b/src/main/java/net/minecraft/server/WorldUpgrader.java @@ -218,7 +218,7 @@ public class WorldUpgrader { @@ -6802,7 +6802,7 @@ index 5ccdc0b87b..888dae2d5e 100644 try { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java -index 4ec53a54e3..31c81b4b52 100644 +index 4ec53a54e..31c81b4b5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java @@ -77,7 +77,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot { @@ -6815,7 +6815,7 @@ index 4ec53a54e3..31c81b4b52 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index d8103ab0d5..ba42171096 100644 +index d8103ab0d..ba4217109 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper @@ -6871,7 +6871,7 @@ index d8103ab0d5..ba42171096 100644 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 65b36a1741..b12da9e3b3 100644 +index 65b36a174..b12da9e3b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -336,6 +336,13 @@ public class CraftWorld implements World { @@ -6922,7 +6922,7 @@ index 65b36a1741..b12da9e3b3 100644 }, MinecraftServer.getServer()); } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index bac292e6d8..b4e65963ef 100644 +index bac292e6d..b4e65963e 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -138,6 +138,13 @@ public class Main { @@ -6949,7 +6949,7 @@ index bac292e6d8..b4e65963ef 100644 //Thread.sleep(TimeUnit.SECONDS.toMillis(20)); // Paper End diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index 9b0e868f00..ee53060b11 100644 +index 9b0e868f0..ee53060b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -207,7 +207,7 @@ public class CraftBlock implements Block { @@ -6995,7 +6995,7 @@ index 9b0e868f00..ee53060b11 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java -index 11aa2dc18c..c51c43573f 100644 +index 11aa2dc18..c51c43573 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java @@ -136,7 +136,7 @@ public class CraftBlockState implements BlockState { @@ -7008,7 +7008,7 @@ index 11aa2dc18c..c51c43573f 100644 public void setFlag(int flag) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index bbded5671e..9808901532 100644 +index bbded5671..980890153 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -44,7 +44,7 @@ public class CraftBlockData implements BlockData { @@ -7021,10 +7021,39 @@ index bbded5671e..9808901532 100644 public IBlockData getState() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 8002a38bcc..309e7f6ee7 100644 +index d1df4e579..6f18a7898 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -527,6 +527,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -495,27 +495,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { + entity.setHeadRotation(yaw); + } + +- @Override// Paper start +- public java.util.concurrent.CompletableFuture teleportAsync(Location loc, @javax.annotation.Nonnull org.bukkit.event.player.PlayerTeleportEvent.TeleportCause cause) { +- net.minecraft.server.PlayerChunkMap playerChunkMap = ((CraftWorld) loc.getWorld()).getHandle().getChunkProvider().playerChunkMap; +- java.util.concurrent.CompletableFuture future = new java.util.concurrent.CompletableFuture<>(); +- +- loc.getWorld().getChunkAtAsyncUrgently(loc).thenCompose(chunk -> { +- net.minecraft.server.ChunkCoordIntPair pair = new net.minecraft.server.ChunkCoordIntPair(chunk.getX(), chunk.getZ()); +- ((CraftWorld) loc.getWorld()).getHandle().getChunkProvider().addTicketAtLevel(net.minecraft.server.TicketType.POST_TELEPORT, pair, 31, 0); +- net.minecraft.server.PlayerChunk updatingChunk = playerChunkMap.getUpdatingChunk(pair.pair()); +- if (updatingChunk != null) { +- return updatingChunk.getEntityTickingFuture(); +- } else { +- return java.util.concurrent.CompletableFuture.completedFuture(com.mojang.datafixers.util.Either.left(((org.bukkit.craftbukkit.CraftChunk)chunk).getHandle())); +- } +- }).thenAccept((chunk) -> future.complete(teleport(loc, cause))).exceptionally(ex -> { +- future.completeExceptionally(ex); +- return null; +- }); +- return future; +- } +- // Paper end ++ // Tuinity + + @Override + public boolean teleport(Location location) { +@@ -549,6 +529,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return true; } @@ -7063,7 +7092,7 @@ index 8002a38bcc..309e7f6ee7 100644 public boolean teleport(org.bukkit.entity.Entity destination) { return teleport(destination.getLocation()); diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java -index 948a59217c..ab43c97e8f 100644 +index 948a59217..ab43c97e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java @@ -73,7 +73,7 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData { @@ -7076,7 +7105,7 @@ index 948a59217c..ab43c97e8f 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java -index ca2be30609..2c57013765 100644 +index ca2be3060..2c5701376 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -100,9 +100,18 @@ public final class CraftScoreboardManager implements ScoreboardManager { @@ -7099,7 +7128,7 @@ index ca2be30609..2c57013765 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java -index f72c13beda..50f855b931 100644 +index f72c13bed..50f855b93 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java +++ b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java @@ -119,6 +119,32 @@ public class UnsafeList extends AbstractList implements List, RandomAcc @@ -7136,7 +7165,7 @@ index f72c13beda..50f855b931 100644 public void clear() { // Create new array to reset memory usage to initial capacity diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 674096cab1..001b1e5197 100644 +index 674096cab..001b1e519 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { @@ -7149,7 +7178,7 @@ index 674096cab1..001b1e5197 100644 if (stream != null) { diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java -index 9f7d2ef932..c3ac1a46c3 100644 +index 9f7d2ef93..c3ac1a46c 100644 --- a/src/main/java/org/spigotmc/AsyncCatcher.java +++ b/src/main/java/org/spigotmc/AsyncCatcher.java @@ -10,7 +10,7 @@ public class AsyncCatcher @@ -7162,7 +7191,7 @@ index 9f7d2ef932..c3ac1a46c3 100644 throw new IllegalStateException( "Asynchronous " + reason + "!" ); } diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 513c1041c3..4d31090848 100644 +index 513c1041c..4d3109084 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -61,6 +61,84 @@ public class WatchdogThread extends Thread diff --git a/patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch b/patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch deleted file mode 100644 index e9b616ed4..000000000 --- a/patches/server/0030-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Fri, 21 Feb 2020 17:04:51 -0600 -Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter - - -diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 6195a45e30..962a558070 100644 ---- a/src/main/java/net/minecraft/server/EntityArrow.java -+++ b/src/main/java/net/minecraft/server/EntityArrow.java -@@ -133,6 +133,7 @@ public abstract class EntityArrow extends IProjectile { - - ++this.c; - } else { -+ if (ticksLived > 200) this.checkDespawnCounter(); // Purpur - tick despawn counter after 10 seconds. fixes MC-125757 - this.c = 0; - Vec3D vec3d2 = this.getPositionVector(); - -@@ -254,6 +255,7 @@ public abstract class EntityArrow extends IProjectile { - - } - -+ protected void checkDespawnCounter() { h(); } // Purpur - OBFHELPER - protected void h() { - ++this.despawnCounter; - if (this.despawnCounter >= (fromPlayer == PickupStatus.CREATIVE_ONLY ? world.paperConfig.creativeArrowDespawnRate : (fromPlayer == PickupStatus.DISALLOWED ? world.paperConfig.nonPlayerArrowDespawnRate : ((this instanceof EntityThrownTrident) ? world.spigotConfig.tridentDespawnRate : world.spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - TODO: Extract this to init? diff --git a/patches/server/0031-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0030-MC-168772-Fix-Add-turtle-egg-block-options.patch similarity index 100% rename from patches/server/0031-MC-168772-Fix-Add-turtle-egg-block-options.patch rename to patches/server/0030-MC-168772-Fix-Add-turtle-egg-block-options.patch diff --git a/patches/server/0032-MC-4-Fix-Item-position-desync.patch b/patches/server/0031-MC-4-Fix-Item-position-desync.patch similarity index 100% rename from patches/server/0032-MC-4-Fix-Item-position-desync.patch rename to patches/server/0031-MC-4-Fix-Item-position-desync.patch diff --git a/patches/server/0033-Fix-vanilla-command-permission-handler.patch b/patches/server/0032-Fix-vanilla-command-permission-handler.patch similarity index 100% rename from patches/server/0033-Fix-vanilla-command-permission-handler.patch rename to patches/server/0032-Fix-vanilla-command-permission-handler.patch diff --git a/patches/server/0034-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch similarity index 98% rename from patches/server/0034-Logger-settings-suppressing-pointless-logs.patch rename to patches/server/0033-Logger-settings-suppressing-pointless-logs.patch index b39953c67..f66301610 100644 --- a/patches/server/0034-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0033-Logger-settings-suppressing-pointless-logs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Logger settings (suppressing pointless logs) diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index 57b9d1344..c89e843e2 100644 +index d3387a4e1..fd2202003 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -165,6 +165,7 @@ public class AdvancementDataPlayer { diff --git a/patches/server/0035-Disable-outdated-build-check.patch b/patches/server/0034-Disable-outdated-build-check.patch similarity index 97% rename from patches/server/0035-Disable-outdated-build-check.patch rename to patches/server/0034-Disable-outdated-build-check.patch index 68eeeb9a1..f81bd8fea 100644 --- a/patches/server/0035-Disable-outdated-build-check.patch +++ b/patches/server/0034-Disable-outdated-build-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable outdated build check diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index c1e7e6a45..38a982d3f 100644 +index 3261d2255..2825f5a3a 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -259,7 +259,7 @@ public class Main { diff --git a/patches/server/0036-Giants-AI-settings.patch b/patches/server/0035-Giants-AI-settings.patch similarity index 100% rename from patches/server/0036-Giants-AI-settings.patch rename to patches/server/0035-Giants-AI-settings.patch diff --git a/patches/server/0037-Illusioners-AI-settings.patch b/patches/server/0036-Illusioners-AI-settings.patch similarity index 100% rename from patches/server/0037-Illusioners-AI-settings.patch rename to patches/server/0036-Illusioners-AI-settings.patch diff --git a/patches/server/0038-Zombie-horse-naturally-spawn.patch b/patches/server/0037-Zombie-horse-naturally-spawn.patch similarity index 98% rename from patches/server/0038-Zombie-horse-naturally-spawn.patch rename to patches/server/0037-Zombie-horse-naturally-spawn.patch index 3501cc4c5..63c127368 100644 --- a/patches/server/0038-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0037-Zombie-horse-naturally-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 578cc6888..ee95ed6fa 100644 +index efc2ea044..37a4b08e3 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1059,12 +1059,18 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0039-Charged-creeper-naturally-spawn.patch b/patches/server/0038-Charged-creeper-naturally-spawn.patch similarity index 100% rename from patches/server/0039-Charged-creeper-naturally-spawn.patch rename to patches/server/0038-Charged-creeper-naturally-spawn.patch diff --git a/patches/server/0040-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0039-Rabbit-naturally-spawn-toast-and-killer.patch similarity index 98% rename from patches/server/0040-Rabbit-naturally-spawn-toast-and-killer.patch rename to patches/server/0039-Rabbit-naturally-spawn-toast-and-killer.patch index 158c18d5b..5d585fed4 100644 --- a/patches/server/0040-Rabbit-naturally-spawn-toast-and-killer.patch +++ b/patches/server/0039-Rabbit-naturally-spawn-toast-and-killer.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rabbit naturally spawn toast and killer diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index 00c9233f8..1be0f943b 100644 +index baf440538..42145a89c 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -297,6 +297,10 @@ public class EntityRabbit extends EntityAnimal { diff --git a/patches/server/0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0041-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0040-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0042-Make-Iron-Golems-Swim.patch b/patches/server/0041-Make-Iron-Golems-Swim.patch similarity index 100% rename from patches/server/0042-Make-Iron-Golems-Swim.patch rename to patches/server/0041-Make-Iron-Golems-Swim.patch diff --git a/patches/server/0043-Dont-send-useless-entity-packets.patch b/patches/server/0042-Dont-send-useless-entity-packets.patch similarity index 100% rename from patches/server/0043-Dont-send-useless-entity-packets.patch rename to patches/server/0042-Dont-send-useless-entity-packets.patch diff --git a/patches/server/0044-Tulips-change-fox-type.patch b/patches/server/0043-Tulips-change-fox-type.patch similarity index 100% rename from patches/server/0044-Tulips-change-fox-type.patch rename to patches/server/0043-Tulips-change-fox-type.patch diff --git a/patches/server/0045-Breedable-Polar-Bears.patch b/patches/server/0044-Breedable-Polar-Bears.patch similarity index 100% rename from patches/server/0045-Breedable-Polar-Bears.patch rename to patches/server/0044-Breedable-Polar-Bears.patch diff --git a/patches/server/0046-Chickens-can-retaliate.patch b/patches/server/0045-Chickens-can-retaliate.patch similarity index 100% rename from patches/server/0046-Chickens-can-retaliate.patch rename to patches/server/0045-Chickens-can-retaliate.patch diff --git a/patches/server/0047-Add-option-to-set-armorstand-step-height.patch b/patches/server/0046-Add-option-to-set-armorstand-step-height.patch similarity index 100% rename from patches/server/0047-Add-option-to-set-armorstand-step-height.patch rename to patches/server/0046-Add-option-to-set-armorstand-step-height.patch diff --git a/patches/server/0048-Cat-spawning-options.patch b/patches/server/0047-Cat-spawning-options.patch similarity index 99% rename from patches/server/0048-Cat-spawning-options.patch rename to patches/server/0047-Cat-spawning-options.patch index 3810af3ff..d86a60abf 100644 --- a/patches/server/0048-Cat-spawning-options.patch +++ b/patches/server/0047-Cat-spawning-options.patch @@ -99,7 +99,7 @@ index 5bd3bcc2b..5f2bb140a 100644 return this.E; } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ee95ed6fa..918a82d46 100644 +index 37a4b08e3..e6ad5a6ab 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -2358,6 +2358,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0049-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0048-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch similarity index 100% rename from patches/server/0049-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch rename to patches/server/0048-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch diff --git a/patches/server/0050-Cows-eat-mushrooms.patch b/patches/server/0049-Cows-eat-mushrooms.patch similarity index 98% rename from patches/server/0050-Cows-eat-mushrooms.patch rename to patches/server/0049-Cows-eat-mushrooms.patch index 973a3c1eb..5c4c49099 100644 --- a/patches/server/0050-Cows-eat-mushrooms.patch +++ b/patches/server/0049-Cows-eat-mushrooms.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cows eat mushrooms diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index b39cc82bf6..884f4a0abf 100644 +index b39cc82bf..884f4a0ab 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2740,6 +2740,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index b39cc82bf6..884f4a0abf 100644 this.setPositionRotation(entity.locX(), entity.locY(), entity.locZ(), entity.yaw, entity.pitch); } diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 30ee6df6b4..d6baddb9d3 100644 +index 30ee6df6b..d6baddb9d 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -16,6 +16,7 @@ public class EntityCow extends EntityAnimal { @@ -110,7 +110,7 @@ index 30ee6df6b4..d6baddb9d3 100644 public EntityCow createChild(EntityAgeable entityageable) { return (EntityCow) EntityTypes.COW.a(this.world); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 762217c7ec..653071979a 100644 +index 762217c7e..653071979 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity { @@ -123,7 +123,7 @@ index 762217c7ec..653071979a 100644 public float aJ; public float aK; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 55e609cc1c..3d78ac90c1 100644 +index 55e609cc1..3d78ac90c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -125,6 +125,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0051-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0050-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0051-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0050-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0052-Pigs-give-saddle-back.patch b/patches/server/0051-Pigs-give-saddle-back.patch similarity index 100% rename from patches/server/0052-Pigs-give-saddle-back.patch rename to patches/server/0051-Pigs-give-saddle-back.patch diff --git a/patches/server/0053-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0052-Snowman-drop-and-put-back-pumpkin.patch similarity index 100% rename from patches/server/0053-Snowman-drop-and-put-back-pumpkin.patch rename to patches/server/0052-Snowman-drop-and-put-back-pumpkin.patch diff --git a/patches/server/0054-Ender-dragon-always-drop-egg.patch b/patches/server/0053-Ender-dragon-always-drop-egg.patch similarity index 100% rename from patches/server/0054-Ender-dragon-always-drop-egg.patch rename to patches/server/0053-Ender-dragon-always-drop-egg.patch diff --git a/patches/server/0055-Ender-dragon-always-drop-full-exp.patch b/patches/server/0054-Ender-dragon-always-drop-full-exp.patch similarity index 100% rename from patches/server/0055-Ender-dragon-always-drop-full-exp.patch rename to patches/server/0054-Ender-dragon-always-drop-full-exp.patch diff --git a/patches/server/0056-Signs-editable-on-right-click.patch b/patches/server/0055-Signs-editable-on-right-click.patch similarity index 100% rename from patches/server/0056-Signs-editable-on-right-click.patch rename to patches/server/0055-Signs-editable-on-right-click.patch diff --git a/patches/server/0057-Signs-allow-color-codes.patch b/patches/server/0056-Signs-allow-color-codes.patch similarity index 99% rename from patches/server/0057-Signs-allow-color-codes.patch rename to patches/server/0056-Signs-allow-color-codes.patch index a7354ba2d..37ebb241b 100644 --- a/patches/server/0057-Signs-allow-color-codes.patch +++ b/patches/server/0056-Signs-allow-color-codes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 07f8f0fa7..3556e86fd 100644 +index 3828eab1a..3ccfc969f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1269,6 +1269,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0058-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0057-Allow-soil-to-moisten-from-water-directly-under-it.patch similarity index 100% rename from patches/server/0058-Allow-soil-to-moisten-from-water-directly-under-it.patch rename to patches/server/0057-Allow-soil-to-moisten-from-water-directly-under-it.patch diff --git a/patches/server/0059-Controllable-Minecarts.patch b/patches/server/0058-Controllable-Minecarts.patch similarity index 97% rename from patches/server/0059-Controllable-Minecarts.patch rename to patches/server/0058-Controllable-Minecarts.patch index 4397c1ee2..429d71cd2 100644 --- a/patches/server/0059-Controllable-Minecarts.patch +++ b/patches/server/0058-Controllable-Minecarts.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Controllable Minecarts diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 551ca4471f..32757e2318 100644 +index 7ff4948a4..82f3f275d 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -33,6 +33,12 @@ public class BlockPosition extends BaseBlockPosition { @@ -22,7 +22,7 @@ index 551ca4471f..32757e2318 100644 super(i, j, k); } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index dd894c7eab..bf8be60124 100644 +index 653071979..581b50a0f 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -98,9 +98,9 @@ public abstract class EntityLiving extends Entity { @@ -39,7 +39,7 @@ index dd894c7eab..bf8be60124 100644 protected double bc; protected double bd; diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index 6e038905ea..cdbe1a32e0 100644 +index 6e038905e..cdbe1a32e 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -432,12 +432,50 @@ public abstract class EntityMinecartAbstract extends Entity { @@ -94,7 +94,7 @@ index 6e038905ea..cdbe1a32e0 100644 this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ)); // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java -index dc7decb060..0da16c2006 100644 +index dc7decb06..0da16c200 100644 --- a/src/main/java/net/minecraft/server/ItemMinecart.java +++ b/src/main/java/net/minecraft/server/ItemMinecart.java @@ -103,8 +103,10 @@ public class ItemMinecart extends Item { @@ -119,7 +119,7 @@ index dc7decb060..0da16c2006 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 70e504ff30..276131adc7 100644 +index 70e504ff3..276131adc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1,5 +1,7 @@ diff --git a/patches/server/0060-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0059-Disable-loot-drops-on-death-by-cramming.patch similarity index 98% rename from patches/server/0060-Disable-loot-drops-on-death-by-cramming.patch rename to patches/server/0059-Disable-loot-drops-on-death-by-cramming.patch index 84b46cc19..abfce8e6a 100644 --- a/patches/server/0060-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0059-Disable-loot-drops-on-death-by-cramming.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index bf8be6012..e42185ad4 100644 +index 581b50a0f..87d72bbbe 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1484,8 +1484,10 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0061-Players-should-not-cram-to-death.patch b/patches/server/0060-Players-should-not-cram-to-death.patch similarity index 96% rename from patches/server/0061-Players-should-not-cram-to-death.patch rename to patches/server/0060-Players-should-not-cram-to-death.patch index b69e5c285..c4c44410a 100644 --- a/patches/server/0061-Players-should-not-cram-to-death.patch +++ b/patches/server/0060-Players-should-not-cram-to-death.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Players should not cram to death diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 3556e86fd..42f3ef1ee 100644 +index 3ccfc969f..4f8042a48 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1243,7 +1243,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0062-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0061-Option-to-toggle-milk-curing-bad-omen.patch similarity index 100% rename from patches/server/0062-Option-to-toggle-milk-curing-bad-omen.patch rename to patches/server/0061-Option-to-toggle-milk-curing-bad-omen.patch diff --git a/patches/server/0063-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0062-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0063-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0062-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0064-Debug-stick-should-not-update-neighbors.patch b/patches/server/0063-Debug-stick-should-not-update-neighbors.patch similarity index 91% rename from patches/server/0064-Debug-stick-should-not-update-neighbors.patch rename to patches/server/0063-Debug-stick-should-not-update-neighbors.patch index ea4aa608f..3f5af5a41 100644 --- a/patches/server/0064-Debug-stick-should-not-update-neighbors.patch +++ b/patches/server/0063-Debug-stick-should-not-update-neighbors.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Debug stick should not update neighbors diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 53dc47ffb4..a149321e72 100644 +index 3c56053e3..092b4d3c2 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java -@@ -237,6 +237,11 @@ public final class ItemStack { +@@ -229,6 +229,11 @@ public final class ItemStack { if (this.getItem() == Items.BONE_MEAL) { world.captureTreeGeneration = true; } diff --git a/patches/server/0065-Fix-reloading-paper.yml.patch b/patches/server/0064-Fix-reloading-paper.yml.patch similarity index 100% rename from patches/server/0065-Fix-reloading-paper.yml.patch rename to patches/server/0064-Fix-reloading-paper.yml.patch diff --git a/patches/server/0066-Fix-the-dead-lagging-the-server.patch b/patches/server/0065-Fix-the-dead-lagging-the-server.patch similarity index 95% rename from patches/server/0066-Fix-the-dead-lagging-the-server.patch rename to patches/server/0065-Fix-the-dead-lagging-the-server.patch index 8f5422e3f..bf0c9c0d1 100644 --- a/patches/server/0066-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0065-Fix-the-dead-lagging-the-server.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 884f4a0abf..f55b30255c 100644 +index 884f4a0ab..f55b30255 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1523,7 +1523,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index 884f4a0abf..f55b30255c 100644 public void c(Vec3D vec3d) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 87d72bbbe7..7aadccfc53 100644 +index 87d72bbbe..7aadccfc5 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2468,7 +2468,7 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0067-Skip-events-if-there-s-no-listeners.patch b/patches/server/0066-Skip-events-if-there-s-no-listeners.patch similarity index 100% rename from patches/server/0067-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0066-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0068-Add-permission-for-F3-N-debug.patch b/patches/server/0067-Add-permission-for-F3-N-debug.patch similarity index 95% rename from patches/server/0068-Add-permission-for-F3-N-debug.patch rename to patches/server/0067-Add-permission-for-F3-N-debug.patch index 81a1a8069..fe7ae0add 100644 --- a/patches/server/0068-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0067-Add-permission-for-F3-N-debug.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 461cc24689..b32bd49d77 100644 +index 461cc2468..b32bd49d7 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1034,6 +1034,7 @@ public abstract class PlayerList { diff --git a/patches/server/0069-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0068-Add-wither-skeleton-takes-wither-damage-option.patch similarity index 100% rename from patches/server/0069-Add-wither-skeleton-takes-wither-damage-option.patch rename to patches/server/0068-Add-wither-skeleton-takes-wither-damage-option.patch diff --git a/patches/server/0070-Configurable-TPS-Catchup.patch b/patches/server/0069-Configurable-TPS-Catchup.patch similarity index 100% rename from patches/server/0070-Configurable-TPS-Catchup.patch rename to patches/server/0069-Configurable-TPS-Catchup.patch diff --git a/patches/server/0071-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0070-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch similarity index 100% rename from patches/server/0071-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch rename to patches/server/0070-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch diff --git a/patches/server/0072-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0071-Add-enderman-and-creeper-griefing-controls.patch similarity index 100% rename from patches/server/0072-Add-enderman-and-creeper-griefing-controls.patch rename to patches/server/0071-Add-enderman-and-creeper-griefing-controls.patch diff --git a/patches/server/0073-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0072-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch similarity index 100% rename from patches/server/0073-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch rename to patches/server/0072-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch diff --git a/patches/server/0074-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0073-Villagers-farming-can-bypass-mob-griefing-gamerule.patch similarity index 100% rename from patches/server/0074-Villagers-farming-can-bypass-mob-griefing-gamerule.patch rename to patches/server/0073-Villagers-farming-can-bypass-mob-griefing-gamerule.patch diff --git a/patches/server/0075-Villagers-follow-emerald-blocks.patch b/patches/server/0074-Villagers-follow-emerald-blocks.patch similarity index 100% rename from patches/server/0075-Villagers-follow-emerald-blocks.patch rename to patches/server/0074-Villagers-follow-emerald-blocks.patch diff --git a/patches/server/0076-Allow-leashing-villagers.patch b/patches/server/0075-Allow-leashing-villagers.patch similarity index 100% rename from patches/server/0076-Allow-leashing-villagers.patch rename to patches/server/0075-Allow-leashing-villagers.patch diff --git a/patches/server/0077-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0076-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0077-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0076-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0078-Implement-infinite-lava.patch b/patches/server/0077-Implement-infinite-lava.patch similarity index 100% rename from patches/server/0078-Implement-infinite-lava.patch rename to patches/server/0077-Implement-infinite-lava.patch diff --git a/patches/server/0079-Make-lava-flow-speed-configurable.patch b/patches/server/0078-Make-lava-flow-speed-configurable.patch similarity index 100% rename from patches/server/0079-Make-lava-flow-speed-configurable.patch rename to patches/server/0078-Make-lava-flow-speed-configurable.patch diff --git a/patches/server/0080-Add-player-death-exp-control-options.patch b/patches/server/0079-Add-player-death-exp-control-options.patch similarity index 100% rename from patches/server/0080-Add-player-death-exp-control-options.patch rename to patches/server/0079-Add-player-death-exp-control-options.patch diff --git a/patches/server/0081-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch similarity index 98% rename from patches/server/0081-Add-option-to-disable-saving-projectiles-to-disk.patch rename to patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch index 6dd2ca4e9..601e0306f 100644 --- a/patches/server/0081-Add-option-to-disable-saving-projectiles-to-disk.patch +++ b/patches/server/0080-Add-option-to-disable-saving-projectiles-to-disk.patch @@ -17,7 +17,7 @@ index 742c59cb0..2b2471072 100644 // Paper start if (asyncsavedata == null && !entity.dead && (int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index a8706f754..17c591b82 100644 +index f55b30255..115421ea7 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -311,6 +311,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -56,7 +56,7 @@ index 84bf27299..82a5aaf5b 100644 })); } diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java -index a961f5d5d..c5d788f22 100644 +index 6e175e30a..f538189ae 100644 --- a/src/main/java/net/minecraft/server/IProjectile.java +++ b/src/main/java/net/minecraft/server/IProjectile.java @@ -18,6 +18,13 @@ public abstract class IProjectile extends Entity { diff --git a/patches/server/0082-Configurable-void-damage-height.patch b/patches/server/0081-Configurable-void-damage-height.patch similarity index 98% rename from patches/server/0082-Configurable-void-damage-height.patch rename to patches/server/0081-Configurable-void-damage-height.patch index f46303d9e..469190885 100644 --- a/patches/server/0082-Configurable-void-damage-height.patch +++ b/patches/server/0081-Configurable-void-damage-height.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 17c591b82..8f5151de8 100644 +index 115421ea7..145e0a716 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -534,7 +534,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/patches/server/0083-Add-option-for-zombies-targetting-turtle-eggs.patch b/patches/server/0082-Add-option-for-zombies-targetting-turtle-eggs.patch similarity index 100% rename from patches/server/0083-Add-option-for-zombies-targetting-turtle-eggs.patch rename to patches/server/0082-Add-option-for-zombies-targetting-turtle-eggs.patch diff --git a/patches/server/0084-Dispenser-curse-of-binding-protection.patch b/patches/server/0083-Dispenser-curse-of-binding-protection.patch similarity index 100% rename from patches/server/0084-Dispenser-curse-of-binding-protection.patch rename to patches/server/0083-Dispenser-curse-of-binding-protection.patch diff --git a/patches/server/0085-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0084-Add-option-for-boats-to-eject-players-on-land.patch similarity index 100% rename from patches/server/0085-Add-option-for-boats-to-eject-players-on-land.patch rename to patches/server/0084-Add-option-for-boats-to-eject-players-on-land.patch diff --git a/patches/server/0086-Add-obfhelpers-for-plugin-use.patch b/patches/server/0085-Add-obfhelpers-for-plugin-use.patch similarity index 89% rename from patches/server/0086-Add-obfhelpers-for-plugin-use.patch rename to patches/server/0085-Add-obfhelpers-for-plugin-use.patch index 5c6d5332f..978f33e4e 100644 --- a/patches/server/0086-Add-obfhelpers-for-plugin-use.patch +++ b/patches/server/0085-Add-obfhelpers-for-plugin-use.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add obfhelpers for plugin use diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index a149321e72..41a8f43fc4 100644 +index 092b4d3c2..c246942ce 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java -@@ -652,6 +652,7 @@ public final class ItemStack { +@@ -644,6 +644,7 @@ public final class ItemStack { return this.tag; } diff --git a/patches/server/0087-Mending-mends-most-damages-equipment-first.patch b/patches/server/0086-Mending-mends-most-damages-equipment-first.patch similarity index 96% rename from patches/server/0087-Mending-mends-most-damages-equipment-first.patch rename to patches/server/0086-Mending-mends-most-damages-equipment-first.patch index 94543c839..377d9dcb9 100644 --- a/patches/server/0087-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0086-Mending-mends-most-damages-equipment-first.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Mending mends most damages equipment first diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java -index 92ceb8bb7d..1acfea2870 100644 +index 92ceb8bb7..1acfea287 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java @@ -251,9 +251,33 @@ public class EnchantmentManager { @@ -44,7 +44,7 @@ index 92ceb8bb7d..1acfea2870 100644 } @Nullable diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 2396b4d6ff..0124fa5470 100644 +index 2396b4d6f..0124fa547 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -220,7 +220,7 @@ public class EntityExperienceOrb extends Entity { @@ -57,10 +57,10 @@ index 2396b4d6ff..0124fa5470 100644 if (entry != null) { ItemStack itemstack = (ItemStack) entry.getValue(); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 41a8f43fc4..2d53258daa 100644 +index c246942ce..d40c7ce09 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java -@@ -426,10 +426,19 @@ public final class ItemStack { +@@ -418,10 +418,19 @@ public final class ItemStack { } } @@ -81,7 +81,7 @@ index 41a8f43fc4..2d53258daa 100644 return this.tag == null ? 0 : this.tag.getInt("Damage"); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 15e2d9dd0f..993ad17eca 100644 +index 15e2d9dd0..993ad17ec 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -110,6 +110,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0088-Implement-bamboo-growth-settings.patch b/patches/server/0087-Implement-bamboo-growth-settings.patch similarity index 100% rename from patches/server/0088-Implement-bamboo-growth-settings.patch rename to patches/server/0087-Implement-bamboo-growth-settings.patch diff --git a/patches/server/0089-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 95% rename from patches/server/0089-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/server/0088-Climbing-should-not-bypass-cramming-gamerule.patch index 26bbf7aab..2835813e7 100644 --- a/patches/server/0089-Climbing-should-not-bypass-cramming-gamerule.patch +++ b/patches/server/0088-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/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 145e0a7165..9b69073f9a 100644 +index 145e0a716..9b69073f9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1703,6 +1703,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -22,7 +22,7 @@ index 145e0a7165..9b69073f9a 100644 } diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 7543f2ceeb..c3cde15686 100644 +index 7543f2cee..c3cde1568 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -318,7 +318,7 @@ public class EntityArmorStand extends EntityLiving { @@ -35,7 +35,7 @@ index 7543f2ceeb..c3cde15686 100644 } diff --git a/src/main/java/net/minecraft/server/EntityBat.java b/src/main/java/net/minecraft/server/EntityBat.java -index 3dd3b8913e..99bae2dcb7 100644 +index 3dd3b8913..99bae2dcb 100644 --- a/src/main/java/net/minecraft/server/EntityBat.java +++ b/src/main/java/net/minecraft/server/EntityBat.java @@ -50,7 +50,7 @@ public class EntityBat extends EntityAmbient { @@ -48,7 +48,7 @@ index 3dd3b8913e..99bae2dcb7 100644 } diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java -index a20d6feb8c..92c1d1794a 100644 +index a20d6feb8..92c1d1794 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java @@ -104,7 +104,7 @@ public class EntityBoat extends Entity { @@ -61,7 +61,7 @@ index a20d6feb8c..92c1d1794a 100644 } diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index ee7a2fedde..c9ab80ccd1 100644 +index ee7a2fedd..c9ab80ccd 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -74,7 +74,7 @@ index ee7a2fedde..c9ab80ccd1 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 7aadccfc53..7a4b5670d4 100644 +index 7aadccfc5..7a4b5670d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2854,7 +2854,7 @@ public abstract class EntityLiving extends Entity { @@ -98,7 +98,7 @@ index 7aadccfc53..7a4b5670d4 100644 // CraftBukkit start - collidable API diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index cdbe1a32e0..c33b5c950d 100644 +index cdbe1a32e..c33b5c950 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -108,7 +108,7 @@ public abstract class EntityMinecartAbstract extends Entity { @@ -111,7 +111,7 @@ index cdbe1a32e0..c33b5c950d 100644 } diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java -index 2172fcefbc..7afdb30603 100644 +index 2172fcefb..7afdb3060 100644 --- a/src/main/java/net/minecraft/server/EntityParrot.java +++ b/src/main/java/net/minecraft/server/EntityParrot.java @@ -314,8 +314,8 @@ public class EntityParrot extends EntityPerchable implements EntityBird { @@ -126,7 +126,7 @@ index 2172fcefbc..7afdb30603 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 0cb0e6b42d..be7ecb8478 100644 +index 4f8042a48..9ae4c63ad 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1805,8 +1805,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -141,7 +141,7 @@ index 0cb0e6b42d..be7ecb8478 100644 // Purpur end diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index 9b4795f3bd..192d9798c4 100644 +index 9b4795f3b..192d9798c 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -45,11 +45,17 @@ public final class IEntitySelector { @@ -164,7 +164,7 @@ index 9b4795f3bd..192d9798c4 100644 } else if (entity.world.isClientSide && (!(entity1 instanceof EntityHuman) || !((EntityHuman) entity1).ey())) { return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a9b1a130be..860e25dfd8 100644 +index a9b1a130b..860e25dfd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -114,6 +114,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0090-Add-5-second-tps-average-in-tps.patch b/patches/server/0089-Add-5-second-tps-average-in-tps.patch similarity index 97% rename from patches/server/0090-Add-5-second-tps-average-in-tps.patch rename to patches/server/0089-Add-5-second-tps-average-in-tps.patch index 467cf0482..8116b778a 100644 --- a/patches/server/0090-Add-5-second-tps-average-in-tps.patch +++ b/patches/server/0089-Add-5-second-tps-average-in-tps.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add 5 second tps average in /tps diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 5acd2a97c4..6c0854623e 100644 +index 5acd2a97c..6c0854623 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -165,7 +165,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0) { @@ -58,7 +58,7 @@ index 2d53258daa..2a286dcd79 100644 int k = 0; for (int l = 0; j > 0 && l < i; ++l) { -@@ -504,6 +504,12 @@ public final class ItemStack { +@@ -496,6 +496,12 @@ public final class ItemStack { if (this.isDamaged(i, t0.getRandom(), t0 instanceof EntityPlayer ? (EntityPlayer) t0 : null)) { consumer.accept(t0); Item item = this.getItem(); @@ -72,7 +72,7 @@ index 2d53258daa..2a286dcd79 100644 if (this.count == 1 && t0 instanceof EntityHuman) { org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerItemBreakEvent((EntityHuman) t0, this); diff --git a/src/main/java/net/minecraft/server/ItemTrident.java b/src/main/java/net/minecraft/server/ItemTrident.java -index 32982bb477..a0e4d46abf 100644 +index 32982bb47..a0e4d46ab 100644 --- a/src/main/java/net/minecraft/server/ItemTrident.java +++ b/src/main/java/net/minecraft/server/ItemTrident.java @@ -102,6 +102,16 @@ public class ItemTrident extends Item implements ItemVanishable { @@ -93,7 +93,7 @@ index 32982bb477..a0e4d46abf 100644 entityhuman.r(20); if (entityhuman.isOnGround()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 860e25dfd8..d1b0d40307 100644 +index 860e25dfd..d1b0d4030 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -131,6 +131,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0092-Add-item-entity-options.patch b/patches/server/0091-Add-item-entity-options.patch similarity index 96% rename from patches/server/0092-Add-item-entity-options.patch rename to patches/server/0091-Add-item-entity-options.patch index 00f0e5639..1ed6ee2e3 100644 --- a/patches/server/0092-Add-item-entity-options.patch +++ b/patches/server/0091-Add-item-entity-options.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add item entity options diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 9b69073f9a..ee35d5950f 100644 +index 9b69073f9..ee35d5950 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1462,6 +1462,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index 9b69073f9a..ee35d5950f 100644 return this.O == tag; } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index a7860cb4de..77e970c307 100644 +index a7860cb4d..77e970c30 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -258,7 +258,7 @@ public class EntityItem extends Entity { @@ -39,7 +39,7 @@ index a7860cb4de..77e970c307 100644 // CraftBukkit start if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d1b0d40307..9de7246862 100644 +index d1b0d4030..9de724686 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -99,6 +99,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0093-Add-ping-command.patch b/patches/server/0092-Add-ping-command.patch similarity index 100% rename from patches/server/0093-Add-ping-command.patch rename to patches/server/0092-Add-ping-command.patch diff --git a/patches/server/0094-Configurable-jockey-options.patch b/patches/server/0093-Configurable-jockey-options.patch similarity index 100% rename from patches/server/0094-Configurable-jockey-options.patch rename to patches/server/0093-Configurable-jockey-options.patch diff --git a/patches/server/0095-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0094-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 98% rename from patches/server/0095-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0094-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index c3a0b0e4b..86e8200c5 100644 --- a/patches/server/0095-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0094-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java -index 6fe5678cff..bd0267ee4b 100644 +index 6fe5678cf..bd0267ee4 100644 --- a/src/main/java/net/minecraft/server/DamageSource.java +++ b/src/main/java/net/minecraft/server/DamageSource.java @@ -88,6 +88,7 @@ public class DamageSource { @@ -17,7 +17,7 @@ index 6fe5678cff..bd0267ee4b 100644 return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic(); } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ee35d5950f..2d49816311 100644 +index ee35d5950..2d4981631 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1579,6 +1579,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -40,7 +40,7 @@ index ee35d5950f..2d49816311 100644 } diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java -index 21dfe7f425..71a440d69d 100644 +index 21dfe7f42..71a440d69 100644 --- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java +++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java @@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity { @@ -108,7 +108,7 @@ index 21dfe7f425..71a440d69d 100644 @Override protected void saveData(NBTTagCompound nbttagcompound) { diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 3cb78924da..ec09ec241a 100644 +index 3cb78924d..ec09ec241 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -9,9 +9,10 @@ import javax.annotation.Nullable; @@ -329,7 +329,7 @@ index 3cb78924da..ec09ec241a 100644 return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3e067c832f..f2ca515c9b 100644 +index 3e067c832..f2ca515c9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -324,6 +324,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0096-Customizable-EnderDragon-Health.patch b/patches/server/0095-Customizable-EnderDragon-Health.patch similarity index 100% rename from patches/server/0096-Customizable-EnderDragon-Health.patch rename to patches/server/0095-Customizable-EnderDragon-Health.patch diff --git a/patches/server/0097-Make-natural-spawns-per-biome-configurable.patch b/patches/server/0096-Make-natural-spawns-per-biome-configurable.patch similarity index 99% rename from patches/server/0097-Make-natural-spawns-per-biome-configurable.patch rename to patches/server/0096-Make-natural-spawns-per-biome-configurable.patch index 4f01151bb..e75cb1fbd 100644 --- a/patches/server/0097-Make-natural-spawns-per-biome-configurable.patch +++ b/patches/server/0096-Make-natural-spawns-per-biome-configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make natural spawns per biome configurable diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index 52ebdfcc03..9259ba1af5 100644 +index 52ebdfcc0..9259ba1af 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -25,6 +25,23 @@ import org.apache.logging.log4j.Logger; @@ -51,7 +51,7 @@ index 52ebdfcc03..9259ba1af5 100644 protected void a(EntityTypes entitytypes, double d0, double d1) { diff --git a/src/main/java/net/minecraft/server/Biomes.java b/src/main/java/net/minecraft/server/Biomes.java -index eaa527f4fe..d39b19f798 100644 +index eaa527f4f..d39b19f79 100644 --- a/src/main/java/net/minecraft/server/Biomes.java +++ b/src/main/java/net/minecraft/server/Biomes.java @@ -91,6 +91,35 @@ public abstract class Biomes { @@ -92,7 +92,7 @@ index eaa527f4fe..d39b19f798 100644 diff --git a/src/main/resources/biomes.yml b/src/main/resources/biomes.yml new file mode 100644 -index 0000000000..ff48801c32 +index 000000000..ff48801c3 --- /dev/null +++ b/src/main/resources/biomes.yml @@ -0,0 +1,1065 @@ diff --git a/patches/server/0098-Add-phantom-spawning-options.patch b/patches/server/0097-Add-phantom-spawning-options.patch similarity index 98% rename from patches/server/0098-Add-phantom-spawning-options.patch rename to patches/server/0097-Add-phantom-spawning-options.patch index f57b0e6a4..934595bb9 100644 --- a/patches/server/0098-Add-phantom-spawning-options.patch +++ b/patches/server/0097-Add-phantom-spawning-options.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add phantom spawning options diff --git a/src/main/java/net/minecraft/server/DifficultyDamageScaler.java b/src/main/java/net/minecraft/server/DifficultyDamageScaler.java -index 75745af343..84c0ec1b50 100644 +index 75745af34..84c0ec1b5 100644 --- a/src/main/java/net/minecraft/server/DifficultyDamageScaler.java +++ b/src/main/java/net/minecraft/server/DifficultyDamageScaler.java @@ -13,6 +13,7 @@ public class DifficultyDamageScaler { @@ -25,7 +25,7 @@ index 75745af343..84c0ec1b50 100644 return this.b > f; } diff --git a/src/main/java/net/minecraft/server/EnumDifficulty.java b/src/main/java/net/minecraft/server/EnumDifficulty.java -index e0e72779c0..386eae71a1 100644 +index e0e72779c..386eae71a 100644 --- a/src/main/java/net/minecraft/server/EnumDifficulty.java +++ b/src/main/java/net/minecraft/server/EnumDifficulty.java @@ -19,6 +19,7 @@ public enum EnumDifficulty { @@ -37,7 +37,7 @@ index e0e72779c0..386eae71a1 100644 return this.f; } diff --git a/src/main/java/net/minecraft/server/IBlockLightAccess.java b/src/main/java/net/minecraft/server/IBlockLightAccess.java -index 3f187f3494..c678e6fe96 100644 +index 3f187f349..c678e6fe9 100644 --- a/src/main/java/net/minecraft/server/IBlockLightAccess.java +++ b/src/main/java/net/minecraft/server/IBlockLightAccess.java @@ -12,6 +12,7 @@ public interface IBlockLightAccess extends IBlockAccess { @@ -49,7 +49,7 @@ index 3f187f3494..c678e6fe96 100644 return this.getBrightness(EnumSkyBlock.SKY, blockposition) >= this.H(); } diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java -index bf4fa17101..ac1ea2f0c1 100644 +index bf4fa1710..ac1ea2f0c 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java @@ -1,85 +1,99 @@ @@ -221,7 +221,7 @@ index bf4fa17101..ac1ea2f0c1 100644 } } diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index c5845013a7..bc63beb3c7 100644 +index c5845013a..bc63beb3c 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -385,6 +385,7 @@ public final class SpawnerCreature { @@ -233,7 +233,7 @@ index c5845013a7..bc63beb3c7 100644 return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata)))); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index aaef3bf595..fd31212e0b 100644 +index ad58307f1..d4abe2d9c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1501,6 +1501,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -245,7 +245,7 @@ index aaef3bf595..fd31212e0b 100644 public int c() { return this.d; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e6b41ab924..80d772e021 100644 +index e6b41ab92..80d772e02 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -329,10 +329,34 @@ public class PurpurWorldConfig { diff --git a/patches/server/0099-Implement-bed-explosion-options.patch b/patches/server/0098-Implement-bed-explosion-options.patch similarity index 97% rename from patches/server/0099-Implement-bed-explosion-options.patch rename to patches/server/0098-Implement-bed-explosion-options.patch index 8bfff0fe1..e34264c7e 100644 --- a/patches/server/0099-Implement-bed-explosion-options.patch +++ b/patches/server/0098-Implement-bed-explosion-options.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement bed explosion options diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java -index e7bd9061cc..aeffefa4e7 100644 +index e7bd9061c..aeffefa4e 100644 --- a/src/main/java/net/minecraft/server/BlockBed.java +++ b/src/main/java/net/minecraft/server/BlockBed.java @@ -88,7 +88,7 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity { @@ -18,7 +18,7 @@ index e7bd9061cc..aeffefa4e7 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 80d772e021..56c4f9efd0 100644 +index 80d772e02..56c4f9efd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -2,6 +2,7 @@ package net.pl3x.purpur; diff --git a/patches/server/0100-Implement-respawn-anchor-explosion-options.patch b/patches/server/0099-Implement-respawn-anchor-explosion-options.patch similarity index 98% rename from patches/server/0100-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0099-Implement-respawn-anchor-explosion-options.patch index 5db485c08..78c129a83 100644 --- a/patches/server/0100-Implement-respawn-anchor-explosion-options.patch +++ b/patches/server/0099-Implement-respawn-anchor-explosion-options.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement respawn anchor explosion options diff --git a/src/main/java/net/minecraft/server/BlockRespawnAnchor.java b/src/main/java/net/minecraft/server/BlockRespawnAnchor.java -index 56ad9a51d1..33f4b8a290 100644 +index 56ad9a51d..33f4b8a29 100644 --- a/src/main/java/net/minecraft/server/BlockRespawnAnchor.java +++ b/src/main/java/net/minecraft/server/BlockRespawnAnchor.java @@ -79,10 +79,7 @@ public class BlockRespawnAnchor extends Block { @@ -30,7 +30,7 @@ index 56ad9a51d1..33f4b8a290 100644 public static boolean a(World world) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 56c4f9efd0..2f5bc77e03 100644 +index 56c4f9efd..2f5bc77e0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -233,6 +233,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0101-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch b/patches/server/0100-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch similarity index 96% rename from patches/server/0101-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch rename to patches/server/0100-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch index 99438b3da..ac1592bf5 100644 --- a/patches/server/0101-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch +++ b/patches/server/0100-Fix-armorstand-entity-lookups-paper.yml-setting-not-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix armorstand entity lookups paper.yml setting not being diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index fd31212e0b..14eadf64e7 100644 +index d4abe2d9c..ac54b1df1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -974,13 +974,6 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -24,7 +24,7 @@ index fd31212e0b..14eadf64e7 100644 public Explosion explode(@Nullable Entity entity, double d0, double d1, double d2, float f, Explosion.Effect explosion_effect) { return this.createExplosion(entity, (DamageSource) null, (ExplosionDamageCalculator) null, d0, d1, d2, f, false, explosion_effect); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 918a82d466..39107b067c 100644 +index e6ad5a6ab..7c9a3714e 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -688,6 +688,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0102-Add-allow-water-in-end-world-option.patch b/patches/server/0101-Add-allow-water-in-end-world-option.patch similarity index 97% rename from patches/server/0102-Add-allow-water-in-end-world-option.patch rename to patches/server/0101-Add-allow-water-in-end-world-option.patch index 8a43cc015..1cbdf3684 100644 --- a/patches/server/0102-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0101-Add-allow-water-in-end-world-option.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add allow water in end world option diff --git a/src/main/java/net/minecraft/server/BlockIce.java b/src/main/java/net/minecraft/server/BlockIce.java -index aba5c6b871..b75f6ded5d 100644 +index aba5c6b87..b75f6ded5 100644 --- a/src/main/java/net/minecraft/server/BlockIce.java +++ b/src/main/java/net/minecraft/server/BlockIce.java @@ -13,7 +13,7 @@ public class BlockIce extends BlockHalfTransparent { @@ -27,7 +27,7 @@ index aba5c6b871..b75f6ded5d 100644 } else { world.setTypeUpdate(blockposition, Blocks.WATER.getBlockData()); diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java -index 120bf8436f..848a185c04 100644 +index 120bf8436..848a185c0 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -122,7 +122,7 @@ public class ItemBucket extends Item { @@ -49,7 +49,7 @@ index 120bf8436f..848a185c04 100644 return true; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 14eadf64e7..4df988a694 100644 +index ac54b1df1..60ae7117f 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1573,4 +1573,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -68,7 +68,7 @@ index 14eadf64e7..4df988a694 100644 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 066ae1fecb..494d36085e 100644 +index 066ae1fec..494d36085 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,7 +1,6 @@ diff --git a/patches/server/0103-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch b/patches/server/0102-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch similarity index 96% rename from patches/server/0103-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch rename to patches/server/0102-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch index 495c1e107..960ba279a 100644 --- a/patches/server/0103-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch +++ b/patches/server/0102-MC-171420-Fix-deop-kicking-non-whitelisted-player-wh.patch @@ -6,7 +6,7 @@ Subject: [PATCH] MC-171420 - Fix deop kicking non-whitelisted player when diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6c0854623e..0f800e085c 100644 +index 6c0854623..0f800e085 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1954,6 +1954,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant