From 896aa8b54acd288703bdc973aafdb176b8578095 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Fri, 22 Sep 2023 10:59:56 -0700 Subject: [PATCH] Rebuild patches --- patches/server/0002-Remap-fixes.patch | 2 +- .../server/0003-Build-system-changes.patch | 4 +- patches/server/0005-Paper-config-files.patch | 2 +- patches/server/0006-MC-Dev-fixes.patch | 30 ++-- patches/server/0008-CB-fixes.patch | 4 +- patches/server/0009-MC-Utils.patch | 26 ++-- patches/server/0010-Adventure.patch | 26 ++-- patches/server/0013-Paper-Plugins.patch | 2 +- patches/server/0014-Timings-v2.patch | 4 +- .../0015-Rewrite-dataconverter-system.patch | 10 +- patches/server/0016-Starlight.patch | 14 +- ...d-mobs-to-jump-and-take-water-damage.patch | 2 +- .../0029-Player-affects-spawning-API.patch | 2 +- .../0055-Player-Tab-List-and-Title-APIs.patch | 4 +- .../server/0063-Chunk-Save-Reattempt.patch | 6 +- ...074-Use-a-Shared-Random-for-Entities.patch | 2 +- ...ldBounds-and-getBlockState-for-inlin.patch | 8 +- patches/server/0080-EntityPathfindEvent.patch | 8 +- ...egionFileCache-and-make-configurable.patch | 4 +- ...2-Do-not-load-chunks-for-Pathfinding.patch | 2 +- ...0083-Add-PlayerUseUnknownEntityEvent.patch | 2 +- patches/server/0086-Optimize-DataBits.patch | 4 +- .../0088-Configurable-Player-Collision.patch | 2 +- .../0090-Configurable-RCON-IP-address.patch | 2 +- ...-to-configure-frosted_ice-properties.patch | 2 +- ...-API-Replenishable-Lootables-Feature.patch | 4 +- ...y-scoreboard-teams-to-scoreboard.dat.patch | 2 +- ...ptimise-BlockState-s-hashCode-equals.patch | 8 +- ...vent-Pathfinding-out-of-World-Border.patch | 2 +- ...figurable-Cartographer-Treasure-Maps.patch | 4 +- .../0120-String-based-Action-Bar-API.patch | 2 +- patches/server/0122-Firework-API-s.patch | 2 +- ...-profile-lookups-to-worldgen-threads.patch | 2 +- ...9-PlayerNaturallySpawnCreaturesEvent.patch | 2 +- ...sted-Ice-from-loading-holding-chunks.patch | 2 +- ...le-Alternative-LootPool-Luck-Formula.patch | 2 +- ...KnockbackByEntityEvent-and-EntityPus.patch | 6 +- patches/server/0220-EnderDragon-Events.patch | 6 +- .../server/0221-PlayerElytraBoostEvent.patch | 2 +- .../0222-PlayerLaunchProjectileEvent.patch | 10 +- .../0223-Improve-BlockPosition-inlining.patch | 2 +- .../server/0227-SkeletonHorse-Additions.patch | 2 +- ...ies-option-to-debug-dupe-uuid-issues.patch | 4 +- ...ptimize-BlockPosition-helper-methods.patch | 2 +- .../server/0245-Optimize-MappedRegistry.patch | 2 +- .../server/0252-Improve-death-events.patch | 2 +- patches/server/0254-Mob-Pathfinding-API.patch | 2 +- ...arseException-in-Entity-and-TE-names.patch | 2 +- patches/server/0267-Turtle-API.patch | 2 +- ...er-Thread-Pool-and-Thread-Priorities.patch | 2 +- ...e-Large-Packets-disconnecting-client.patch | 8 +- ...rove-exact-choice-recipe-ingredients.patch | 6 +- ...le-Oversized-Tile-Entities-in-chunks.patch | 4 +- .../server/0300-Fire-event-on-GS4-query.patch | 4 +- ...le-Keep-Spawn-Loaded-range-per-world.patch | 4 +- ...312-Allow-Saving-of-Oversized-Chunks.patch | 8 +- ...314-Fix-World-isChunkGenerated-calls.patch | 6 +- ...0323-Flat-bedrock-generator-settings.patch | 8 +- ...nk-loads-when-villagers-try-to-find-.patch | 2 +- ...5656-Fix-Follow-Range-Initial-Target.patch | 2 +- .../0326-Duplicate-UUID-Resolve-Option.patch | 2 +- ...Chunks-from-Hoppers-and-other-things.patch | 2 +- .../0334-Entity-Activation-Range-2.0.patch | 8 +- .../0337-Tracking-Range-Improvements.patch | 2 +- ...ement-optional-per-player-mob-spawns.patch | 2 +- ...nnections-shouldn-t-hold-up-shutdown.patch | 2 +- ...-PlayerChunkMap-adds-crashing-server.patch | 2 +- ...ptimize-Collision-to-not-load-chunks.patch | 4 +- ...oalSelector-Goal.Flag-Set-operations.patch | 6 +- .../0367-Improved-Watchdog-Support.patch | 2 +- .../server/0368-Optimize-Pathfinding.patch | 2 +- ...e-memory-footprint-of-NBTTagCompound.patch | 2 +- ...g-Broken-behavior-of-PlayerJoinEvent.patch | 2 +- .../0384-Optimize-Voxel-Shape-Merging.patch | 4 +- ...ktraces-in-log-messages-crash-report.patch | 2 +- .../server/0389-Implement-Mob-Goal-API.patch | 2 +- .../0390-Add-villager-reputation-API.patch | 2 +- ...ston-physics-inconsistency-MC-188840.patch | 2 +- ...ssing-chunks-due-to-integer-overflow.patch | 2 +- ...-Optimize-Bit-Operations-by-inlining.patch | 4 +- ...0421-Support-old-UUID-format-for-NBT.patch | 4 +- ...-Remove-some-streams-from-structures.patch | 2 +- ...from-classes-related-villager-gossip.patch | 2 +- ...4-Bukkit-world-container-is-not-used.patch | 2 +- ...ataPlayer-leak-due-from-quitting-ear.patch | 2 +- ...Fix-some-rails-connecting-improperly.patch | 4 +- ...x-Concurrency-issue-in-ShufflingList.patch | 4 +- .../server/0467-Optimise-getType-calls.patch | 2 +- ...blockpos-allocation-from-pathfinding.patch | 2 +- ...der-Remove-Streams-Optimized-collect.patch | 2 +- .../0488-Add-PlayerItemCooldownEvent.patch | 2 +- ...prove-performance-of-the-end-generat.patch | 2 +- .../0493-Add-PlayerShearBlockEvent.patch | 2 +- ...0497-Player-Chunk-Load-Unload-Events.patch | 2 +- ...erTradeEvent-and-PlayerPurchaseEvent.patch | 2 +- .../0503-Implement-TargetHitEvent.patch | 2 +- .../0504-MC-4-Fix-item-position-desync.patch | 2 +- ...ement-PlayerFlowerPotManipulateEvent.patch | 2 +- ...onfigurable-door-breaking-difficulty.patch | 2 +- .../0543-Inline-shift-direction-fields.patch | 2 +- ...-entity-allow-attribute-registration.patch | 2 +- ...50-Remove-streams-from-SensorNearest.patch | 4 +- patches/server/0551-Improve-ServerGUI.patch | 2 +- ...0552-fix-converting-txt-to-json-file.patch | 2 +- .../0554-added-PlayerNameEntityEvent.patch | 2 +- ...lternative-constructor-for-Rotations.patch | 2 +- ...ditions-to-PlayerGameModeChangeEvent.patch | 4 +- ...x-and-optimise-world-force-upgrading.patch | 4 +- .../0600-Add-EntityInsideBlockEvent.patch | 14 +- .../0605-Add-PlayerKickEvent-causes.patch | 10 +- ...ttedContainer-instead-of-ThreadingDe.patch | 2 +- .../0611-Fix-invulnerable-end-crystals.patch | 2 +- ...e-Biome-Mob-Lookups-for-Mob-Spawning.patch | 2 +- patches/server/0621-Missing-Entity-API.patch | 2 +- ...nd-timings-for-sensors-and-behaviors.patch | 4 +- ...a-bunch-of-missing-forceDrop-toggles.patch | 2 +- ...7-Improve-boat-collision-performance.patch | 2 +- .../0650-Add-BlockBreakBlockEvent.patch | 2 +- .../0658-Add-more-advancement-API.patch | 2 +- .../0661-Fix-issues-with-mob-conversion.patch | 2 +- ...itize-ResourceLocation-error-logging.patch | 2 +- .../0672-Optimise-general-POI-access.patch | 10 +- ...lementation-for-blockstate-state-loo.patch | 10 +- ...ally-inline-methods-in-BlockPosition.patch | 4 +- ...primise-map-impl-for-tracked-players.patch | 2 +- .../0684-Optimise-random-block-ticking.patch | 8 +- .../0685-Remove-streams-for-villager-AI.patch | 8 +- ...ocity-compression-and-cipher-natives.patch | 131 +++++------------- ...thread-worker-count-for-low-core-cou.patch | 2 +- ...or-causing-a-crash-when-trying-to-ge.patch | 2 +- ...-unintended-light-block-manipulation.patch | 2 +- ...de-code-using-deprecated-for-removal.patch | 2 +- ...oversized-item-data-in-equipment-and.patch | 2 +- .../0712-Fix-Spigot-growth-modifiers.patch | 6 +- .../server/0715-Optimize-HashMapPalette.patch | 2 +- ...single-and-multi-AABB-VoxelShapes-an.patch | 14 +- ...-data-to-disk-if-it-serializes-witho.patch | 8 +- ...y-type-tags-suggestions-in-selectors.patch | 2 +- ...max-block-light-for-monster-spawning.patch | 2 +- ...mplifiers-greater-than-127-correctly.patch | 2 +- ...ter-animal-spawn-height-configurable.patch | 2 +- ...39-Multiple-Entries-with-Scoreboards.patch | 2 +- ...d-missing-structure-set-seed-configs.patch | 2 +- ...igurable-sculk-sensor-listener-range.patch | 4 +- patches/server/0764-Custom-Potion-Mixes.patch | 2 +- ...ix-swamp-hut-cat-generation-deadlock.patch | 2 +- .../0777-Add-TameableDeathMessageEvent.patch | 2 +- ...hange-the-podium-for-the-EnderDragon.patch | 10 +- ...-snow-cauldrons-not-turning-to-water.patch | 2 +- .../0804-Sanitize-Sent-BlockEntity-NBT.patch | 4 +- ...t-selector-resolving-in-books-by-def.patch | 2 +- .../0810-Add-WardenAngerChangeEvent.patch | 2 +- ...-strict-advancement-dimension-checks.patch | 2 +- ...-chunk-for-dynamic-game-event-listen.patch | 2 +- ...-Add-and-fix-missing-BlockFadeEvents.patch | 4 +- ...ntityChangeBlockEvent-in-more-places.patch | 8 +- .../0839-Missing-eating-regain-reason.patch | 2 +- .../server/0840-Missing-effect-cause.patch | 4 +- ...43-Call-BlockPhysicsEvent-more-often.patch | 2 +- .../0846-fix-Jigsaw-block-kicking-user.patch | 4 +- .../0849-Fix-a-bunch-of-vanilla-bugs.patch | 20 +-- ...4-Add-PlayerInventorySlotChangeEvent.patch | 2 +- .../0861-Added-EntityToggleSitEvent.patch | 4 +- ...-Prevent-compass-from-loading-chunks.patch | 2 +- ...global-player-list-where-appropriate.patch | 4 +- .../0881-Sync-offhand-slot-in-menus.patch | 2 +- .../0882-Player-Entity-Tracking-Events.patch | 2 +- ...and-additions-to-the-SpawnReason-API.patch | 6 +- ...-for-some-hot-BlockBehavior-and-Flui.patch | 2 +- .../0891-Improve-logging-and-errors.patch | 2 +- ...event-sleeping-villagers-moving-towa.patch | 2 +- .../0908-Add-EntityFertilizeEggEvent.patch | 2 +- ...0913-Fix-text-display-error-on-spawn.patch | 2 +- patches/server/0918-Optimize-Hoppers.patch | 2 +- ...expired-keys-from-impacting-new-join.patch | 2 +- ...-Lazy-Initialization-for-Enum-Fields.patch | 2 +- ...access-to-lookups-field-in-RegistryO.patch | 2 +- ...ll-BlockGrowEvent-for-missing-blocks.patch | 4 +- ...crafting-result-amount-for-fireworks.patch | 2 +- ...-Add-option-to-disable-block-updates.patch | 4 +- ...nd-water-fluid-explosion-resistance-.patch | 2 +- patches/server/0965-Don-t-tick-signs.patch | 4 +- .../server/0967-Add-whitelist-events.patch | 2 +- ...ata-neighbour-ticks-outside-of-range.patch | 2 +- ...ng-PreCreatureSpawnEvent-with-per-pl.patch | 2 +- ...ntity-tracking-range-by-Y-coordinate.patch | 2 +- .../0988-Add-Listing-API-for-Player.patch | 2 +- ...5-Improve-performance-of-mass-crafts.patch | 2 +- ...002-Configure-sniffer-egg-hatch-time.patch | 2 +- ...Skip-POI-finding-if-stuck-in-vehicle.patch | 2 +- 190 files changed, 396 insertions(+), 455 deletions(-) diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch index 10389b749c..803207ad07 100644 --- a/patches/server/0002-Remap-fixes.patch +++ b/patches/server/0002-Remap-fixes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remap fixes diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index 4a67eb11f1f6e07db449018418fd8a2ffee579f5..29bceddeddb8e4b3f699506b9e9aa8fd5d79eec1 100644 +index ad3035da44c6af2fa7cc53926f33526a43740313..e89fa618fa20e3e843d8de81629e6dc551777823 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java @@ -278,9 +278,11 @@ public class BlockPos extends Vec3i { diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch index 95b0c656f5..b2cf06f23e 100644 --- a/patches/server/0003-Build-system-changes.patch +++ b/patches/server/0003-Build-system-changes.patch @@ -99,7 +99,7 @@ index 91a5d6e9775010336da28ed6e2f6654b0f7248f6..32d475a636d4ba90eeaecfac148143f9 + jvmArgs("-DPaper.isRunDev=true") } diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java -index 924e0552c4b60c6fbfe1aa659e201e5349d91e09..0185ea054848f9b400533e97ac0b9a49b81db980 100644 +index 68e3d54c79924d72b22eb3bc142ff47aa1700895..d3300e43523429fdd0e61c5aa9aed2e6bc78e07e 100644 --- a/src/main/java/net/minecraft/resources/ResourceLocation.java +++ b/src/main/java/net/minecraft/resources/ResourceLocation.java @@ -26,6 +26,7 @@ public class ResourceLocation implements Comparable { @@ -133,7 +133,7 @@ index 84dab998d5b91b9c5690e9e086b17a60b6dec058..2ac60ea28ce722cdef61cfdc69bbbdf3 Path path = (Path) optionset.valueOf("pidFile"); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java -index 61228abc3b0628732a4b9dbdf9827adb7a2fd8d8..1522706703392d74a92c964ded7206f7c469c20c 100644 +index 7db49f077704f03d1815f8382523199bd6c9a0dc..4ed8f38ba9c7b075b99a0da0e213a1e9d03ac717 100644 --- a/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java +++ b/src/main/java/net/minecraft/server/packs/repository/ServerPacksSource.java @@ -32,7 +32,7 @@ public class ServerPacksSource extends BuiltInPackSource { diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch index 86c2ddbed2..76904c3a8f 100644 --- a/patches/server/0005-Paper-config-files.patch +++ b/patches/server/0005-Paper-config-files.patch @@ -4611,7 +4611,7 @@ index bc4f2e0a7086825ba8d1a503a65a4375d6c90d72..1561b26e1b4115f4d5631f20b31c2238 private void readScoreboard(DimensionDataStorage persistentStateManager) { diff --git a/src/main/java/net/minecraft/server/Services.java b/src/main/java/net/minecraft/server/Services.java -index f9dfaf87a2ad9fd4807811ca9bd7a84069f03419..fd7a8e7286d5b3fa90f016c41c223f51d8307587 100644 +index 71e7beac6cf1e0f813d5ff3e9c51c13491be7139..f1cc27809c1e8612f7c4fa912f5e39c07b09d808 100644 --- a/src/main/java/net/minecraft/server/Services.java +++ b/src/main/java/net/minecraft/server/Services.java @@ -10,14 +10,30 @@ import javax.annotation.Nullable; diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch index dcf63db8dc..b8b1b2a161 100644 --- a/patches/server/0006-MC-Dev-fixes.patch +++ b/patches/server/0006-MC-Dev-fixes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] MC Dev fixes diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index 05aee4fbc835cbd665084c6102542f6e3f23802f..c2b1430ba41ec0e54ad08214c57ed97c21cdb3b9 100644 +index 46c230cea78334d3a804f51c3aa152d0fa56ebfb..092bfedfb32c38550d1cab1b696feac6df09131f 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java @@ -359,7 +359,7 @@ public class Util { @@ -18,7 +18,7 @@ index 05aee4fbc835cbd665084c6102542f6e3f23802f..c2b1430ba41ec0e54ad08214c57ed97c public static CompletableFuture> sequence(List> futures) { diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index 29bceddeddb8e4b3f699506b9e9aa8fd5d79eec1..bc7b8e41dedeb6ba76f4d9d6240ecd218f376bd8 100644 +index e89fa618fa20e3e843d8de81629e6dc551777823..2bb5e51f71cbf66819d198505aa4a5ecffd246c6 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java @@ -383,12 +383,12 @@ public class BlockPos extends Vec3i { @@ -40,7 +40,7 @@ index 29bceddeddb8e4b3f699506b9e9aa8fd5d79eec1..bc7b8e41dedeb6ba76f4d9d6240ecd21 } }; diff --git a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java -index 2e0eef11d45befbbadb5c4dd29944c0695ffb1e0..cfe7cdce3b1de8d0f3f93601ef04f56bb9011693 100644 +index 1dfcb02b4f576e7f259a3726e0d2a48b7a76c569..bdd3b48e5de2afd6b7655ba6ff742a60ee9540c5 100644 --- a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java +++ b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java @@ -318,7 +318,7 @@ public class BuiltInRegistries { @@ -53,7 +53,7 @@ index 2e0eef11d45befbbadb5c4dd29944c0695ffb1e0..cfe7cdce3b1de8d0f3f93601ef04f56b } diff --git a/src/main/java/net/minecraft/network/chat/ComponentUtils.java b/src/main/java/net/minecraft/network/chat/ComponentUtils.java -index 1da68536a7ea57435194a2cdc3b60df919323259..04523043b085541f55dbe6326bb82ac898785378 100644 +index 13c8051da164bed579fbda44af059a36b8f00a0e..b6506e881ef337bfd2a7a0644296b48b7300a0f6 100644 --- a/src/main/java/net/minecraft/network/chat/ComponentUtils.java +++ b/src/main/java/net/minecraft/network/chat/ComponentUtils.java @@ -129,9 +129,8 @@ public class ComponentUtils { @@ -68,7 +68,7 @@ index 1da68536a7ea57435194a2cdc3b60df919323259..04523043b085541f55dbe6326bb82ac8 } diff --git a/src/main/java/net/minecraft/resources/RegistryDataLoader.java b/src/main/java/net/minecraft/resources/RegistryDataLoader.java -index f3557fe7927454ca1171a8466416fb575c421fd0..fd5f555da28a2a03fb059e380f0525e0db1dd260 100644 +index 41d6569c00db3d467f6e90d33ebd261529b89f4c..5f051cb22ae77f4d8994b07ac5b963bd0ff05673 100644 --- a/src/main/java/net/minecraft/resources/RegistryDataLoader.java +++ b/src/main/java/net/minecraft/resources/RegistryDataLoader.java @@ -91,7 +91,7 @@ public class RegistryDataLoader { @@ -94,7 +94,7 @@ index 1561b26e1b4115f4d5631f20b31c2238d1d23202..124fad1031d6125bca233541e2d5f256 MultiPackResourceManager resourcemanager = new MultiPackResourceManager(PackType.SERVER_DATA, immutablelist); diff --git a/src/main/java/net/minecraft/server/level/Ticket.java b/src/main/java/net/minecraft/server/level/Ticket.java -index ec080bccb2f8d8b410d49791df69e1fb85c14872..9f69b82cc8c2180182a52cf07f2f2e9ee3e90d31 100644 +index 2f66abf62d303342f5fe614fb3e35e7844497ffc..b346fa94b23d81da7da073f71dd12e672e0f079c 100644 --- a/src/main/java/net/minecraft/server/level/Ticket.java +++ b/src/main/java/net/minecraft/server/level/Ticket.java @@ -21,7 +21,7 @@ public final class Ticket implements Comparable> { @@ -107,7 +107,7 @@ index ec080bccb2f8d8b410d49791df69e1fb85c14872..9f69b82cc8c2180182a52cf07f2f2e9e } diff --git a/src/main/java/net/minecraft/util/SortedArraySet.java b/src/main/java/net/minecraft/util/SortedArraySet.java -index b10af93106ca9494e1ce7c3b74b366ae628a225f..0e00590f1cc0b28b2c2abe9576af891e35e21e6a 100644 +index 2dc801061025888192c3bf2c4c38b928c16a0165..ca788f0dcec4a117b410fe8348969e056b138b1e 100644 --- a/src/main/java/net/minecraft/util/SortedArraySet.java +++ b/src/main/java/net/minecraft/util/SortedArraySet.java @@ -28,7 +28,7 @@ public class SortedArraySet extends AbstractSet { @@ -120,7 +120,7 @@ index b10af93106ca9494e1ce7c3b74b366ae628a225f..0e00590f1cc0b28b2c2abe9576af891e public static SortedArraySet create(Comparator comparator) { diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -index a145568e9c144a885640a0b197b6ffd5e4cd766b..58cffca0783a35eff6421c8d26d3022c785dfb0a 100644 +index ff5c0d5a7dd263869ba1eb93f2e81e8c6de42f26..869f60e9407ed1c5bee536ef91a21f4d11f8f964 100644 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java @@ -148,7 +148,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl @@ -133,7 +133,7 @@ index a145568e9c144a885640a0b197b6ffd5e4cd766b..58cffca0783a35eff6421c8d26d3022c this.level().getProfiler().pop(); this.level().getProfiler().push("camelActivityUpdate"); diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java -index b83decce3c728b04fd6c15ab445ab217e07768bb..73d2973f604ccd0403abcee6a7eacb96e9df2e29 100644 +index 92c1966d8f64ff308bb73cea3e7a9cdf9cf350d5..7d1e6427ab5f2dabe9072d092d733b0ff34e0b44 100644 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java @@ -101,7 +101,7 @@ public class Frog extends Animal implements VariantHolder { @@ -146,7 +146,7 @@ index b83decce3c728b04fd6c15ab445ab217e07768bb..73d2973f604ccd0403abcee6a7eacb96 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index 8e6aca729a145530166fa04e47f307552ea84d77..13b567cdbc05da4e23a95e4be681b060b0064ecb 100644 +index 9799f693dc08cdfc2974959fc792ba86c5c51ceb..7bcd5498c734873b74bee503992ec4806ae61df7 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -125,7 +125,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { @@ -172,7 +172,7 @@ index a81475d0cd3c5b75b4abe0d1a01389372a4d9ab1..bf16c44e2d61dccb662eceeef89a143a this.byName = Maps.newHashMap(builder.build()); // CraftBukkit RecipeManager.LOGGER.info("Loaded {} recipes", map1.size()); diff --git a/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java b/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java -index ec7c35a9d48bd20a67b5608c908c0f94742a8139..1af2e9eb1dcc8cf90afd38ea0fbe1b65396455f4 100644 +index 769614aeb4ca914abcf0f770240a3d4c916f08cd..6c9d163b9f857806461dc72e54713f1a4f3a5c31 100644 --- a/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java +++ b/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java @@ -53,8 +53,10 @@ public class CeilingHangingSignBlock extends SignBlock { @@ -189,7 +189,7 @@ index ec7c35a9d48bd20a67b5608c908c0f94742a8139..1af2e9eb1dcc8cf90afd38ea0fbe1b65 } } diff --git a/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java b/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java -index 8f210a745f2d5abeff2c4d4d9b13034b1a0f1490..3a89fd4fe175b6e209548e5c98d18ce3fcff07b9 100644 +index db48010e633165972d2eac339dd7d1fd5a2f5bd8..d818d3ea6d28aa6ffb62127d4efd585d6f2935d1 100644 --- a/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java +++ b/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java @@ -52,8 +52,10 @@ public class WallHangingSignBlock extends SignBlock { @@ -206,7 +206,7 @@ index 8f210a745f2d5abeff2c4d4d9b13034b1a0f1490..3a89fd4fe175b6e209548e5c98d18ce3 } } diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index 9dcc4bb370673fd6408db814643ac90bd0ada195..4462991ab5b3dfb00c7aa51fc6ba96669d27f827 100644 +index 9fbe8ef3fea77ecbbc8689cc6472d0d5f30b7166..b8fb6d1d85e07f5165bfaf7d80807e069b595851 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -57,7 +57,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer @@ -219,7 +219,7 @@ index 9dcc4bb370673fd6408db814643ac90bd0ada195..4462991ab5b3dfb00c7aa51fc6ba9666 }).comapFlatMap((serialized) -> { return reader.read(idList, provider, serialized); diff --git a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java -index 6d7eb392dbdc8029aea0d09c6ad92175d2b55a77..93ba2ccf3f084beb0f98a75c5022a4fb8cb88e51 100644 +index 6b91771a4bf559881a4f3e6c98500e09b33d16e0..21a2800db22f287b9c6a8290326fdf3b94ae94b1 100644 --- a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java +++ b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java @@ -19,7 +19,7 @@ public class EntityLookup { @@ -232,7 +232,7 @@ index 6d7eb392dbdc8029aea0d09c6ad92175d2b55a77..93ba2ccf3f084beb0f98a75c5022a4fb } } diff --git a/src/main/java/net/minecraft/world/level/entity/EntitySection.java b/src/main/java/net/minecraft/world/level/entity/EntitySection.java -index f540bb4914162767f2e5edb61816e30071ee6185..bbd11d8747c3014e0730358cd7aa46cf858fe783 100644 +index 69a19dbf58cde41680d086e78b9a12ffee602dbf..5dcb7f9cab097990148f5a7c4ccbe1556afdd514 100644 --- a/src/main/java/net/minecraft/world/level/entity/EntitySection.java +++ b/src/main/java/net/minecraft/world/level/entity/EntitySection.java @@ -44,7 +44,7 @@ public class EntitySection { diff --git a/patches/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch index 39e67a5c52..91e27248d7 100644 --- a/patches/server/0008-CB-fixes.patch +++ b/patches/server/0008-CB-fixes.patch @@ -30,7 +30,7 @@ index f3a41559be5ad0b40762d368d8582704c8305961..32565740c6b013d9ad644e7c62d6721b if ((this.dimension() == Level.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END)) || env == org.bukkit.World.Environment.THE_END) { // CraftBukkit - Allow to create EnderDragonBattle in default and custom END this.dragonFight = new EndDragonFight(this, this.serverLevelData.worldGenOptions().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -index 58cffca0783a35eff6421c8d26d3022c785dfb0a..6ebde4b17a535b9131bc589601bb7870ac1d1baf 100644 +index 869f60e9407ed1c5bee536ef91a21f4d11f8f964..3aa98f7c282cb4884589cb83b1546b924e66f096 100644 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java @@ -445,9 +445,9 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl @@ -46,7 +46,7 @@ index 58cffca0783a35eff6421c8d26d3022c785dfb0a..6ebde4b17a535b9131bc589601bb7870 @Override diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java -index c41d9d450e819ff7d4bab90d7d348d604ea46b24..42ac31d3eaa346766f7b8c769065f3d345dd8fa8 100644 +index 161ad6ab1443b2ce33a2d7d91d189c855db0453b..15a9736a870055d639d03063c7cf67fd769fff36 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java @@ -43,7 +43,7 @@ public class StructureCheck { diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch index 1b80e44d95..18d05c4ee8 100644 --- a/patches/server/0009-MC-Utils.patch +++ b/patches/server/0009-MC-Utils.patch @@ -5468,7 +5468,7 @@ index 0000000000000000000000000000000000000000..808d1449ac44ae86a650932365081fba + } +} diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index c2b1430ba41ec0e54ad08214c57ed97c21cdb3b9..296b433ee309044a902e018f9107b0994f9eada5 100644 +index 092bfedfb32c38550d1cab1b696feac6df09131f..9870eccc1dc5c2201f12f8e2affe647f6b0375f8 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java @@ -118,7 +118,7 @@ public class Util { @@ -5481,7 +5481,7 @@ index c2b1430ba41ec0e54ad08214c57ed97c21cdb3b9..296b433ee309044a902e018f9107b099 public static long getEpochMillis() { diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index bc7b8e41dedeb6ba76f4d9d6240ecd218f376bd8..7bd9a626c6ce9c5fb58c3d865e656bd9f8e11116 100644 +index 2bb5e51f71cbf66819d198505aa4a5ecffd246c6..1834f3efb05fd70c8c1c67733bff514829ae1154 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java @@ -562,6 +562,7 @@ public class BlockPos extends Vec3i { @@ -5501,7 +5501,7 @@ index bc7b8e41dedeb6ba76f4d9d6240ecd218f376bd8..7bd9a626c6ce9c5fb58c3d865e656bd9 @Override public BlockPos immutable() { diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java -index b25829cebb99ef4843fb35faa1b8c6d3cad5f7d0..ce6ec14a8022b253efff5d9b34d93b5fdd1df1b6 100644 +index 666df22c8f847ef7152669540a3844566ef90d78..92095b494a0c4fb89b84f0b1c0376615d28e34ce 100644 --- a/src/main/java/net/minecraft/nbt/CompoundTag.java +++ b/src/main/java/net/minecraft/nbt/CompoundTag.java @@ -160,7 +160,7 @@ public class CompoundTag implements Tag { @@ -5525,7 +5525,7 @@ index b25829cebb99ef4843fb35faa1b8c6d3cad5f7d0..ce6ec14a8022b253efff5d9b34d93b5f return NbtUtils.loadUUID(this.get(key)); } diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java -index 2c4855bbf63397226aadf7865c2cad0258c5a15e..69aa29e5e7e6f53e9c1904463ff4a58f0994b733 100644 +index 427959874b7f167184785a582163029ad4a66df2..344c5af75c4a66bb27f3f422937c6c427c15ed25 100644 --- a/src/main/java/net/minecraft/network/PacketEncoder.java +++ b/src/main/java/net/minecraft/network/PacketEncoder.java @@ -46,7 +46,7 @@ public class PacketEncoder extends MessageToByteEncoder> { @@ -5589,7 +5589,7 @@ index 124fad1031d6125bca233541e2d5f256da70ca44..2a7c614df7b9c9405a5dd23e6a888ede } catch (Throwable throwable) { // Spigot Start diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index dcbbbf1d59a60abfc731d9e422c9569e8460d985..5250bf5029825524c239854db7999883459f1a8a 100644 +index 1641bdf8725df778ba91bf5cd22c1ebbb3745058..facfdbb87e89f4db33ce13233c2ba4366d35c15b 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -50,9 +50,9 @@ public class ChunkHolder { @@ -5832,7 +5832,7 @@ index dcbbbf1d59a60abfc731d9e422c9569e8460d985..5250bf5029825524c239854db7999883 + // Paper end } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 6dc7999e0cc08efdbffafd80437f31ed590189a9..45a9977abb9abe78dafed455abaa022dfadb1153 100644 +index e9cf8686b59c232816b2fde92fc6616f77979a64..90dce7ed0d3d3dee3bae6657ac3cbeb54dd199ce 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -167,6 +167,56 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -6622,7 +6622,7 @@ index 0fcac9b089e030b387d1b4c79c26e69ed9dcf4ed..10b263b2693a6b507c858b6550b5b98a GameProfileCache usercache = this.server.getProfileCache(); String s; diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java -index 5c14223b231e748b44e0fcee36145f50384d88d0..ffb691898d1c9c108be520dc8968214eacb425d5 100644 +index 337e0a7b3c14e1b1a28744920e0dc0a69e0c5a87..f5829ae484d93b547a5437b85a9621346384a11b 100644 --- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java +++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java @@ -78,6 +78,13 @@ public abstract class BlockableEventLoop implements Profiler @@ -6693,7 +6693,7 @@ index 21fa43e0c3fabf74919f7e41d074ab1f7c061967..5e9cf929674888b3a143a0691dc6936b return this.getWalkTargetValue(pos, this.level()); } diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java -index aee69ad9f2545f9c267ed147800742f05e09aafc..78a170c4f2f52a6cff36b3602c9f86b3b4d95e72 100644 +index a0b5895abc88d297045e05f25bb09527991d43f0..6e0bd0eab0b06a4ac3042496bbb91292544e9f3c 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Monster.java +++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java @@ -27,6 +27,7 @@ import net.minecraft.world.level.ServerLevelAccessor; @@ -6771,7 +6771,7 @@ index 1c71d2c1b16bdba1e14a8230787e4cb4ad530163..d6d8bbc98fc71997cb52521d59ebb59d FluidState getFluidState(BlockPos pos); diff --git a/src/main/java/net/minecraft/world/level/ChunkPos.java b/src/main/java/net/minecraft/world/level/ChunkPos.java -index eac73ec6bef18e266474d1587f738f1938ecc67c..fa06445d9cf6da63cfd11042f82bada77f153b38 100644 +index 43bb3f5a617f4a6d719b02023a71edcb12aa9d05..34457c8afb4575d2395148f0a2bde6a96ec5e797 100644 --- a/src/main/java/net/minecraft/world/level/ChunkPos.java +++ b/src/main/java/net/minecraft/world/level/ChunkPos.java @@ -20,6 +20,7 @@ public class ChunkPos { @@ -6816,7 +6816,7 @@ index eac73ec6bef18e266474d1587f738f1938ecc67c..fa06445d9cf6da63cfd11042f82bada7 } diff --git a/src/main/java/net/minecraft/world/level/EmptyBlockGetter.java b/src/main/java/net/minecraft/world/level/EmptyBlockGetter.java -index a1a94c0a51d793e47c2c6575ccbd61a0fe7ea9cc..546b218e835467416c6675105809e662650e15d0 100644 +index 3c707d6674b2594b09503b959a31c1f4ad3981e6..db61b6b0158a9bcc0e1d735e34fe3671f8c89e21 100644 --- a/src/main/java/net/minecraft/world/level/EmptyBlockGetter.java +++ b/src/main/java/net/minecraft/world/level/EmptyBlockGetter.java @@ -17,6 +17,18 @@ public enum EmptyBlockGetter implements BlockGetter { @@ -6926,7 +6926,7 @@ index bacd4d875642cd93c3185f788745dd73a3cfde8a..003e2064f64115d1f5c48ac97e16100d return chunk.getBlockState(pos); } diff --git a/src/main/java/net/minecraft/world/level/LevelReader.java b/src/main/java/net/minecraft/world/level/LevelReader.java -index d0591bfe1a4a487d57fbe9202e2bd6fb1b803080..276b5ff0c70d2a47a7be2ff82288dc8dc5f3b47a 100644 +index e6aabec35f4e27623d1fbbfb285cc78531137014..cc0d20e9f851268fe8403ac516f426ec1d008150 100644 --- a/src/main/java/net/minecraft/world/level/LevelReader.java +++ b/src/main/java/net/minecraft/world/level/LevelReader.java @@ -26,6 +26,9 @@ public interface LevelReader extends BlockAndTintGetter, CollisionGetter, Signal @@ -6940,7 +6940,7 @@ index d0591bfe1a4a487d57fbe9202e2bd6fb1b803080..276b5ff0c70d2a47a7be2ff82288dc8d @Deprecated boolean hasChunk(int chunkX, int chunkZ); diff --git a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java -index 4756e9d283b9eeeffd2189b777237223b2bc3477..a798db400670f49f5acfd287501fea9a065f6359 100644 +index 249b3ed33672a9a9529bd14de978722b62019314..0f1025495237aebe30132ace0832aa5718d6f9bb 100644 --- a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java +++ b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java @@ -9,6 +9,7 @@ import net.minecraft.core.Holder; @@ -7261,7 +7261,7 @@ index 4185b7528ac757a2d6ebca4da4d46e65b7a981d0..b32e1bba27c91e81b7382072c4d8230d @Override diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java -index d2198dd0e47311c59ad5d955d369230837b519be..28910f4db8831fc8bc154f57b6685cf4fd039f40 100644 +index 51a0ddcee9a9cb1040fda643a6442d2e2e15b8a0..38ec21faaa16df5485a81a581506700a5ab0a440 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java @@ -72,6 +72,18 @@ public class ProtoChunk extends ChunkAccess { diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch index a87b1ae746..d0a6d84e51 100644 --- a/patches/server/0010-Adventure.patch +++ b/patches/server/0010-Adventure.patch @@ -1624,7 +1624,7 @@ index 0000000000000000000000000000000000000000..c0701d4f93a4d77a8177d2dd8d5076f9 + } +} diff --git a/src/main/java/net/minecraft/ChatFormatting.java b/src/main/java/net/minecraft/ChatFormatting.java -index a4f035ca81d2c46a6bf637e68ef37c74fef5f3d0..0f9943a35db2ad917ef3b585a3971630fcafd29f 100644 +index 98f2def9125d6faf5859572a004fa8d2fa066417..436f381c727cda72c04859c540dce4715b445390 100644 --- a/src/main/java/net/minecraft/ChatFormatting.java +++ b/src/main/java/net/minecraft/ChatFormatting.java @@ -113,6 +113,18 @@ public enum ChatFormatting implements StringRepresentable { @@ -1659,7 +1659,7 @@ index 099d76e9b508167c1592215ea799187af6ebc594..2ee328f204acf97b23702b4dc3b13b7f public CommandSourceStack(CommandSource output, Vec3 pos, Vec2 rot, ServerLevel world, int level, String name, Component displayName, MinecraftServer server, @Nullable Entity entity) { this(output, pos, rot, world, level, name, displayName, server, entity, false, (commandcontext, flag, j) -> { diff --git a/src/main/java/net/minecraft/commands/arguments/MessageArgument.java b/src/main/java/net/minecraft/commands/arguments/MessageArgument.java -index 1a964a136f79463443e5ac419d3c517863ae3df8..3e731df012f93dd57fea66576f98e9b90fce776d 100644 +index d02410383650267d9f022df7accae06b43f6d9b6..517a0c0029b0f0e1ec9d112d40c3d1ae48ab43a6 100644 --- a/src/main/java/net/minecraft/commands/arguments/MessageArgument.java +++ b/src/main/java/net/minecraft/commands/arguments/MessageArgument.java @@ -51,10 +51,10 @@ public class MessageArgument implements SignedArgument @@ -1734,7 +1734,7 @@ index db98858806a3b6fd3c16ff2226447d0d5960b6b6..7720470396d3ade926c4c75c5fab5a3f public > T readEnum(Class enumClass) { diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java -index 69aa29e5e7e6f53e9c1904463ff4a58f0994b733..d506995a54a22efb923c9f3f4c4e065b8d2804f8 100644 +index 344c5af75c4a66bb27f3f422937c6c427c15ed25..3d359f80f52bff6f19fcb484f491a874f9dcff27 100644 --- a/src/main/java/net/minecraft/network/PacketEncoder.java +++ b/src/main/java/net/minecraft/network/PacketEncoder.java @@ -35,6 +35,7 @@ public class PacketEncoder extends MessageToByteEncoder> { @@ -1746,7 +1746,7 @@ index 69aa29e5e7e6f53e9c1904463ff4a58f0994b733..d506995a54a22efb923c9f3f4c4e065b try { int j = friendlyByteBuf.writerIndex(); diff --git a/src/main/java/net/minecraft/network/chat/ChatDecorator.java b/src/main/java/net/minecraft/network/chat/ChatDecorator.java -index c87e1b66fbeaa1cf4721fe0b73ec4f22a97cb2e6..2c738e05036740e7c8eb81dad5d115f784219bc0 100644 +index 887b9fd625aa23c4ec828a175d63695f915232d3..8152420b9c3eb1bf13c012dd43505d9913fb9c4d 100644 --- a/src/main/java/net/minecraft/network/chat/ChatDecorator.java +++ b/src/main/java/net/minecraft/network/chat/ChatDecorator.java @@ -2,12 +2,72 @@ package net.minecraft.network.chat; @@ -1853,7 +1853,7 @@ index 1f1c75d8d155989e0f9f7ee63d217a60af20c3d4..b540ce21c65ad52ad7e94d2ca2b3926c if (!ichatbasecomponent.getStyle().isEmpty()) { diff --git a/src/main/java/net/minecraft/network/chat/ComponentUtils.java b/src/main/java/net/minecraft/network/chat/ComponentUtils.java -index 04523043b085541f55dbe6326bb82ac898785378..8e0c498863d9751cd276224ad2a431ee55f1c3eb 100644 +index b6506e881ef337bfd2a7a0644296b48b7300a0f6..7daca712816a79cc4a30b084afbd3d07b5d3755f 100644 --- a/src/main/java/net/minecraft/network/chat/ComponentUtils.java +++ b/src/main/java/net/minecraft/network/chat/ComponentUtils.java @@ -41,6 +41,11 @@ public class ComponentUtils { @@ -1869,7 +1869,7 @@ index 04523043b085541f55dbe6326bb82ac898785378..8e0c498863d9751cd276224ad2a431ee for(Component component : text.getSiblings()) { diff --git a/src/main/java/net/minecraft/network/chat/MessageSignature.java b/src/main/java/net/minecraft/network/chat/MessageSignature.java -index 820bf274d20c1116db194d95caacc927b6f15144..fde1675195c82a81f5801630deb0563d14409059 100644 +index df9997873c4bbec184379ec14dca1bf4566eb89d..e2812cdce3b1170b7b7d0f52209e8b4fd2b64c61 100644 --- a/src/main/java/net/minecraft/network/chat/MessageSignature.java +++ b/src/main/java/net/minecraft/network/chat/MessageSignature.java @@ -13,11 +13,12 @@ import net.minecraft.util.SignatureUpdater; @@ -1887,7 +1887,7 @@ index 820bf274d20c1116db194d95caacc927b6f15144..fde1675195c82a81f5801630deb0563d public static MessageSignature read(FriendlyByteBuf buf) { diff --git a/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java b/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java -index 70560b2b6044d86347459cbf7cf7568fbe436ba9..6d7ea7818fa0cac65c85a5fc1fdbf7165b17ce35 100644 +index f8773f2982e6cd40661d138a7c32f219cda9225c..74cf1c043beef03cfd5adf481414a5ee78bef2a6 100644 --- a/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java +++ b/src/main/java/net/minecraft/network/chat/OutgoingChatMessage.java @@ -7,6 +7,12 @@ public interface OutgoingChatMessage { @@ -1932,7 +1932,7 @@ index 70560b2b6044d86347459cbf7cf7568fbe436ba9..6d7ea7818fa0cac65c85a5fc1fdbf716 sender.connection.sendPlayerChatMessage(playerChatMessage, params); } diff --git a/src/main/java/net/minecraft/network/chat/PlayerChatMessage.java b/src/main/java/net/minecraft/network/chat/PlayerChatMessage.java -index 29bdbada8b1b649cd695af63d2d6a3c7d28dd6fc..68fc3b3aca2f94d3ee276dc748bc575142d1a42d 100644 +index b3a44ed8f365daf1031d46d879c84d2ea15cd951..ed92592e4d9e3d88b7300ea7a315541bfb430231 100644 --- a/src/main/java/net/minecraft/network/chat/PlayerChatMessage.java +++ b/src/main/java/net/minecraft/network/chat/PlayerChatMessage.java @@ -15,7 +15,53 @@ import net.minecraft.util.ExtraCodecs; @@ -2000,7 +2000,7 @@ index 29bdbada8b1b649cd695af63d2d6a3c7d28dd6fc..68fc3b3aca2f94d3ee276dc748bc5751 } diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetActionBarTextPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetActionBarTextPacket.java -index 1db8e1bc24fa819658fa0eecfda0c1d79c06c69c..b5c2cd8bda1bb8603364907e7d7d27b9bf9784c7 100644 +index 02183c810f9968621b9b20c1f7b54258b620c507..32ef3edebe94a2014168b7e438752a80b2687e5f 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetActionBarTextPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetActionBarTextPacket.java @@ -6,6 +6,7 @@ import net.minecraft.network.protocol.Packet; @@ -2024,7 +2024,7 @@ index 1db8e1bc24fa819658fa0eecfda0c1d79c06c69c..b5c2cd8bda1bb8603364907e7d7d27b9 } diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java -index 21a8c6d564da479750e54d6483cac561912635d8..a5b5a0db28cb6443e7ccc3e1f62640cf88324a7a 100644 +index bea682c52a95863c474b8283bd4ae795e525a94f..c44a276d201fdfa5144d45d319d7761583c60639 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java @@ -6,6 +6,7 @@ import net.minecraft.network.protocol.Packet; @@ -2048,7 +2048,7 @@ index 21a8c6d564da479750e54d6483cac561912635d8..a5b5a0db28cb6443e7ccc3e1f62640cf } diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java -index 06a66b470543a561b89b7df5afc8881d155e9f97..a2f6a73f5c63404dabd3abe890d1594fc63e477a 100644 +index 1fb62779527a228f748b49a4d2ddfc57ccb80cf8..bd808eb312ade7122973a47f4b96505829511da5 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java @@ -6,6 +6,7 @@ import net.minecraft.network.protocol.Packet; @@ -2123,7 +2123,7 @@ index fd5cdc33c4cc8f24265b450621a13d3ab03644c2..55e21c7b13826f60e3c656f76e1507e0 } diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundTabListPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundTabListPacket.java -index bced6705b77b710a5d30fc9316017cb9e1856a37..420f5d6d88401c9af39624fc1592b7736f5a8999 100644 +index 762a9392ffac3042356709dddd15bb3516048bed..3544e2dc2522e9d6305d727d56e73490015662c2 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundTabListPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundTabListPacket.java @@ -7,6 +7,10 @@ import net.minecraft.network.protocol.Packet; @@ -2708,7 +2708,7 @@ index 10b263b2693a6b507c858b6550b5b98a53cea575..3b646b86f2b01306618fd2a319307cad } diff --git a/src/main/java/net/minecraft/world/BossEvent.java b/src/main/java/net/minecraft/world/BossEvent.java -index 7fca2d78966abd749964d4be4686cdff7f59a024..7d9079a3c7674ca12a0be3a5abbdcd612dcdd385 100644 +index 4c62df5a3781ec9df4a5c5f1b528649e6e8a62d1..affd1b8c7589ba59330dc0b6fc803cce4ee57397 100644 --- a/src/main/java/net/minecraft/world/BossEvent.java +++ b/src/main/java/net/minecraft/world/BossEvent.java @@ -13,6 +13,7 @@ public abstract class BossEvent { diff --git a/patches/server/0013-Paper-Plugins.patch b/patches/server/0013-Paper-Plugins.patch index 8652ac749c..3faa3b746d 100644 --- a/patches/server/0013-Paper-Plugins.patch +++ b/patches/server/0013-Paper-Plugins.patch @@ -6947,7 +6947,7 @@ index f7114d5b8f2f93f62883e24da29afaf9f74ee1a6..8bf0630c0e06950cd99b7ae9898137f7 return foundFrame.orElse(null); diff --git a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java -index cfe7cdce3b1de8d0f3f93601ef04f56bb9011693..d8ea4e2ac72a9928355b1fc91ebb267b86c78100 100644 +index bdd3b48e5de2afd6b7655ba6ff742a60ee9540c5..98ef159b7091e53298838ae3723909be6d38b4ba 100644 --- a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java +++ b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java @@ -323,7 +323,13 @@ public class BuiltInRegistries { diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch index 9a070555ae..f5e7b34eb2 100644 --- a/patches/server/0014-Timings-v2.patch +++ b/patches/server/0014-Timings-v2.patch @@ -698,7 +698,7 @@ index 0000000000000000000000000000000000000000..2f0d9b953802dee821cfde82d22b0567 + } +} diff --git a/src/main/java/net/minecraft/commands/CommandFunction.java b/src/main/java/net/minecraft/commands/CommandFunction.java -index be762fd252ebeb788614c5fbc8b40c69a4295a52..1da65f2c66447372120651a85ddd9bfc25939f1c 100644 +index 0e460de37ac2ae8accbd0d3da73faac6cd7df8e0..956cddf5d975b91619316b9b6779cf51575cfc0a 100644 --- a/src/main/java/net/minecraft/commands/CommandFunction.java +++ b/src/main/java/net/minecraft/commands/CommandFunction.java @@ -32,6 +32,15 @@ import net.minecraft.server.ServerFunctionManager; @@ -1010,7 +1010,7 @@ index ff3f00cf1d5180f83b16acac5676aa22cd967c8a..5aa21689e308842fe5b64689265ba45a // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 45a9977abb9abe78dafed455abaa022dfadb1153..9932faa95dcc4f104718dbc57d36180c2bbbcb93 100644 +index 90dce7ed0d3d3dee3bae6657ac3cbeb54dd199ce..449bd9f505fdfb9eab46ff9309d7665bced1e5f8 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1,8 +1,10 @@ diff --git a/patches/server/0015-Rewrite-dataconverter-system.patch b/patches/server/0015-Rewrite-dataconverter-system.patch index 7f28af1f91..9a8a5f5444 100644 --- a/patches/server/0015-Rewrite-dataconverter-system.patch +++ b/patches/server/0015-Rewrite-dataconverter-system.patch @@ -24467,7 +24467,7 @@ index 0000000000000000000000000000000000000000..5a6536377c9c1e1753e930ff2a6bb98e + } +} diff --git a/src/main/java/net/minecraft/data/structures/StructureUpdater.java b/src/main/java/net/minecraft/data/structures/StructureUpdater.java -index 7858f40f708f790533bff9f37d05c7c5829b342a..8382be6584c74d0f221d69da63599acdc1768708 100644 +index d45b0b75509802c396fd4415d9f0adf5707f7515..26f901e34e7d8b1c52788c9dbe8859920bd4d498 100644 --- a/src/main/java/net/minecraft/data/structures/StructureUpdater.java +++ b/src/main/java/net/minecraft/data/structures/StructureUpdater.java @@ -25,7 +25,7 @@ public class StructureUpdater implements SnbtToNbt.Filter { @@ -24511,7 +24511,7 @@ index 25623dcd44edc475c5dce2756bf99fc18e142b63..6c0f87535ffa95cf82ab4b03bb7bf8f2 NbtUtils.addCurrentDataVersion(nbttagcompound); } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java -index c6f050376e3243aae2d33f53c5748aea989021ad..00f5951f3fb78d077dd828c3d8390c4a40d387c5 100644 +index d80580574a9e5d1c850270d93807f3a66a9c76f8..98b3909b536f11eda9c481ffd74066ad0cdb0ebc 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/EntityStorage.java @@ -115,7 +115,7 @@ public class EntityStorage implements EntityPersistentStorage { @@ -24524,7 +24524,7 @@ index c6f050376e3243aae2d33f53c5748aea989021ad..00f5951f3fb78d077dd828c3d8390c4a @Override diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java -index b43e2cab540fa1c6d4d12baf618717f05f4df37d..ab829edd451fed983f88b5571b32a1c443d74350 100644 +index 28e0f782c24afb3d8d2296bd0d3493a32ef66961..56f0e217276b01aed2f20a71f6849826285fc15b 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java @@ -142,7 +142,14 @@ public class SectionStorage implements AutoCloseable { @@ -24544,7 +24544,7 @@ index b43e2cab540fa1c6d4d12baf618717f05f4df37d..ab829edd451fed983f88b5571b32a1c4 for(int l = this.levelHeightAccessor.getMinSection(); l < this.levelHeightAccessor.getMaxSection(); ++l) { diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java -index 42ac31d3eaa346766f7b8c769065f3d345dd8fa8..e5f28e8bf148693714d2d538b4979badc5e9a6fa 100644 +index 15a9736a870055d639d03063c7cf67fd769fff36..1ca00340aaa201dd34e5c350d23ef53e126a0ca6 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/StructureCheck.java @@ -115,7 +115,7 @@ public class StructureCheck { @@ -24557,7 +24557,7 @@ index 42ac31d3eaa346766f7b8c769065f3d345dd8fa8..e5f28e8bf148693714d2d538b4979bad LOGGER.warn("Failed to partially datafix chunk {}", pos, var12); return StructureCheckResult.CHUNK_LOAD_NEEDED; diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java -index fa38ddbc9cb41a94d904b23f68fdb315b086eca4..97faa8f40a4c8d2b62073d18fea2804cab06bce2 100644 +index cd4bdde9f67231ed767ea0c5728d0e75001ba917..a014666a6d7ca8306316af56e7fb35778b668ce6 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager.java @@ -235,7 +235,7 @@ public class StructureTemplateManager { diff --git a/patches/server/0016-Starlight.patch b/patches/server/0016-Starlight.patch index 0e79c14c96..a955f07d77 100644 --- a/patches/server/0016-Starlight.patch +++ b/patches/server/0016-Starlight.patch @@ -4480,7 +4480,7 @@ index 0000000000000000000000000000000000000000..463c6d8d5b114816ed90655582859458 + } +} diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java -index 5250bf5029825524c239854db7999883459f1a8a..c5cd2c2c28795593712b0de2bbaa7e3860f1131a 100644 +index facfdbb87e89f4db33ce13233c2ba4366d35c15b..807a6bb1026dac2c4cd0a50afe06fd62ce23558b 100644 --- a/src/main/java/net/minecraft/server/level/ChunkHolder.java +++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java @@ -53,7 +53,7 @@ public class ChunkHolder { @@ -4493,7 +4493,7 @@ index 5250bf5029825524c239854db7999883459f1a8a..c5cd2c2c28795593712b0de2bbaa7e38 private final DebugBuffer chunkToSaveHistory; public int oldTicketLevel; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 9932faa95dcc4f104718dbc57d36180c2bbbcb93..4c0eb0dbb5caff7944e7bdde803a9eb66d7631be 100644 +index 449bd9f505fdfb9eab46ff9309d7665bced1e5f8..8c84461a5711cb408b0ead397417c31cb2f4d336 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -124,7 +124,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -4519,7 +4519,7 @@ index d8b83c8c89143d78620f812c491a1950e3218eb1..f3c9a3dbb6f0e6f825b7477c89ed72ed while (objectiterator.hasNext()) { diff --git a/src/main/java/net/minecraft/server/level/ThreadedLevelLightEngine.java b/src/main/java/net/minecraft/server/level/ThreadedLevelLightEngine.java -index f5532a0712a4229fbe121ea5c931ccdcfdfc07ea..8aa383aad9deb12ffe0a82a4571538f30cb44648 100644 +index 785ca2c63fe47936ac4c0223dffd8971a295a37c..97662f8c8c125cb964d46b9095509a0da9796dba 100644 --- a/src/main/java/net/minecraft/server/level/ThreadedLevelLightEngine.java +++ b/src/main/java/net/minecraft/server/level/ThreadedLevelLightEngine.java @@ -23,6 +23,17 @@ import net.minecraft.world.level.chunk.LightChunkGetter; @@ -4964,7 +4964,7 @@ index d5b1fd0ff3f64675f90dd9f7f328a106e0992d51..846ae3fd184a1d63b743aa25e0456045 return (ChunkStatus) BuiltInRegistries.CHUNK_STATUS.get(ResourceLocation.tryParse(id)); } diff --git a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java -index d9233eacbe6ff32aca21f9a15bb303f9c9f03a79..17395c4ca817ee3443e4515ca6e519ba0f3f44b0 100644 +index ca0991b07def35b4697ba6d5569bf9a080e48a1c..f49cc61840c6588fca301b4c5c3aaeede03a323e 100644 --- a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java @@ -21,6 +21,40 @@ public class EmptyLevelChunk extends LevelChunk { @@ -5009,7 +5009,7 @@ index d9233eacbe6ff32aca21f9a15bb303f9c9f03a79..17395c4ca817ee3443e4515ca6e519ba public BlockState getBlockState(BlockPos pos) { return Blocks.VOID_AIR.defaultBlockState(); diff --git a/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java -index 5ce87790eb0da9c3643bdb8e2ed8b5542470d319..3c126ff38227ead399a9590f7731ff9b46990bd0 100644 +index 6bb508105641b5729572736c5c3f9bd6711e309a..60e760b42dd6471a229dfd45490dcf8c51979d35 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java @@ -39,6 +39,48 @@ public class ImposterProtoChunk extends ProtoChunk { @@ -5090,7 +5090,7 @@ index 1e434faaf56f7d1501367c4371131a8da30c0421..bcdaa86cfd31c2ce4aadad900c348aee while (iterator.hasNext()) { diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index 4462991ab5b3dfb00c7aa51fc6ba96669d27f827..4ba793b448691b455859b8c34d2fc5b05955c8d7 100644 +index b8fb6d1d85e07f5165bfaf7d80807e069b595851..1219200cd915d6239a32a2bd09d325cd8fa9b346 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -143,7 +143,7 @@ public class PalettedContainer implements PaletteResize, PalettedContainer @@ -5103,7 +5103,7 @@ index 4462991ab5b3dfb00c7aa51fc6ba96669d27f827..4ba793b448691b455859b8c34d2fc5b0 return data.palette.valueFor(data.storage.get(index)); } diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java -index 28910f4db8831fc8bc154f57b6685cf4fd039f40..c8ae8c26b34671f54e40b349f4b0741bd40035f8 100644 +index 38ec21faaa16df5485a81a581506700a5ab0a440..b2c0c7fd06fcd720b4c0875f08a90b6b672c96b2 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java @@ -53,6 +53,12 @@ public class ProtoChunk extends ChunkAccess { diff --git a/patches/server/0022-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/server/0022-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch index 9ae9403dc5..56888d4688 100644 --- a/patches/server/0022-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch +++ b/patches/server/0022-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch @@ -36,7 +36,7 @@ index ec841a4d9a11f0d9047c202a31f944b340da33c8..ffd8b35b606452ce5d189f2761aa76eb this.sensing.tick(); this.level().getProfiler().pop(); diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java -index f2086bce2d95b5b1f422add74b3dff4fe6dbac8c..7435a45ae2787ab7c17fc853f567fc20b59b7f76 100644 +index 01950951ea06e43bedeeede489a112e577617829..7093c62be53fe99ed9880fc8ddaa07440fe4f715 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/FloatGoal.java @@ -9,6 +9,7 @@ public class FloatGoal extends Goal { diff --git a/patches/server/0029-Player-affects-spawning-API.patch b/patches/server/0029-Player-affects-spawning-API.patch index 8daf73cca6..76122bbe7e 100644 --- a/patches/server/0029-Player-affects-spawning-API.patch +++ b/patches/server/0029-Player-affects-spawning-API.patch @@ -100,7 +100,7 @@ index ad5d8db9fb44f8e47edc82f9ba62872802bfa380..124703a7c043b6c3b651fa1a81c5ba3e public void clientTick(Level world, BlockPos pos) { diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java -index 252b6dec50561bf9c910fd7b647d83bb968a9ed4..b226fcbee22c905de575393a25e9d2e30a95c7f4 100644 +index b6a3c75b84d9f768afee33aa0f226207b307c1c0..a583599e3b49d5ded871252646904a80825a01ff 100644 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java @@ -70,6 +70,11 @@ public interface EntityGetter { diff --git a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch b/patches/server/0055-Player-Tab-List-and-Title-APIs.patch index 4341be2ba0..3a003cd429 100644 --- a/patches/server/0055-Player-Tab-List-and-Title-APIs.patch +++ b/patches/server/0055-Player-Tab-List-and-Title-APIs.patch @@ -21,7 +21,7 @@ index 7720470396d3ade926c4c75c5fab5a3f435b0033..9c211b0db837b16d50aee63d0caf45e1 public FriendlyByteBuf writeComponent(Component text) { diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java -index a5b5a0db28cb6443e7ccc3e1f62640cf88324a7a..f03623cc9237640f1659b6c2806dc1f6e50528b0 100644 +index c44a276d201fdfa5144d45d319d7761583c60639..f68a1a6dc6add9496e25cb52c318e086e356e2bb 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetSubtitleTextPacket.java @@ -7,6 +7,7 @@ import net.minecraft.network.protocol.Packet; @@ -42,7 +42,7 @@ index a5b5a0db28cb6443e7ccc3e1f62640cf88324a7a..f03623cc9237640f1659b6c2806dc1f6 // Paper end buf.writeComponent(this.text); diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java -index a2f6a73f5c63404dabd3abe890d1594fc63e477a..0e9b4a69174cfe4705eae9f1cdf632d0fdd4b9e4 100644 +index bd808eb312ade7122973a47f4b96505829511da5..bf0f9cab7c66c089f35b851e799ba4a43420b437 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetTitleTextPacket.java @@ -7,6 +7,7 @@ import net.minecraft.network.protocol.Packet; diff --git a/patches/server/0063-Chunk-Save-Reattempt.patch b/patches/server/0063-Chunk-Save-Reattempt.patch index 9890a02488..cae796dce7 100644 --- a/patches/server/0063-Chunk-Save-Reattempt.patch +++ b/patches/server/0063-Chunk-Save-Reattempt.patch @@ -19,10 +19,10 @@ index 67a2f3c02aa4983b3ec2df073821190ddb36543c..9e65b56fd2d5af6be305efa08e7c569e } } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 216f527334a5ee5007633ede6abfc0abe3e0e829..8fc4eb15732536c5f8c49c7914071d3c7667f340 100644 +index 1988063a0cac0350ae3b3388b8f2a0c95b8b259f..ab3145064f0ea3d71e85f3f02cf73d13f548a425 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -@@ -132,6 +132,7 @@ public final class RegionFileStorage implements AutoCloseable { +@@ -132,6 +132,7 @@ public class RegionFileStorage implements AutoCloseable { protected void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException { RegionFile regionfile = this.getRegionFile(pos, false); // CraftBukkit @@ -30,7 +30,7 @@ index 216f527334a5ee5007633ede6abfc0abe3e0e829..8fc4eb15732536c5f8c49c7914071d3c if (nbt == null) { regionfile.clear(pos); -@@ -156,7 +157,18 @@ public final class RegionFileStorage implements AutoCloseable { +@@ -156,7 +157,18 @@ public class RegionFileStorage implements AutoCloseable { dataoutputstream.close(); } } diff --git a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch b/patches/server/0074-Use-a-Shared-Random-for-Entities.patch index c78935fc90..d53f5a439c 100644 --- a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch +++ b/patches/server/0074-Use-a-Shared-Random-for-Entities.patch @@ -99,7 +99,7 @@ index 9c17aef67d011f485129aee781aae3bd18eb6c1c..6dc250da442ae15a69c40e10af7ea71d this.fluidHeight = new Object2DoubleArrayMap(2); this.fluidOnEyes = new HashSet(); diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java -index bd0d99ac0067d111f51c4352c79ca874af213a15..34359509dab341e4dc762a09dc545d11eb735d49 100644 +index 891d8b4c8cb73d5e310970066831ab3e2af14e91..f60c4cd0543fd5d50fa7e2c1a9e8381227adb540 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java @@ -44,7 +44,7 @@ public class Squid extends WaterAnimal { diff --git a/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch index 6059753cfa..0a545c8f02 100644 --- a/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch +++ b/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch @@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward. Optimize getType and getBlockData to manually inline and optimize the calls diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java -index a0c7480d219feda71ad249601fae6f9c912fefa4..7067241e2da0dea3875c13cc9f429705a7a9b672 100644 +index 1b29c6872ebe54351f28c1f1f38b22561ba785ee..40950db0c242c65dfd4de247c86249354d12108f 100644 --- a/src/main/java/net/minecraft/core/Vec3i.java +++ b/src/main/java/net/minecraft/core/Vec3i.java @@ -31,6 +31,12 @@ public class Vec3i implements Comparable { @@ -54,7 +54,7 @@ index 2caac1a3d80e6c490aa16aa6bc1067065b665c69..525c89bc926f13af6f94fc46c897525e public abstract BlockState setBlockState(BlockPos pos, BlockState state, boolean moved); diff --git a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java -index 17395c4ca817ee3443e4515ca6e519ba0f3f44b0..78729ad89c1cad9bf3cfb7996acf3616b6483044 100644 +index f49cc61840c6588fca301b4c5c3aaeede03a323e..785fa679860413b736122f8e88a92e683cbdd99f 100644 --- a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java @@ -55,6 +55,12 @@ public class EmptyLevelChunk extends LevelChunk { @@ -71,7 +71,7 @@ index 17395c4ca817ee3443e4515ca6e519ba0f3f44b0..78729ad89c1cad9bf3cfb7996acf3616 public BlockState getBlockState(BlockPos pos) { return Blocks.VOID_AIR.defaultBlockState(); diff --git a/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java -index 3c126ff38227ead399a9590f7731ff9b46990bd0..3c1a8c3a402fe6ae6c512fab565a52841f2e4c2a 100644 +index 60e760b42dd6471a229dfd45490dcf8c51979d35..4a3ac7dedf5cb1e76f16ec4f18e82afc717d0ced 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/ImposterProtoChunk.java @@ -91,6 +91,12 @@ public class ImposterProtoChunk extends ProtoChunk { @@ -138,7 +138,7 @@ index d59392c322936ce89b759ac9787c8f4f0b228af6..2c3ea88bac229df67bd742e16d2106d8 private short tickingFluidCount; public final PalettedContainer states; diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java -index c8ae8c26b34671f54e40b349f4b0741bd40035f8..b3b9d44c90e802caf1e7fcf0f17a46add2717107 100644 +index b2c0c7fd06fcd720b4c0875f08a90b6b672c96b2..6c72eb36020bc05104b21e52cea89de09b85f2d7 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java @@ -92,14 +92,18 @@ public class ProtoChunk extends ChunkAccess { diff --git a/patches/server/0080-EntityPathfindEvent.patch b/patches/server/0080-EntityPathfindEvent.patch index bc1bb7f3f7..eccaebfdb1 100644 --- a/patches/server/0080-EntityPathfindEvent.patch +++ b/patches/server/0080-EntityPathfindEvent.patch @@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java -index 4db401884b9850775c22907b52575954001ab8cc..f236759405f706d09b0fe6d69aa2254023cb9602 100644 +index 3db41017c6690d4519564496edd8e7365b2f5a22..027eef4ace908147285c8d72b612d16e4f925672 100644 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java @@ -40,7 +40,7 @@ public class FlyingPathNavigation extends PathNavigation { @@ -19,7 +19,7 @@ index 4db401884b9850775c22907b52575954001ab8cc..f236759405f706d09b0fe6d69aa22540 @Override diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java -index abf6e53987ae8638169fbf293aee60feb5362eac..b27353c366daf1047c8c782120e3fb07a81d1f6e 100644 +index 12564909abff7da4e5a4bb3d004a7ede2ffda12d..c0550a87dbc79090ccac8568186f22a49bb3837f 100644 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java @@ -41,7 +41,7 @@ public class GroundPathNavigation extends PathNavigation { @@ -58,7 +58,7 @@ index abf6e53987ae8638169fbf293aee60feb5362eac..b27353c366daf1047c8c782120e3fb07 private int getSurfaceY() { diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java -index ccf576c86888b356c006d1292ada4d9f5603885b..3f546c4a8d3215dba85a10c72a76f79ea9e4e64f 100644 +index fa19df17967f57b5ac99b8eee9d38864c0b7a1bb..d14b329e5bccf13139c32f71da274082efc7199c 100644 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java @@ -110,7 +110,13 @@ public abstract class PathNavigation { @@ -127,7 +127,7 @@ index ccf576c86888b356c006d1292ada4d9f5603885b..3f546c4a8d3215dba85a10c72a76f79e BlockPos blockPos = useHeadPos ? this.mob.blockPosition().above() : this.mob.blockPosition(); int i = (int)(followRange + (float)range); diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java -index dbf2b92a519ecc7c64842a4a8af2c4a45e387add..3c68c627d13e56a0cb78f424e0e9b7239af4edc9 100644 +index e9b49c72aa73dfcef6c136d9ed7bb5044fe8405d..2d1b2b84d7cf5bafe2cccfa0dec2bae805dbe7cf 100644 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java @@ -16,9 +16,9 @@ public class WallClimberNavigation extends GroundPathNavigation { diff --git a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch index 7b261fca3a..5c3c1d34d2 100644 --- a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch @@ -11,10 +11,10 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap). The maximum size of the RegionFileCache is also made configurable. diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 8fc4eb15732536c5f8c49c7914071d3c7667f340..81710e2853a75a47edd0abf3f5b30f8558b5abcd 100644 +index ab3145064f0ea3d71e85f3f02cf73d13f548a425..32880df5c96e77c8db8198c91a0a3efe8968199e 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -@@ -37,7 +37,7 @@ public final class RegionFileStorage implements AutoCloseable { +@@ -37,7 +37,7 @@ public class RegionFileStorage implements AutoCloseable { if (regionfile != null) { return regionfile; } else { diff --git a/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch b/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch index 01e47834f4..5adba4580e 100644 --- a/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch +++ b/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not load chunks for Pathfinding diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java -index 36db5eb18d361b4d4153b040d0f92ecba0e8e27d..4774023da9f6185d522043127b33e6e79c887019 100644 +index b7995e6159c865f8e2e7865f7eb51936a9720311..10503d6d8b6daf645cf4360ee289d5e25144c976 100644 --- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java +++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java @@ -459,7 +459,12 @@ public class WalkNodeEvaluator extends NodeEvaluator { diff --git a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch b/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch index 72cd1930b9..532519ab03 100644 --- a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch +++ b/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch @@ -9,7 +9,7 @@ virtual entities/entities that are not actually known to the server. Co-authored-by: Nassim Jahnke diff --git a/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java b/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java -index 47130f72d8ad96565ba2357dd6cd6c32779e14c3..7b830d1fcb83cbf24e7a12e9bc5aff0d1c9d1a44 100644 +index 644a0fdea6576647539b96528717dbaeab498d93..221e64a66ff12a8de5c75992fc26a54a03b317e7 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ServerboundInteractPacket.java @@ -169,4 +169,14 @@ public class ServerboundInteractPacket implements Packet transaction = new java.util.ArrayList(); private int maxStack = MAX_STACK; diff --git a/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java b/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java -index 6ad6703066c22e345138b5b0d901198760c6330f..95314f1d845e071f58db977d3b6c1ced068d88eb 100644 +index e0fbacd574e0c83c2e1d164ded8e9ccf4af30480..7529751afa2932fd16bc4591189b0358268a7b14 100644 --- a/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/ContainerEntity.java @@ -59,10 +59,9 @@ public interface ContainerEntity extends Container, MenuProvider { @@ -654,7 +654,7 @@ index 6ad6703066c22e345138b5b0d901198760c6330f..95314f1d845e071f58db977d3b6c1ced + // Paper end } diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java -index 7491bd7d6ac352cbcc03811a2668ce6f1acbe5b2..205ea28e9b60fbfac8c7e700a596d83747c54582 100644 +index 111494c30a2b7d8464237a92cf5c98f7f4cca19d..e11618247ad889fa8fadbb2c7addd0de94caf249 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java @@ -29,6 +29,7 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc diff --git a/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index d6fddc5e21..d0c0104fe6 100644 --- a/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat diff --git a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java -index 1ad11be7652c1d26557f52fdc784c6e5db350a0c..5e83991c7f89ec3ea2d76e299536e959eff3a20a 100644 +index a6d23b23e5b5c02427ec538d1d7fd89f51e9e59c..4def212655cea0fd998b52e924f8b671d6aeb559 100644 --- a/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java +++ b/src/main/java/net/minecraft/world/scores/ScoreboardSaveData.java @@ -143,6 +143,7 @@ public class ScoreboardSaveData extends SavedData { diff --git a/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch b/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch index d265a99b2b..c2a7785d05 100644 --- a/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch +++ b/patches/server/0106-Optimise-BlockState-s-hashCode-equals.patch @@ -9,7 +9,7 @@ object identity checks safely. Use a simpler optimized hashcode diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java -index ebe22b4f5c1c3eb5920a05fd87107e617f509dc5..7c111568b0cb15be0021c704aa1d96f4d7189928 100644 +index 3084343b724098de9791bb74ffb037a499c0c430..bf7ed22094ac92a152e522bafccffb9589f84343 100644 --- a/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java +++ b/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java @@ -30,8 +30,7 @@ public class BooleanProperty extends Property { @@ -23,7 +23,7 @@ index ebe22b4f5c1c3eb5920a05fd87107e617f509dc5..7c111568b0cb15be0021c704aa1d96f4 return true; } else { diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java -index 21e16078ecca0908c4b442b5e4d5cb9183a5fca5..a39d77e3f007411aacdbea5bf9facb4d70f14fbc 100644 +index 647e295c7761b95db6da28f6fd043ec963f27872..2d69d1c17f734ee38667d51e6fd0a268211ec595 100644 --- a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java +++ b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java @@ -45,8 +45,7 @@ public class EnumProperty & StringRepresentable> extends Prope @@ -37,7 +37,7 @@ index 21e16078ecca0908c4b442b5e4d5cb9183a5fca5..a39d77e3f007411aacdbea5bf9facb4d return true; } else { diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java -index 18d7c0a678cbb6aa792815db458f0c0feb07bd92..9523762404be6443bd5d4e5d2ea07d215c40db07 100644 +index d6c1b1817ba79a652c4094f003a7d899d4939971..33268d953b30d384564eee6dfab2a37fa722e465 100644 --- a/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java +++ b/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java @@ -35,8 +35,7 @@ public class IntegerProperty extends Property { @@ -51,7 +51,7 @@ index 18d7c0a678cbb6aa792815db458f0c0feb07bd92..9523762404be6443bd5d4e5d2ea07d21 return true; } else { diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java -index 18f77e0cb6725f3343c4ab579c163037329cfac8..e6bc018d5b1fc9be4881ec9f439ff16f0ecbb8b4 100644 +index d1f2e29623b15fdb99ba082fd757a54fd4713761..66b8e23d799adaf872233ea44c54330d75135544 100644 --- a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java +++ b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java @@ -70,14 +70,7 @@ public abstract class Property> { diff --git a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch b/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch index 5bbe85cc3f..5e7b08af48 100644 --- a/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch +++ b/patches/server/0115-Prevent-Pathfinding-out-of-World-Border.patch @@ -13,7 +13,7 @@ by adding code to all overrides in: to return BLOCKED if it is outside the world border. diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java -index 3f546c4a8d3215dba85a10c72a76f79ea9e4e64f..56fc89357bec386f23660c16a7cd1dfe781e0413 100644 +index d14b329e5bccf13139c32f71da274082efc7199c..68edd488087a6ec1e65797cfbd4118bd0efbab50 100644 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java @@ -158,7 +158,7 @@ public abstract class PathNavigation { diff --git a/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch b/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch index f92d5927dc..baa42e3976 100644 --- a/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch +++ b/patches/server/0118-Configurable-Cartographer-Treasure-Maps.patch @@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's which are limited in quantity. diff --git a/src/main/java/net/minecraft/world/entity/npc/VillagerTrades.java b/src/main/java/net/minecraft/world/entity/npc/VillagerTrades.java -index 508a86007293e7ce8405ed2646a20630ebe4a98c..5cf414c7356e27c25c1c0edc27d275048760cc2c 100644 +index 43fb44b8cd164b0815335a32f04879b301a54728..8d0ff6e820af9a3f67e25298b34d1539841339d8 100644 --- a/src/main/java/net/minecraft/world/entity/npc/VillagerTrades.java +++ b/src/main/java/net/minecraft/world/entity/npc/VillagerTrades.java @@ -451,7 +451,8 @@ public class VillagerTrades { @@ -23,7 +23,7 @@ index 508a86007293e7ce8405ed2646a20630ebe4a98c..5cf414c7356e27c25c1c0edc27d27504 ItemStack itemStack = MapItem.create(serverLevel, blockPos.getX(), blockPos.getZ(), (byte)2, true, true); MapItem.renderBiomePreviewMap(serverLevel, itemStack); diff --git a/src/main/java/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java b/src/main/java/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java -index 58083066d824da1ba7746cd99adaac82d2406a3a..afeff5ebd7651111c60362be8b70a5d47fc0e55e 100644 +index a926b07cd3c5d7c6b615302671fedb51eff89faf..7c8267ad6de50daaa3390debf99a354e3e575c87 100644 --- a/src/main/java/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java +++ b/src/main/java/net/minecraft/world/level/storage/loot/functions/ExplorationMapFunction.java @@ -75,7 +75,16 @@ public class ExplorationMapFunction extends LootItemConditionalFunction { diff --git a/patches/server/0120-String-based-Action-Bar-API.patch b/patches/server/0120-String-based-Action-Bar-API.patch index 119f63b12d..4809ccb8de 100644 --- a/patches/server/0120-String-based-Action-Bar-API.patch +++ b/patches/server/0120-String-based-Action-Bar-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] String based Action Bar API diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetActionBarTextPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetActionBarTextPacket.java -index b5c2cd8bda1bb8603364907e7d7d27b9bf9784c7..5d613ccf09f6b3247886e92ef513ccb5d13cbe51 100644 +index 32ef3edebe94a2014168b7e438752a80b2687e5f..ab6c58eed6707ab7b0aa3e7549a871ad7dfad87f 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetActionBarTextPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetActionBarTextPacket.java @@ -7,6 +7,7 @@ import net.minecraft.network.protocol.Packet; diff --git a/patches/server/0122-Firework-API-s.patch b/patches/server/0122-Firework-API-s.patch index bb25faf7d9..b5fa1b6e64 100644 --- a/patches/server/0122-Firework-API-s.patch +++ b/patches/server/0122-Firework-API-s.patch @@ -56,7 +56,7 @@ index ac7371882d15746e9353865635d0bb716f890c53..ba570f1c9654e1004e068a1efe2118f3 object = CrossbowItem.getArrow(world, shooter, crossbow, projectile); if (creative || simulated != 0.0F) { diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java -index e04fc076e2e8de4343212109b361707da1aeaf30..49da9b49036d04f66afe75c3ea61f713991b62f0 100644 +index 5cafb6f0b507127665393741b372286da098d603..7c627d27300247db9122ab2081049345ef306073 100644 --- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java +++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java @@ -46,6 +46,7 @@ public class FireworkRocketItem extends Item { diff --git a/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch index ec71585b0d..edcf1062d4 100644 --- a/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch +++ b/patches/server/0138-Do-not-submit-profile-lookups-to-worldgen-threads.patch @@ -10,7 +10,7 @@ out due to a sync load, as the worldgen threads will be stalling on profile lookups. diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index 296b433ee309044a902e018f9107b0994f9eada5..5bd8fa10b39a3fb3401a8ebbf1b74b65ea74dfd2 100644 +index 9870eccc1dc5c2201f12f8e2affe647f6b0375f8..30237ca94a36197ce21369bdcc7bb1dfafe02680 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java @@ -82,6 +82,22 @@ public class Util { diff --git a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch b/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch index 09c04bc1e3..076442dce8 100644 --- a/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch +++ b/patches/server/0169-PlayerNaturallySpawnCreaturesEvent.patch @@ -9,7 +9,7 @@ from triggering monster spawns on a server. Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 4c0eb0dbb5caff7944e7bdde803a9eb66d7631be..6352e3f0a78822b4d5167a688a5230b599541159 100644 +index 8c84461a5711cb408b0ead397417c31cb2f4d336..db027a4291131b7f64c32853da4ca5fc71582251 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1193,7 +1193,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch index 3e02de747d..b9c45b572d 100644 --- a/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch +++ b/patches/server/0194-Prevent-Frosted-Ice-from-loading-holding-chunks.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks 1.17: Shouldn't be needed as blocks no longer tick without at least 1 radius chunk loaded. diff --git a/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java b/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java -index a40dd86e37c07644d563b3b7cfb0dacb13ad3a90..223b23545b86534c9c4e6e8b9bc10b1a11c2dba3 100644 +index 331b642c36af97f7f05bd63f96d42d1af443e5a3..a3af96b2518b41f370d09cfda26dc589b9ee977b 100644 --- a/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FrostedIceBlock.java @@ -38,7 +38,8 @@ public class FrostedIceBlock extends IceBlock { diff --git a/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch index f7a78e89d2..f5f2a2bcbf 100644 --- a/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch +++ b/patches/server/0204-Configurable-Alternative-LootPool-Luck-Formula.patch @@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas. I would love to see this change in Vanilla, so Mojang please pull :) diff --git a/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java b/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java -index 4ac1beb724e5fb7ec99602bc0d10da7b451f9e4b..da0f2643e263c5cb7332b56b4fe2ee9a4efc5f8a 100644 +index 7a52d03c488fb1e277228914b810e2d6e02beaef..4fbb0f7fefcb383c25c1c4df2e788d9a153ae376 100644 --- a/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java +++ b/src/main/java/net/minecraft/world/level/storage/loot/entries/LootPoolSingletonContainer.java @@ -122,9 +122,35 @@ public abstract class LootPoolSingletonContainer extends LootPoolEntryContainer diff --git a/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch index 8b2f0ed10b..b1ad26114d 100644 --- a/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch +++ b/patches/server/0209-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch @@ -96,7 +96,7 @@ index 645ee527b9e7e7edbf3320eae6e441bea84f58f9..2b5f5aed31bd235a213f57b9d65b0ea1 } diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java b/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java -index ed5a43c1f6393d7b14e96d2ba7eeeebd48c0a735..5b83bb92f18cc7d9993e3bc65c887f5c4bcc09de 100644 +index e319a46a21a94314c5d496820b1ac4879dcf56b9..4a3bcd988cf63452c4277ad55ba604ad43c8a623 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/RamTarget.java @@ -77,7 +77,7 @@ public class RamTarget extends Behavior { @@ -109,7 +109,7 @@ index ed5a43c1f6393d7b14e96d2ba7eeeebd48c0a735..5b83bb92f18cc7d9993e3bc65c887f5c world.playSound((Player)null, entity, this.getImpactSound.apply(entity), SoundSource.NEUTRAL, 1.0F, 1.0F); } else if (this.hasRammedHornBreakingBlock(world, entity)) { diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java b/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java -index 34ac09b2011dbfa218a60fecd924e566d5fef192..b3b2b111df4b490e8ef694c22f13eb7abad9151c 100644 +index 29cfd065f246bbd3d3c2a5bbd32c3f4813a02951..03ec02f9a2fb5abb5387cd0d83c9481d6cbb0bd2 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/warden/SonicBoom.java @@ -68,7 +68,7 @@ public class SonicBoom extends Behavior { @@ -148,7 +148,7 @@ index 041f1650b853138e4286fe83a08d79d276054ce7..344e933311f5cdccb66069d486b111a0 @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java -index 108729cfc38fb156be036f2a89ab36d06ebe44a2..bf9e4e5e85c2554029266308489705303e7f5938 100644 +index 81003ce3f05c6be6f52a92b86a4721235f4ce12a..004382377ee364143a34287e7b6546ae1df4e88e 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/HoglinBase.java @@ -40,7 +40,7 @@ public interface HoglinBase { diff --git a/patches/server/0220-EnderDragon-Events.patch b/patches/server/0220-EnderDragon-Events.patch index a56f976157..0559cac19b 100644 --- a/patches/server/0220-EnderDragon-Events.patch +++ b/patches/server/0220-EnderDragon-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] EnderDragon Events diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java -index 5d6662740e126520e2d9f54585943ede77128360..58c7e282cf29bbdad3bd8c0a0d43ecefc411d20d 100644 +index f72ad2e7d0d5953c906d0d9f8adb9ba74d1841be..7b96cf748b69db98cb1bc3dc0430e39b9ffc93f2 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.java @@ -83,7 +83,13 @@ public class DragonSittingFlamingPhase extends AbstractDragonSittingPhase { @@ -23,7 +23,7 @@ index 5d6662740e126520e2d9f54585943ede77128360..58c7e282cf29bbdad3bd8c0a0d43ecef } diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java -index f3cc80726e65b57dc03895d1707a8e803b7ea02c..fb92cfde2b6c70839a95ed0f25c015a029563715 100644 +index f54576f6450e24f574bfe7f4b8e2ad5d8c9f1ba3..a3456b35db4e938f91d6bc32d4d202a011bf13c4 100644 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.java @@ -74,7 +74,9 @@ public class DragonStrafePlayerPhase extends AbstractDragonPhaseInstance { @@ -37,7 +37,7 @@ index f3cc80726e65b57dc03895d1707a8e803b7ea02c..fb92cfde2b6c70839a95ed0f25c015a0 if (this.currentPath != null) { while(!this.currentPath.isDone()) { diff --git a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java -index 1d1b5aa74d3c3e74c5f24120fc5f6df76fd036d5..52eb930c5425bc4db32e65ac2b1fb07300617725 100644 +index 796a2a88134eee4021423fef132537a5e0680bc5..9652e3385ad10e5d825dd141f6be3522c596916d 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java +++ b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java @@ -52,8 +52,10 @@ public class DragonFireball extends AbstractHurtingProjectile { diff --git a/patches/server/0221-PlayerElytraBoostEvent.patch b/patches/server/0221-PlayerElytraBoostEvent.patch index 180d0702c6..e99be47ba0 100644 --- a/patches/server/0221-PlayerElytraBoostEvent.patch +++ b/patches/server/0221-PlayerElytraBoostEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerElytraBoostEvent diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java -index 49da9b49036d04f66afe75c3ea61f713991b62f0..d02d7e583d8c1407a5556ac804401b491f882dda 100644 +index 7c627d27300247db9122ab2081049345ef306073..f17e9c6c91c02e0d36f58851522a5d3e5e423121 100644 --- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java +++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java @@ -61,12 +61,19 @@ public class FireworkRocketItem extends Item { diff --git a/patches/server/0222-PlayerLaunchProjectileEvent.patch b/patches/server/0222-PlayerLaunchProjectileEvent.patch index da7db58b9b..558aaf5b04 100644 --- a/patches/server/0222-PlayerLaunchProjectileEvent.patch +++ b/patches/server/0222-PlayerLaunchProjectileEvent.patch @@ -88,7 +88,7 @@ index c7d4745aed77b23562cde7c68b8870fa239428d4..749ab72edc0d2e9c6f1161415ab8d59d return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide()); } diff --git a/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java b/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java -index 07f60136678e1a0c365045b03d9183babed7d14c..7f8e3b4d03dbd848af66dab03d37c8f40f287d11 100644 +index 72dfb7b652f515bf9df201d524a851ab56706544..b80bedb5f27b474d7f66e9e1cc38ca3b692fc92b 100644 --- a/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java +++ b/src/main/java/net/minecraft/world/item/ExperienceBottleItem.java @@ -22,18 +22,37 @@ public class ExperienceBottleItem extends Item { @@ -132,7 +132,7 @@ index 07f60136678e1a0c365045b03d9183babed7d14c..7f8e3b4d03dbd848af66dab03d37c8f4 return InteractionResultHolder.sidedSuccess(itemStack, world.isClientSide()); } diff --git a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java -index d02d7e583d8c1407a5556ac804401b491f882dda..d4eda50ed5e77db1719c2e11a37985cc8f834d3d 100644 +index f17e9c6c91c02e0d36f58851522a5d3e5e423121..82b0bda3e35ec2157a477e1a17b2b46baadc97d9 100644 --- a/src/main/java/net/minecraft/world/item/FireworkRocketItem.java +++ b/src/main/java/net/minecraft/world/item/FireworkRocketItem.java @@ -47,8 +47,12 @@ public class FireworkRocketItem extends Item { @@ -151,7 +151,7 @@ index d02d7e583d8c1407a5556ac804401b491f882dda..d4eda50ed5e77db1719c2e11a37985cc return InteractionResult.sidedSuccess(level.isClientSide); diff --git a/src/main/java/net/minecraft/world/item/LingeringPotionItem.java b/src/main/java/net/minecraft/world/item/LingeringPotionItem.java -index ada71ddedd36bd6dc93bcd204ee2447d4e9b221b..9100e108e99bc97205fb6952941e3b946f944c9f 100644 +index db0492f6337de562210ef062f46e98992c908200..f2d1b4e3fc08f6a06beb391bc6e60f62a9bf82b9 100644 --- a/src/main/java/net/minecraft/world/item/LingeringPotionItem.java +++ b/src/main/java/net/minecraft/world/item/LingeringPotionItem.java @@ -23,7 +23,12 @@ public class LingeringPotionItem extends ThrowablePotionItem { @@ -212,7 +212,7 @@ index d60e57e84f7d66e1858ab50ac33777feedf1c54d..ef3f90a5bcdd7b9815a4053cff166f9d return InteractionResultHolder.sidedSuccess(itemstack, world.isClientSide()); } diff --git a/src/main/java/net/minecraft/world/item/SplashPotionItem.java b/src/main/java/net/minecraft/world/item/SplashPotionItem.java -index 791b8ff1e5d267047192ef3fd7491208ce7c71f5..e48baa67bbb607a7edfe10085ec541c86ba94d6e 100644 +index 317e20052bcac9118e1adeb619bedaacc6fcd690..ece19f30064e9f59d4df077683e1f894455a84b7 100644 --- a/src/main/java/net/minecraft/world/item/SplashPotionItem.java +++ b/src/main/java/net/minecraft/world/item/SplashPotionItem.java @@ -14,7 +14,12 @@ public class SplashPotionItem extends ThrowablePotionItem { @@ -230,7 +230,7 @@ index 791b8ff1e5d267047192ef3fd7491208ce7c71f5..e48baa67bbb607a7edfe10085ec541c8 } } diff --git a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java -index 4b89cd3dd1cb1a30081026f088471a4a3e37ef5f..65b55d179fd57eaf378b5b34cf63f4b9ecd085df 100644 +index 0673f62f25532955f3552b64f122e644d42027e4..de5bdceb4c8578fb972a2fd5ee0dfdae509e46dc 100644 --- a/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java +++ b/src/main/java/net/minecraft/world/item/ThrowablePotionItem.java @@ -19,13 +19,31 @@ public class ThrowablePotionItem extends PotionItem { diff --git a/patches/server/0223-Improve-BlockPosition-inlining.patch b/patches/server/0223-Improve-BlockPosition-inlining.patch index a40fdc91af..208af75831 100644 --- a/patches/server/0223-Improve-BlockPosition-inlining.patch +++ b/patches/server/0223-Improve-BlockPosition-inlining.patch @@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt They had 'callq' (invoke) instead of 'mov' (get from memory) instructions. diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java -index 7067241e2da0dea3875c13cc9f429705a7a9b672..509702714fa9c5565fcc766d76874a0e051e9c72 100644 +index 40950db0c242c65dfd4de247c86249354d12108f..e87ef99260bff134529e00b9a75381cecaec01a4 100644 --- a/src/main/java/net/minecraft/core/Vec3i.java +++ b/src/main/java/net/minecraft/core/Vec3i.java @@ -44,7 +44,7 @@ public class Vec3i implements Comparable { diff --git a/patches/server/0227-SkeletonHorse-Additions.patch b/patches/server/0227-SkeletonHorse-Additions.patch index 06314e1c3f..4f87c8baa6 100644 --- a/patches/server/0227-SkeletonHorse-Additions.patch +++ b/patches/server/0227-SkeletonHorse-Additions.patch @@ -32,7 +32,7 @@ index 8f20239f3ef7ebe41fac8ee6e024c36dafec33c4..d00fb16ae3b94dfcb10fd1a7c1671595 this.horse.setTrap(false); diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java -index b226fcbee22c905de575393a25e9d2e30a95c7f4..65aba5ddf3e53c9889ade3bf2456f6950dbdb400 100644 +index a583599e3b49d5ded871252646904a80825a01ff..c41d0efb40f137d71b2a038dd362d17ddb2fac60 100644 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java @@ -93,6 +93,28 @@ public interface EntityGetter { diff --git a/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index e7cb35878d..6d92f8e010 100644 --- a/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/patches/server/0235-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -8,7 +8,7 @@ Add -Ddebug.entities=true to your JVM flags to gain more information 1.17: Needs to be reworked for new entity storage system diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 6352e3f0a78822b4d5167a688a5230b599541159..62c36060989acb54eb12a145909a68193c5e3035 100644 +index db027a4291131b7f64c32853da4ca5fc71582251..58125d6d08cebf80e792baf809f2c8c1d8a738e5 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1415,6 +1415,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -97,7 +97,7 @@ index beec98739e6be4e51e812091c0be8d98dd459c3f..e66e35b25dfce6f071173de87c452a9d public boolean preventPoiUpdated = false; // CraftBukkit - SPIGOT-5710 public boolean captureBlockStates = false; diff --git a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java -index 93ba2ccf3f084beb0f98a75c5022a4fb8cb88e51..f28bab900b7b7632fca82298b7ce8c6c3a0820a9 100644 +index 21a2800db22f287b9c6a8290326fdf3b94ae94b1..d45d832232be5017dde53816191c2b1830a0da32 100644 --- a/src/main/java/net/minecraft/world/level/entity/EntityLookup.java +++ b/src/main/java/net/minecraft/world/level/entity/EntityLookup.java @@ -34,6 +34,26 @@ public class EntityLookup { diff --git a/patches/server/0240-Optimize-BlockPosition-helper-methods.patch b/patches/server/0240-Optimize-BlockPosition-helper-methods.patch index 03207023f3..892d0f1554 100644 --- a/patches/server/0240-Optimize-BlockPosition-helper-methods.patch +++ b/patches/server/0240-Optimize-BlockPosition-helper-methods.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods Resolves #1338 diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index 7bd9a626c6ce9c5fb58c3d865e656bd9f8e11116..696cb3069e98b31416ff24f372e3d6cc157f8d5e 100644 +index 1834f3efb05fd70c8c1c67733bff514829ae1154..fbdbf61f49bd6867eea609d5572fb31ece094944 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java @@ -132,67 +132,84 @@ public class BlockPos extends Vec3i { diff --git a/patches/server/0245-Optimize-MappedRegistry.patch b/patches/server/0245-Optimize-MappedRegistry.patch index 64fbd781c3..294d542f51 100644 --- a/patches/server/0245-Optimize-MappedRegistry.patch +++ b/patches/server/0245-Optimize-MappedRegistry.patch @@ -8,7 +8,7 @@ Use larger initial sizes to increase bucket capacity on the BiMap BiMap.get was seen to be using a good bit of CPU time. diff --git a/src/main/java/net/minecraft/core/MappedRegistry.java b/src/main/java/net/minecraft/core/MappedRegistry.java -index 74e3eba778901f6f4ca467951517416605e01b81..f5e89c296ff9846ffd37198c1b46073f781ad783 100644 +index dee7ac4dab7e3c1b53f0ff81650ebd922f382ece..26b92e27de1f079ab8440538c65377ed80e8b6ef 100644 --- a/src/main/java/net/minecraft/core/MappedRegistry.java +++ b/src/main/java/net/minecraft/core/MappedRegistry.java @@ -36,13 +36,11 @@ public class MappedRegistry implements WritableRegistry { diff --git a/patches/server/0252-Improve-death-events.patch b/patches/server/0252-Improve-death-events.patch index 5baf731af6..6539f069b3 100644 --- a/patches/server/0252-Improve-death-events.patch +++ b/patches/server/0252-Improve-death-events.patch @@ -276,7 +276,7 @@ index 0d4b86411d2d064b04334b508b1cb65695afaebd..df06cad9447982ebe57d07c9967cb68c @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java -index c6cf5dfb482042be855250c465964f3d01fe65d1..11a422d87f4a7761b539ac5a3611d7775ec734fb 100644 +index bb399f775a5530a01f59332848c8ab9b8eceb2b5..14edfe103e61024b569f33de0b6608f39e749319 100644 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractChestedHorse.java @@ -70,11 +70,19 @@ public abstract class AbstractChestedHorse extends AbstractHorse { diff --git a/patches/server/0254-Mob-Pathfinding-API.patch b/patches/server/0254-Mob-Pathfinding-API.patch index 8b7d99f22f..e8e958cebd 100644 --- a/patches/server/0254-Mob-Pathfinding-API.patch +++ b/patches/server/0254-Mob-Pathfinding-API.patch @@ -160,7 +160,7 @@ index 0000000000000000000000000000000000000000..064712e7b27a200b29c72076a82f4f56 + } +} diff --git a/src/main/java/net/minecraft/world/level/pathfinder/Path.java b/src/main/java/net/minecraft/world/level/pathfinder/Path.java -index 3b83e605e0f4c03515285b5449e8d0b389860e64..4460a2febed4e0e720c426a2e45b5cced6022961 100644 +index 539dc45c3c7ffc60cf3fb47ae4df65e604e8627b..eea4c932d909145e7af848cf76e3f49dbb2deff2 100644 --- a/src/main/java/net/minecraft/world/level/pathfinder/Path.java +++ b/src/main/java/net/minecraft/world/level/pathfinder/Path.java @@ -18,6 +18,7 @@ public class Path { diff --git a/patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch index 505ab4a58b..31dae70550 100644 --- a/patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch +++ b/patches/server/0266-Catch-JsonParseException-in-Entity-and-TE-names.patch @@ -89,7 +89,7 @@ index 18349957bd6d1a4bc21aff781a791f912dddff1d..cd28ee0cbc69713a641a21c9a626c694 this.lockKey = LockCode.fromTag(nbt); diff --git a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java -index e3519683e912df7293090f811470f18aee48e3dd..234188208c966eb5864dbf161145d435bca3f457 100644 +index 3a8bdb788b07b0a8cda3d4b872ede52ca9a005c4..65e1381bb2d10bd212463feb602c60f8fdb9ade1 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/EnchantmentTableBlockEntity.java @@ -42,7 +42,7 @@ public class EnchantmentTableBlockEntity extends BlockEntity implements Nameable diff --git a/patches/server/0267-Turtle-API.patch b/patches/server/0267-Turtle-API.patch index dac84cbba1..89bc808f04 100644 --- a/patches/server/0267-Turtle-API.patch +++ b/patches/server/0267-Turtle-API.patch @@ -12,7 +12,7 @@ public net.minecraft.world.entity.animal.Turtle isTravelling()Z public net.minecraft.world.entity.animal.Turtle setTravelling(Z)V diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java -index 28f313ce0992b7d26cce1fcbdc59b0e214b1ddd0..413ea9b2686c6385699cd54e8b976bdaf94d91fd 100644 +index 60e291abb3ebdf8676c13a2138d8eb436d033fa2..d27e5f9dac4703b839ab8444f6b54bf54d58af86 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java @@ -14,7 +14,7 @@ public abstract class MoveToBlockGoal extends Goal { diff --git a/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch index 80ea30b8db..a1cd74fc4a 100644 --- a/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch +++ b/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch @@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..b60f59cf5cc8eb84a6055b7861857dec + } +} diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index 5bd8fa10b39a3fb3401a8ebbf1b74b65ea74dfd2..d3791c92432493f60b48fa59714b370739eb4fed 100644 +index 30237ca94a36197ce21369bdcc7bb1dfafe02680..5e9401f0c2de0743aca9237ee8c4dfba586cfdb9 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java @@ -81,7 +81,7 @@ public class Util { diff --git a/patches/server/0283-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0283-Handle-Large-Packets-disconnecting-client.patch index 184e5238bb..19fb8af125 100644 --- a/patches/server/0283-Handle-Large-Packets-disconnecting-client.patch +++ b/patches/server/0283-Handle-Large-Packets-disconnecting-client.patch @@ -34,7 +34,7 @@ index 2d7f332910328cef616609dc4c89facafcbe66cc..ff97e47cb248ade6530e52583b0b3865 Connection.LOGGER.debug("Skipping packet due to errors", throwable.getCause()); } else { diff --git a/src/main/java/net/minecraft/network/PacketEncoder.java b/src/main/java/net/minecraft/network/PacketEncoder.java -index d506995a54a22efb923c9f3f4c4e065b8d2804f8..bf0419ccc0f4ceacd4636ffc21c247c5f600b86e 100644 +index 3d359f80f52bff6f19fcb484f491a874f9dcff27..45b4f1c295eda2fcc5067a4b21de247218ef117f 100644 --- a/src/main/java/net/minecraft/network/PacketEncoder.java +++ b/src/main/java/net/minecraft/network/PacketEncoder.java @@ -41,7 +41,7 @@ public class PacketEncoder extends MessageToByteEncoder> { @@ -83,7 +83,7 @@ index d506995a54a22efb923c9f3f4c4e065b8d2804f8..bf0419ccc0f4ceacd4636ffc21c247c5 + // Paper end } diff --git a/src/main/java/net/minecraft/network/protocol/Packet.java b/src/main/java/net/minecraft/network/protocol/Packet.java -index e2babff277d45d15b9a2532f7629251efa1ef92d..84e167701b0ceebbdbd2a95af47c5e3048a48050 100644 +index 700418bb0c9fbed3f161611881b1e222248ca4eb..cc658a61065d5c0021a4b88fa58b40211b94f8ec 100644 --- a/src/main/java/net/minecraft/network/protocol/Packet.java +++ b/src/main/java/net/minecraft/network/protocol/Packet.java @@ -10,6 +10,12 @@ public interface Packet { @@ -100,7 +100,7 @@ index e2babff277d45d15b9a2532f7629251efa1ef92d..84e167701b0ceebbdbd2a95af47c5e30 return false; } diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java -index 48be6902fb1de7e01bc2f25fb837d2d4053d22ca..68bf2c17f9d80f9d024021f664515eb67097e3f8 100644 +index 0e076173033278587df2b5dfbd01cc9005651eb5..dbd8b9b09b82c1b75e8be9dc7416d9f0863c8c87 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundContainerSetContentPacket.java @@ -31,6 +31,16 @@ public class ClientboundContainerSetContentPacket implements Packet implements PlaceRecipe diff --git a/src/main/java/net/minecraft/data/worldgen/SurfaceRuleData.java b/src/main/java/net/minecraft/data/worldgen/SurfaceRuleData.java -index af0cf78e67a5c41940ee125a0476aade8cc262b4..e0fd3b1aaec898173e59fa8741068deae86e2039 100644 +index 06e1774dfbb667aca69bc30c9675ed472cb5728c..1d5bc86516df3781aea894c3afd340421ba51a17 100644 --- a/src/main/java/net/minecraft/data/worldgen/SurfaceRuleData.java +++ b/src/main/java/net/minecraft/data/worldgen/SurfaceRuleData.java @@ -53,6 +53,66 @@ public class SurfaceRuleData { @@ -148,7 +148,7 @@ index 54308f1decc3982f30bf8b7a8a9d8865bfdbb9fd..0fca35ac82a1854260980b7c2664be82 for (int j = -8; j <= 8; ++j) { diff --git a/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java b/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java -index a0aa1087f5cb4d2d50c127447745a9e25c5079d6..192bcd833bf910b9372f8a05eea0de832ada431b 100644 +index b99283c31193e2110f6e3f39c23dbfc2442bab2b..1c9d9ecdafb2bd04348045ba0404da052dcd6437 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java +++ b/src/main/java/net/minecraft/world/level/levelgen/WorldGenerationContext.java @@ -6,10 +6,13 @@ import net.minecraft.world.level.chunk.ChunkGenerator; @@ -181,7 +181,7 @@ index a0aa1087f5cb4d2d50c127447745a9e25c5079d6..192bcd833bf910b9372f8a05eea0de83 + // Paper end } diff --git a/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java b/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java -index df7183f221f0a5bc6fba7a5857c16555411bcff0..bef1f5ebf284bffc863e4174b3fb259956bf3303 100644 +index a745458ea3581ea91a68c863e3fd0a0292d73a61..f84ee8afe95f912a972e37fbae7a06ecdd3aba06 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java +++ b/src/main/java/net/minecraft/world/level/levelgen/carver/CarvingContext.java @@ -21,8 +21,8 @@ public class CarvingContext extends WorldGenerationContext { @@ -196,7 +196,7 @@ index df7183f221f0a5bc6fba7a5857c16555411bcff0..bef1f5ebf284bffc863e4174b3fb2599 this.noiseChunk = chunkNoiseSampler; this.randomState = noiseConfig; diff --git a/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java b/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java -index 9915ddef87c759df442a8c7b6960a88e3657ba44..d167caddd99604494f8d67b169d50b3abbb2a276 100644 +index 640c2683c842655bbaee8f293f1c2613ef44844e..53d818b0cc602f827d0b907e293515f6810c6792 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java +++ b/src/main/java/net/minecraft/world/level/levelgen/placement/PlacementContext.java @@ -18,7 +18,7 @@ public class PlacementContext extends WorldGenerationContext { diff --git a/patches/server/0324-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0324-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch index b8b7edf135..1bf426b9ec 100644 --- a/patches/server/0324-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch +++ b/patches/server/0324-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent sync chunk loads when villagers try to find beds diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/SleepInBed.java b/src/main/java/net/minecraft/world/entity/ai/behavior/SleepInBed.java -index 9badd8d87e620597655cf781eeed130ccace70b5..dc3cdcd4ca0e6dd402ee1d20564e02899e63c9ea 100644 +index 964fc8615d071d33c821f0c54ac1ebd4884df0cd..dcfc668503c50927b4a4dbb3988d531215d513f8 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/SleepInBed.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/SleepInBed.java @@ -43,7 +43,8 @@ public class SleepInBed extends Behavior { diff --git a/patches/server/0325-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0325-MC-145656-Fix-Follow-Range-Initial-Target.patch index 2098e8083a..4494b22853 100644 --- a/patches/server/0325-MC-145656-Fix-Follow-Range-Initial-Target.patch +++ b/patches/server/0325-MC-145656-Fix-Follow-Range-Initial-Target.patch @@ -17,7 +17,7 @@ index 0dad5be671f990d0edf0a155e2534b3812438902..370e601ff5adccc3924055b69b42dd2f @Override diff --git a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java -index 5e92fb6c0c0a16ef1569ba3090897747ad026efa..d022f40c8d1d28556c9300e2b8f76410d4055a7a 100644 +index f29823f2e8a54bd4e81e2940b5c505b152f23e88..58422f00c7d64dbd1cf6d7211c9838875cbe7778 100644 --- a/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java +++ b/src/main/java/net/minecraft/world/entity/ai/targeting/TargetingConditions.java @@ -76,7 +76,7 @@ public class TargetingConditions { diff --git a/patches/server/0326-Duplicate-UUID-Resolve-Option.patch b/patches/server/0326-Duplicate-UUID-Resolve-Option.patch index 30a421b34a..dad8a91bfc 100644 --- a/patches/server/0326-Duplicate-UUID-Resolve-Option.patch +++ b/patches/server/0326-Duplicate-UUID-Resolve-Option.patch @@ -56,7 +56,7 @@ index 87ae7d64e67ebae5ab53cc239cdf6580dca31652..f27644293468efc3988bea50f5b96fd1 public static void onChunkHolderCreate(final ServerLevel level, final ChunkHolder holder) { diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index a0fba2202b2060694485989094f7e6e4ab94caaa..66046c763872a031c65db17502b33199a40fd093 100644 +index 6682318c9430430af6cba4e7e6e4cd07cfca0333..8c0d36e8f946771c35ea9f06db3db8fc5ac3c4a2 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -870,6 +870,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index 891adb5339..71f28eb22f 100644 --- a/patches/server/0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/patches/server/0329-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary" and treat it as a single chest if the other sides are unloaded diff --git a/src/main/java/net/minecraft/world/level/block/DoubleBlockCombiner.java b/src/main/java/net/minecraft/world/level/block/DoubleBlockCombiner.java -index f920fabed523906d4dd49c76db58044954880415..af4f06f798125f8b5d79324d99c48ac83727fcda 100644 +index ff2a7b08fe70adaecdaa508baadcfe40416519e0..6c334703c816d2a04f97006c5796c658f34a12a4 100644 --- a/src/main/java/net/minecraft/world/level/block/DoubleBlockCombiner.java +++ b/src/main/java/net/minecraft/world/level/block/DoubleBlockCombiner.java @@ -25,7 +25,12 @@ public class DoubleBlockCombiner { diff --git a/patches/server/0334-Entity-Activation-Range-2.0.patch b/patches/server/0334-Entity-Activation-Range-2.0.patch index 9a4e6f04b1..e73b9c627b 100644 --- a/patches/server/0334-Entity-Activation-Range-2.0.patch +++ b/patches/server/0334-Entity-Activation-Range-2.0.patch @@ -184,7 +184,7 @@ index 5e9cf929674888b3a143a0691dc6936b304467f1..b5964614823059261c28eb2e998ad542 public float getWalkTargetValue(BlockPos pos) { return this.getWalkTargetValue(pos, this.level()); diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java -index 788a0c026c5161cff5e89b6b063c27ceee3dd3e1..ab57ee36c134f016f6c8abb1c064149ad541536f 100644 +index 07c1ca01c38d5d7d0a95ad5004b5df9f4a222935..e5995d0db5dcfba59a873ff439601894fdacd556 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java @@ -33,6 +33,7 @@ public class GoalSelector { @@ -217,7 +217,7 @@ index 788a0c026c5161cff5e89b6b063c27ceee3dd3e1..ab57ee36c134f016f6c8abb1c064149a this.availableGoals.stream().filter((wrappedGoal) -> { return wrappedGoal.getGoal() == goal; diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java -index 413ea9b2686c6385699cd54e8b976bdaf94d91fd..98387eff323edc98770d53e4911c69fe3e1a8e6c 100644 +index d27e5f9dac4703b839ab8444f6b54bf54d58af86..34f319ad09276c6f68dde449c79351de0d7d86f5 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java @@ -14,7 +14,7 @@ public abstract class MoveToBlockGoal extends Goal { @@ -311,7 +311,7 @@ index 7d7390dc76f683178fc332ea3c2c945ba8e9b84b..cc829161404c0f98a403c5219d5c535d super.customServerAiStep(); } diff --git a/src/main/java/net/minecraft/world/entity/vehicle/MinecartHopper.java b/src/main/java/net/minecraft/world/entity/vehicle/MinecartHopper.java -index 28edeab06acd5771d7971234fb60565fcbac01a6..64df872974535505a0c8cd074e324266a8b80025 100644 +index b149e8bcac034bb3fc118a9adcb0de45e18ed5e9..fc35cfc9d045f3e5b6a50af1d0ba83b6e322091f 100644 --- a/src/main/java/net/minecraft/world/entity/vehicle/MinecartHopper.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/MinecartHopper.java @@ -52,6 +52,7 @@ public class MinecartHopper extends AbstractMinecartContainer implements Hopper @@ -365,7 +365,7 @@ index 4968e036350631b79a8c7e70fdc32db4bcff2ade..495ab82a3a9d47583eb7239730aa78dd public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot // Paper start diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java -index 1c23e189124e958dfb051c92789bce2916e3d6ce..9d37df5910e8d5fd1bd98c7ccff358aaf27ef226 100644 +index 45f55c79a9d105f732054d61c4cf83eb5db49762..17a6327ab7b26dfab38881bbc0689b0b25f8f025 100644 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java @@ -143,6 +143,10 @@ public class PistonMovingBlockEntity extends BlockEntity { diff --git a/patches/server/0337-Tracking-Range-Improvements.patch b/patches/server/0337-Tracking-Range-Improvements.patch index 5b0eae3c0b..882ce12ba2 100644 --- a/patches/server/0337-Tracking-Range-Improvements.patch +++ b/patches/server/0337-Tracking-Range-Improvements.patch @@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code Also ignores Enderdragon, defaulting it to Mojang's setting diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 66046c763872a031c65db17502b33199a40fd093..eb8b82514cc19ff5404c7558f93310d6629cb6d7 100644 +index 8c0d36e8f946771c35ea9f06db3db8fc5ac3c4a2..d6e3bde87fd3613b3e9263bbe116fac004c27848 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1816,6 +1816,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0339-implement-optional-per-player-mob-spawns.patch b/patches/server/0339-implement-optional-per-player-mob-spawns.patch index 9103dcbebc..5aa1b5ae6e 100644 --- a/patches/server/0339-implement-optional-per-player-mob-spawns.patch +++ b/patches/server/0339-implement-optional-per-player-mob-spawns.patch @@ -252,7 +252,7 @@ index 0000000000000000000000000000000000000000..11de56afaf059b00fa5bec293516bcdc + } +} diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index eb8b82514cc19ff5404c7558f93310d6629cb6d7..842f7423d113f23d4b95162c81d407efd765679a 100644 +index d6e3bde87fd3613b3e9263bbe116fac004c27848..02aa2f4c7d2d4ddd2dbfcd7a90996fa9fce5944c 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -147,6 +147,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch index 2f59be7b66..36b39986f0 100644 --- a/patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch +++ b/patches/server/0359-Remote-Connections-shouldn-t-hold-up-shutdown.patch @@ -24,7 +24,7 @@ index f17116ee619338e1dc8ae1fb9d5b18ad28164ba3..6d2f49204e6a8fe8057a0c83f23adae3 System.exit(0); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/rcon/thread/RconThread.java b/src/main/java/net/minecraft/server/rcon/thread/RconThread.java -index 64807f4f58019e6a75469b0835ea2a8f3ca3bcc8..3daba79e3c6cdad7a79351c1f0dcddb3bdd262b6 100644 +index 3bf60f640aa9fa4cabd2b3e5d3931e8467b9df24..2c1289aa2bf8b7bb67709190263b82b811c17fff 100644 --- a/src/main/java/net/minecraft/server/rcon/thread/RconThread.java +++ b/src/main/java/net/minecraft/server/rcon/thread/RconThread.java @@ -107,6 +107,14 @@ public class RconThread extends GenericThread { diff --git a/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index 4aaecfe6df..30646fc5d0 100644 --- a/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -7,7 +7,7 @@ Suspected case would be around the technique used in .stopRiding Stack will identify any causer of this and warn instead of crashing. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 842f7423d113f23d4b95162c81d407efd765679a..b652019a5feffeeec2871011e2df0d609e1a7647 100644 +index 02aa2f4c7d2d4ddd2dbfcd7a90996fa9fce5944c..fdf4da153f57dea2e83ced0c4b56fdb8bd10aa74 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1550,6 +1550,13 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0364-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0364-Optimize-Collision-to-not-load-chunks.patch index 6fdd416686..d23823ed80 100644 --- a/patches/server/0364-Optimize-Collision-to-not-load-chunks.patch +++ b/patches/server/0364-Optimize-Collision-to-not-load-chunks.patch @@ -38,7 +38,7 @@ index 1badb25665edaeb5eb274b770ea50598ba056b22..961213739ba810c6e39aca76a32d74bc public @org.jetbrains.annotations.Nullable net.minecraft.server.level.ChunkMap.TrackedEntity tracker; // Paper diff --git a/src/main/java/net/minecraft/world/level/BlockCollisions.java b/src/main/java/net/minecraft/world/level/BlockCollisions.java -index 3e2be725b3803b19558bf1e2c588f6c0d7b41ba4..6284701b83883e93838c7de11c6cd05eaef0c086 100644 +index f2c423154ed6a00882a46d93b69ed4f6ba73782c..a3eaf80b020c3bbc0306c5d17659ee661dfd275b 100644 --- a/src/main/java/net/minecraft/world/level/BlockCollisions.java +++ b/src/main/java/net/minecraft/world/level/BlockCollisions.java @@ -65,22 +65,41 @@ public class BlockCollisions extends AbstractIterator { @@ -92,7 +92,7 @@ index 3e2be725b3803b19558bf1e2c588f6c0d7b41ba4..6284701b83883e93838c7de11c6cd05e } diff --git a/src/main/java/net/minecraft/world/level/CollisionGetter.java b/src/main/java/net/minecraft/world/level/CollisionGetter.java -index 95d919ed9ab071afda571f86adb99e4ffb96858d..bbace777cbbd5014c0115380aa05d179c0e3fe22 100644 +index 140d10807a3a6806578cd203ba58383590c2f2c0..c476e37df8a75d77f5093b2a449e04f25ef2c2dd 100644 --- a/src/main/java/net/minecraft/world/level/CollisionGetter.java +++ b/src/main/java/net/minecraft/world/level/CollisionGetter.java @@ -44,11 +44,13 @@ public interface CollisionGetter extends BlockGetter { diff --git a/patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch index 7884d36427..70dff6f0dc 100644 --- a/patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch +++ b/patches/server/0366-Optimize-GoalSelector-Goal.Flag-Set-operations.patch @@ -7,7 +7,7 @@ Optimise the stream.anyMatch statement to move to a bitset where we can replace the call with a single bitwise operation. diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java -index 686330f11f147f56ef70f09484c77e27de8a411c..c3a2fd7aa18f88c3171a80a329888e72bce54b2d 100644 +index 6667ecc4b7eded4e20a415cef1e1b1179e6710b8..4379b9948f1eecfe6fd7dea98e298ad5f761019a 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java @@ -4,7 +4,8 @@ import java.util.EnumSet; @@ -47,7 +47,7 @@ index 686330f11f147f56ef70f09484c77e27de8a411c..c3a2fd7aa18f88c3171a80a329888e72 protected int adjustedTickDelay(int ticks) { diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java -index ab57ee36c134f016f6c8abb1c064149ad541536f..d1fbc2690fbda5a9128fffe4200e6102ddfaef94 100644 +index e5995d0db5dcfba59a873ff439601894fdacd556..b738ee2d3801fadfd09313f05ae24593e56b0ec6 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java @@ -30,10 +30,12 @@ public class GoalSelector { @@ -152,7 +152,7 @@ index ab57ee36c134f016f6c8abb1c064149ad541536f..d1fbc2690fbda5a9128fffe4200e6102 public void setControlFlag(Goal.Flag control, boolean enabled) { diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/WrappedGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/WrappedGoal.java -index 3d140a2cafba05119ac92f0f737b305187abbd56..b4b625c74f8279eef8b368f8a4f779f5783ea743 100644 +index 6665ce5f48316e626907e6937d5ef1bc398a7ebd..51deb4455cac055ffa455e4f34aa30858d2fb448 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/WrappedGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/WrappedGoal.java @@ -69,8 +69,10 @@ public class WrappedGoal extends Goal { diff --git a/patches/server/0367-Improved-Watchdog-Support.patch b/patches/server/0367-Improved-Watchdog-Support.patch index 51ca3a862e..753ef66b52 100644 --- a/patches/server/0367-Improved-Watchdog-Support.patch +++ b/patches/server/0367-Improved-Watchdog-Support.patch @@ -282,7 +282,7 @@ index 89310108e94f3198c5f4ecd65e414a2c7af262cb..d1e5db7b0b260002198b1262f914d3c5 // Paper start - Remove from collideRule team if needed diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java -index ffb691898d1c9c108be520dc8968214eacb425d5..a1f190cb17344f72e72c4205a011c08824c62cea 100644 +index f5829ae484d93b547a5437b85a9621346384a11b..83701fbfaa56a232593ee8f11a3afb8941238bfa 100644 --- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java +++ b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java @@ -152,6 +152,7 @@ public abstract class BlockableEventLoop implements Profiler diff --git a/patches/server/0368-Optimize-Pathfinding.patch b/patches/server/0368-Optimize-Pathfinding.patch index 93dca6c6b2..8fca2b48b1 100644 --- a/patches/server/0368-Optimize-Pathfinding.patch +++ b/patches/server/0368-Optimize-Pathfinding.patch @@ -7,7 +7,7 @@ Prevents pathfinding from spamming failures for things such as arrow attacks. diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java -index 56fc89357bec386f23660c16a7cd1dfe781e0413..dc22b0b359e8befb5bd3b7e5f0a4696cd862b7a2 100644 +index 68edd488087a6ec1e65797cfbd4118bd0efbab50..b37415d45dda8e658c8995a4519e552dc378bb41 100644 --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java @@ -192,9 +192,29 @@ public abstract class PathNavigation { diff --git a/patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch index cfcdcffb66..e6907357f4 100644 --- a/patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch +++ b/patches/server/0370-Reduce-memory-footprint-of-NBTTagCompound.patch @@ -8,7 +8,7 @@ is important because we clone chunk data after reading it for safety. So, reduce the impact of the clone on GC. diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java -index ce6ec14a8022b253efff5d9b34d93b5fdd1df1b6..9ca14906da5ac18eb52aa6c2d497a7b0909b7b58 100644 +index 92095b494a0c4fb89b84f0b1c0376615d28e34ce..ad0251b73d21b36bf19e9aa649817b4da2d0a6b4 100644 --- a/src/main/java/net/minecraft/nbt/CompoundTag.java +++ b/src/main/java/net/minecraft/nbt/CompoundTag.java @@ -46,7 +46,7 @@ public class CompoundTag implements Tag { diff --git a/patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch index 58cd9de102..9d66b30712 100644 --- a/patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch +++ b/patches/server/0375-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch @@ -31,7 +31,7 @@ delays anymore. public net.minecraft.server.level.ChunkMap addEntity(Lnet/minecraft/world/entity/Entity;)V diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index b652019a5feffeeec2871011e2df0d609e1a7647..9cdebd7715fca949cc390684d044235d75b89c24 100644 +index fdf4da153f57dea2e83ced0c4b56fdb8bd10aa74..4fa2076efd11a628e17d8124f3d89342a3299375 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1556,6 +1556,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0384-Optimize-Voxel-Shape-Merging.patch b/patches/server/0384-Optimize-Voxel-Shape-Merging.patch index 16dcf4e566..2c47963e34 100644 --- a/patches/server/0384-Optimize-Voxel-Shape-Merging.patch +++ b/patches/server/0384-Optimize-Voxel-Shape-Merging.patch @@ -30,7 +30,7 @@ Additionally, this lets us avoid even allocating new objects for this too, furth reducing memory usage. diff --git a/src/main/java/net/minecraft/world/phys/shapes/IndirectMerger.java b/src/main/java/net/minecraft/world/phys/shapes/IndirectMerger.java -index cde352650266446fb0da7b8269a6e774e6b0eff8..b836ef69c3acf37c543b30b9c14e54ae02525fcb 100644 +index 0d9c15120148409967027dead617e80769939697..2214a3198c712deaac0f3d3478c85352185761d4 100644 --- a/src/main/java/net/minecraft/world/phys/shapes/IndirectMerger.java +++ b/src/main/java/net/minecraft/world/phys/shapes/IndirectMerger.java @@ -10,12 +10,33 @@ public class IndirectMerger implements IndexMerger { @@ -68,7 +68,7 @@ index cde352650266446fb0da7b8269a6e774e6b0eff8..b836ef69c3acf37c543b30b9c14e54ae this.firstIndices = new int[k]; this.secondIndices = new int[k]; diff --git a/src/main/java/net/minecraft/world/phys/shapes/Shapes.java b/src/main/java/net/minecraft/world/phys/shapes/Shapes.java -index ef02d1a9d3fc035fa2b10231c955750d4ba72392..b073361134dbe2c5034261d32dd26a6de9af60a1 100644 +index 2d273be8145bbd86ffdf33358629da7fc08b4d4c..9176735c08a75854209f24113b0e78332249dc4d 100644 --- a/src/main/java/net/minecraft/world/phys/shapes/Shapes.java +++ b/src/main/java/net/minecraft/world/phys/shapes/Shapes.java @@ -247,9 +247,21 @@ public final class Shapes { diff --git a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 961228f832..ad1f434e26 100644 --- a/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0388-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -482,7 +482,7 @@ index 226cba0c1eeedd9e80acd603c46b802c183db1fa..1d714d3eff11ed14f218656008190017 this.exception = cause; this.systemReport.setDetail("CraftBukkit Information", new org.bukkit.craftbukkit.CraftCrashReport()); // CraftBukkit diff --git a/src/main/java/net/minecraft/CrashReportCategory.java b/src/main/java/net/minecraft/CrashReportCategory.java -index 9cbe28043a1105a2a46df7a784f02aeb95ab4a6e..ec82643b3d731089cbc622c92bbd01131efd4fea 100644 +index 52eb3176437113f9a0ff85d10ce5c2415e1b5570..b54ddd0ba0b001fbcb1838a838ca4890df936f1b 100644 --- a/src/main/java/net/minecraft/CrashReportCategory.java +++ b/src/main/java/net/minecraft/CrashReportCategory.java @@ -104,6 +104,7 @@ public class CrashReportCategory { diff --git a/patches/server/0389-Implement-Mob-Goal-API.patch b/patches/server/0389-Implement-Mob-Goal-API.patch index fee893fa96..38b645c5a7 100644 --- a/patches/server/0389-Implement-Mob-Goal-API.patch +++ b/patches/server/0389-Implement-Mob-Goal-API.patch @@ -742,7 +742,7 @@ index 0000000000000000000000000000000000000000..0d30e0b21b9024df939a9d070bd4a99b + } +} diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java -index c3a2fd7aa18f88c3171a80a329888e72bce54b2d..51e5682b49eb7a97d768f3b2462009366e347dfd 100644 +index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc313c28e7cb 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/Goal.java @@ -7,6 +7,14 @@ public abstract class Goal { diff --git a/patches/server/0390-Add-villager-reputation-API.patch b/patches/server/0390-Add-villager-reputation-API.patch index 0661d27161..570f87c373 100644 --- a/patches/server/0390-Add-villager-reputation-API.patch +++ b/patches/server/0390-Add-villager-reputation-API.patch @@ -9,7 +9,7 @@ public net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips public net.minecraft.world.entity.ai.gossip.GossipContainer gossips diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java -index 31005d72466ac28018a6cb7ac440552c9540b9d3..15f9d40f9a2a9cb265ae130c39057a3568f6ee67 100644 +index a28f359202e6502c6ea5e9c918ec0b3e9a3fca61..76dffb2705e5207db96895f82f1c7c5638f817c6 100644 --- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java +++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java @@ -231,6 +231,43 @@ public class GossipContainer { diff --git a/patches/server/0405-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0405-Fix-piston-physics-inconsistency-MC-188840.patch index c4ebebf35b..01fa3d45c0 100644 --- a/patches/server/0405-Fix-piston-physics-inconsistency-MC-188840.patch +++ b/patches/server/0405-Fix-piston-physics-inconsistency-MC-188840.patch @@ -66,7 +66,7 @@ index 7248a8c51d0e285e2296826e48782f721265605b..48ee146dea30f7d8c48c6bee7a1547ad } diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java -index 9d37df5910e8d5fd1bd98c7ccff358aaf27ef226..2384e74c8b4f5abe596ef4b231c3fce8a90f5302 100644 +index 17a6327ab7b26dfab38881bbc0689b0b25f8f025..1ef87580574919796dbba707f44a413ee5c5781b 100644 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java @@ -288,7 +288,7 @@ public class PistonMovingBlockEntity extends BlockEntity { diff --git a/patches/server/0407-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0407-Fix-missing-chunks-due-to-integer-overflow.patch index 7781faba05..979e1e474e 100644 --- a/patches/server/0407-Fix-missing-chunks-due-to-integer-overflow.patch +++ b/patches/server/0407-Fix-missing-chunks-due-to-integer-overflow.patch @@ -15,7 +15,7 @@ allows the distance calculation to avoid overflow and work as intended. This issue is being tracked in Mojira ticket MC-159283 diff --git a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java -index cbebb6682740c67f9abf5c45f9a5bb9db23974c6..39927a9b24a033e95d09d2201323e2b87c1b4d4e 100644 +index 299116c5c4d25c78a2af00bb44c4f51ac04286e8..fac92f37c32e0398ebc05d9a0378446fcabaef1a 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java +++ b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java @@ -502,7 +502,7 @@ public final class DensityFunctions { diff --git a/patches/server/0418-Optimize-Bit-Operations-by-inlining.patch b/patches/server/0418-Optimize-Bit-Operations-by-inlining.patch index 77856a96be..468568d8aa 100644 --- a/patches/server/0418-Optimize-Bit-Operations-by-inlining.patch +++ b/patches/server/0418-Optimize-Bit-Operations-by-inlining.patch @@ -7,7 +7,7 @@ Inline bit operations and reduce instruction count to make these hot operations faster diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index 696cb3069e98b31416ff24f372e3d6cc157f8d5e..f2758e3c9447dbf307b2306c8d56bdc2d5ee7edf 100644 +index fbdbf61f49bd6867eea609d5572fb31ece094944..441ea6b9fd55a5288f264472d7297728d0546d6b 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java @@ -37,15 +37,16 @@ public class BlockPos extends Vec3i { @@ -84,7 +84,7 @@ index 696cb3069e98b31416ff24f372e3d6cc157f8d5e..f2758e3c9447dbf307b2306c8d56bdc2 public static long getFlatIndex(long y) { diff --git a/src/main/java/net/minecraft/core/SectionPos.java b/src/main/java/net/minecraft/core/SectionPos.java -index 714652406d32e325346071436e5a61500a8e1f96..dd1f6f3f89ebee301f587aa2f099910c141fcd6f 100644 +index eb97928380384b8c33cf142dd9a5db65951c94c6..392c3681c08d9e3d99cbabaf72d22c1d1518998d 100644 --- a/src/main/java/net/minecraft/core/SectionPos.java +++ b/src/main/java/net/minecraft/core/SectionPos.java @@ -38,7 +38,7 @@ public class SectionPos extends Vec3i { diff --git a/patches/server/0421-Support-old-UUID-format-for-NBT.patch b/patches/server/0421-Support-old-UUID-format-for-NBT.patch index 47647a916e..fe9c23b739 100644 --- a/patches/server/0421-Support-old-UUID-format-for-NBT.patch +++ b/patches/server/0421-Support-old-UUID-format-for-NBT.patch @@ -8,7 +8,7 @@ We have stored UUID in plenty of places that did not get DFU'd So just look for old format and load it if it exists. diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java -index 9ca14906da5ac18eb52aa6c2d497a7b0909b7b58..cd8dcae8f43d7adbd7bf33d23fbfe5c9ea57dc34 100644 +index ad0251b73d21b36bf19e9aa649817b4da2d0a6b4..84fc2adf591f02a14862f7c1cd645c2efde55c3d 100644 --- a/src/main/java/net/minecraft/nbt/CompoundTag.java +++ b/src/main/java/net/minecraft/nbt/CompoundTag.java @@ -233,6 +233,12 @@ public class CompoundTag implements Tag { @@ -46,7 +46,7 @@ index 9ca14906da5ac18eb52aa6c2d497a7b0909b7b58..cd8dcae8f43d7adbd7bf33d23fbfe5c9 return tag != null && tag.getType() == IntArrayTag.TYPE && ((IntArrayTag)tag).getAsIntArray().length == 4; } diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java -index 56ff824be8d6d4a86fc5a6740f6b29ac4deffd55..97b48c296ac1d90b881fbb93c90f806b4d15ef7c 100644 +index 4388f2a8b05f5ed2f0934c1693299a4c92072adc..b65dcff9812dbc3256c080ac264c4aafd83ce276 100644 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java @@ -72,6 +72,11 @@ public final class NbtUtils { diff --git a/patches/server/0423-Remove-some-streams-from-structures.patch b/patches/server/0423-Remove-some-streams-from-structures.patch index 1d02cacf46..136b102df3 100644 --- a/patches/server/0423-Remove-some-streams-from-structures.patch +++ b/patches/server/0423-Remove-some-streams-from-structures.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Remove some streams from structures This showed up a lot in the spark profiler, should have a low-medium performance improvement. diff --git a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java -index 46938d6e73666a3a1c393423f58027d593bd8d62..1efa3d0df38d8a1385fdd49ec20975c63a569eaf 100644 +index bb8d8edb47621665872a5e8fc01512ba40c1b913..5d721dc196a6bde511f46dbdedb2e1d98553ac52 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java +++ b/src/main/java/net/minecraft/world/level/levelgen/Beardifier.java @@ -36,9 +36,10 @@ public class Beardifier implements DensityFunctions.BeardifierOrMarker { diff --git a/patches/server/0424-Remove-streams-from-classes-related-villager-gossip.patch b/patches/server/0424-Remove-streams-from-classes-related-villager-gossip.patch index 1f8fee05ed..b9c37f3a08 100644 --- a/patches/server/0424-Remove-streams-from-classes-related-villager-gossip.patch +++ b/patches/server/0424-Remove-streams-from-classes-related-villager-gossip.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove streams from classes related villager gossip diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java -index 15f9d40f9a2a9cb265ae130c39057a3568f6ee67..a18c157d6d16f03f622dd2fca58f40a8f199417f 100644 +index 76dffb2705e5207db96895f82f1c7c5638f817c6..097007c1c25ba55d9916fc820dd1d1149d81f6f4 100644 --- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java +++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java @@ -61,8 +61,22 @@ public class GossipContainer { diff --git a/patches/server/0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch index a5d4cfb5c5..9c7eb0b8d7 100644 --- a/patches/server/0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch +++ b/patches/server/0435-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch @@ -29,7 +29,7 @@ index 6c3e0540dce5f810a7822cefe59228ef77528132..ef73e0a9b916ade0be91c837a82123c9 String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName); LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath()); diff --git a/src/main/java/net/minecraft/server/Services.java b/src/main/java/net/minecraft/server/Services.java -index fd7a8e7286d5b3fa90f016c41c223f51d8307587..47d20eac70b05ec3178d2e8a2b53849f5d5c6114 100644 +index f1cc27809c1e8612f7c4fa912f5e39c07b09d808..a9b2c8cd4dcd3f884e4306bebee9334d3848fce5 100644 --- a/src/main/java/net/minecraft/server/Services.java +++ b/src/main/java/net/minecraft/server/Services.java @@ -22,12 +22,12 @@ public record Services(MinecraftSessionService sessionService, ServicesKeySet se diff --git a/patches/server/0437-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0437-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch index 287c78fef8..5c1357ca7c 100644 --- a/patches/server/0437-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch +++ b/patches/server/0437-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch @@ -9,7 +9,7 @@ itself, so the criterion object stores no references - and thus needs no cleanup. diff --git a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java -index d23e357c138be81e5b19ea4125f40ab1a0502e39..2faa43790d3b5c0ae10e386fd7eb8cbd077e17c5 100644 +index 8ae5d6bc6aa3b0bd51a88bf1ce27a01aad881b43..f0367a9cce13ef576fbb7023c0aba6eb48963606 100644 --- a/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java +++ b/src/main/java/net/minecraft/advancements/critereon/SimpleCriterionTrigger.java @@ -16,22 +16,22 @@ import net.minecraft.server.level.ServerPlayer; diff --git a/patches/server/0438-Fix-some-rails-connecting-improperly.patch b/patches/server/0438-Fix-some-rails-connecting-improperly.patch index 43b7e2bc7e..1db425010e 100644 --- a/patches/server/0438-Fix-some-rails-connecting-improperly.patch +++ b/patches/server/0438-Fix-some-rails-connecting-improperly.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix some rails connecting improperly diff --git a/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java b/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java -index 860bdc2d971beea0c7b078af1c264f743bc0da68..99d3da554d5395cf76fce96f3c0c8074bbf5507d 100644 +index 682e1cd0f4307bcc716ab82e375bd04cde095aa0..547d09c3a1cd0c5401aacb78886896365ba192e7 100644 --- a/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java +++ b/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java @@ -64,6 +64,7 @@ public abstract class BaseRailBlock extends Block implements SimpleWaterloggedBl @@ -29,7 +29,7 @@ index fe9b6c89a1f0c98a9c73a409f2aca6a4a1c0f9e7..932a2c279f46c951182d2604b525b473 boolean flag1 = false; List list = this.getInteractingMinecartOfType(world, pos, AbstractMinecart.class, (entity) -> { diff --git a/src/main/java/net/minecraft/world/level/block/RailState.java b/src/main/java/net/minecraft/world/level/block/RailState.java -index 0862968d320c37d5c5eb4c1402927ba2c672b0e5..e3b8f2720efb20424769d5d66594c93a8f047e42 100644 +index 0cbfad97371b59de95963a09aa16f3dad7a37222..d873625c1b8439a727d39ce207b5e84a1d86e5eb 100644 --- a/src/main/java/net/minecraft/world/level/block/RailState.java +++ b/src/main/java/net/minecraft/world/level/block/RailState.java @@ -17,6 +17,12 @@ public class RailState { diff --git a/patches/server/0464-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0464-Fix-Concurrency-issue-in-ShufflingList.patch index dc121b795d..07c57efa62 100644 --- a/patches/server/0464-Fix-Concurrency-issue-in-ShufflingList.patch +++ b/patches/server/0464-Fix-Concurrency-issue-in-ShufflingList.patch @@ -7,7 +7,7 @@ if multiple threads from worldgen sort at same time, it will crash. So make a copy of the list for sorting purposes. diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java -index 264eec4b22d7ad5395d0805f36079108e486c6fb..94ba40cc39270ed1c712d6dbf56387fd83613215 100644 +index 419eadbe31b86b7192fd7a63268d547705e7c7ce..b45c4f50705f80163d44d9e588f86a5770f5be38 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java @@ -17,7 +17,7 @@ public class GateBehavior implements BehaviorControl @@ -20,7 +20,7 @@ index 264eec4b22d7ad5395d0805f36079108e486c6fb..94ba40cc39270ed1c712d6dbf56387fd public GateBehavior(Map, MemoryStatus> requiredMemoryState, Set> memoriesToForgetWhenStopped, GateBehavior.OrderPolicy order, GateBehavior.RunningPolicy runMode, List, Integer>> tasks) { diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java -index 756ae3c84fea62f6b24a4b34042313a8e3873fe3..3be2217911aa4711a74654ef06bce7ff40b1dd64 100644 +index 9fb20cd00568aeea25284ea0e80fe52cb1c3eede..731ef21dbbd25d6924717de42f4569a9b5935643 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java @@ -16,12 +16,25 @@ import net.minecraft.util.RandomSource; diff --git a/patches/server/0467-Optimise-getType-calls.patch b/patches/server/0467-Optimise-getType-calls.patch index b49695e432..d135865cc4 100644 --- a/patches/server/0467-Optimise-getType-calls.patch +++ b/patches/server/0467-Optimise-getType-calls.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise getType calls Remove the map lookup for converting from Block->Bukkit Material diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockState.java b/src/main/java/net/minecraft/world/level/block/state/BlockState.java -index 9434ee6d8bfeedafe18085a3d91566aa174df43c..9eab7395caa56b3d5b448add4b68ffa0ae88bd44 100644 +index da878e180c6b94f98dc82c6e8395f63ecc9b2c1e..a9b0f5950b6f97ea4c2a1075946b92008b62c9d9 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockState.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockState.java @@ -10,6 +10,17 @@ import net.minecraft.world.level.block.state.properties.Property; diff --git a/patches/server/0470-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/server/0470-Reduce-blockpos-allocation-from-pathfinding.patch index 6654ed7514..e1ea18140b 100644 --- a/patches/server/0470-Reduce-blockpos-allocation-from-pathfinding.patch +++ b/patches/server/0470-Reduce-blockpos-allocation-from-pathfinding.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reduce blockpos allocation from pathfinding diff --git a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java -index 4774023da9f6185d522043127b33e6e79c887019..3003bbe3b73adc41ca188d958213d632f15fe97a 100644 +index 10503d6d8b6daf645cf4360ee289d5e25144c976..3583fcf5284bc5883308876dbd9886664b391e28 100644 --- a/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java +++ b/src/main/java/net/minecraft/world/level/pathfinder/WalkNodeEvaluator.java @@ -473,7 +473,7 @@ public class WalkNodeEvaluator extends NodeEvaluator { diff --git a/patches/server/0480-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/0480-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch index 33139a5ee5..9a80ce81b8 100644 --- a/patches/server/0480-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch +++ b/patches/server/0480-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch @@ -17,7 +17,7 @@ This lets us get faster foreach iteration, as well as avoids map lookups on the values when needed. diff --git a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java -index f0455efde06fd119ec42935ef367223cd8b5c662..072141047950a2b08c48033196c27b60e133a45c 100644 +index 8519383a9abd45434c1e9888e77548941a80c79c..d23481453717f715124156b5d83f6448f720d049 100644 --- a/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java +++ b/src/main/java/net/minecraft/world/level/pathfinder/PathFinder.java @@ -38,9 +38,12 @@ public class PathFinder { diff --git a/patches/server/0488-Add-PlayerItemCooldownEvent.patch b/patches/server/0488-Add-PlayerItemCooldownEvent.patch index 0511dfa6ea..751841d117 100644 --- a/patches/server/0488-Add-PlayerItemCooldownEvent.patch +++ b/patches/server/0488-Add-PlayerItemCooldownEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerItemCooldownEvent diff --git a/src/main/java/net/minecraft/world/item/ServerItemCooldowns.java b/src/main/java/net/minecraft/world/item/ServerItemCooldowns.java -index 03907dde6b09f1355ebef7183e316b29f52855e6..22d79e530d9e04d3137fb4f5c9bf735ad6d44853 100644 +index 47283d2a49209839002212e663a503a82ea86587..ce026600b3b5c846d991a0dfe599708caf2a2962 100644 --- a/src/main/java/net/minecraft/world/item/ServerItemCooldowns.java +++ b/src/main/java/net/minecraft/world/item/ServerItemCooldowns.java @@ -10,6 +10,16 @@ public class ServerItemCooldowns extends ItemCooldowns { diff --git a/patches/server/0489-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0489-Significantly-improve-performance-of-the-end-generat.patch index 44e63b011e..95f0914262 100644 --- a/patches/server/0489-Significantly-improve-performance-of-the-end-generat.patch +++ b/patches/server/0489-Significantly-improve-performance-of-the-end-generat.patch @@ -12,7 +12,7 @@ Co-authored-by: Dylan Xaldin Co-authored-by: pop4959 diff --git a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java -index 39927a9b24a033e95d09d2201323e2b87c1b4d4e..f2e53dbbe189a1a68bd91e5d18a9cd7b0db0a86e 100644 +index fac92f37c32e0398ebc05d9a0378446fcabaef1a..1beacd84bb0eee1f3e8f451fc1c514e23cc62826 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java +++ b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java @@ -490,6 +490,16 @@ public final class DensityFunctions { diff --git a/patches/server/0493-Add-PlayerShearBlockEvent.patch b/patches/server/0493-Add-PlayerShearBlockEvent.patch index 7954e6e10a..56a84bee18 100644 --- a/patches/server/0493-Add-PlayerShearBlockEvent.patch +++ b/patches/server/0493-Add-PlayerShearBlockEvent.patch @@ -39,7 +39,7 @@ index 9d61c9ada132af89292a5da7d3cce7777a961c13..61539bd963acf46f5f05865b235f9dbc entityhuman1.broadcastBreakEvent(hand); }); diff --git a/src/main/java/net/minecraft/world/level/block/PumpkinBlock.java b/src/main/java/net/minecraft/world/level/block/PumpkinBlock.java -index 49d8f7cbfae1806287fbb493d1d9eb40d476b11f..76836013f6c7329eb3d437d3855e1f3674d8d15a 100644 +index 0e8cbe7a465edc31b78b7e47a928435f9c2b6bd9..4568d1659dda897de5f6c2059629a4718d401e63 100644 --- a/src/main/java/net/minecraft/world/level/block/PumpkinBlock.java +++ b/src/main/java/net/minecraft/world/level/block/PumpkinBlock.java @@ -27,13 +27,24 @@ public class PumpkinBlock extends StemGrownBlock { diff --git a/patches/server/0497-Player-Chunk-Load-Unload-Events.patch b/patches/server/0497-Player-Chunk-Load-Unload-Events.patch index 3dc707fbc2..acdb2ea099 100644 --- a/patches/server/0497-Player-Chunk-Load-Unload-Events.patch +++ b/patches/server/0497-Player-Chunk-Load-Unload-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player Chunk Load/Unload Events diff --git a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java -index a82d550697ffd11c85542cade2950d8862e37c65..2c9d8a6fe5d67d2c7b347eb0fe99a9b284c0bfba 100644 +index c509a1318bcef38fd4927e38b6ee9846853e2d15..c442be2119fcf5b4540b0b873519c64a1367c1f4 100644 --- a/src/main/java/net/minecraft/server/network/PlayerChunkSender.java +++ b/src/main/java/net/minecraft/server/network/PlayerChunkSender.java @@ -45,6 +45,11 @@ public class PlayerChunkSender { diff --git a/patches/server/0502-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0502-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch index fe8fb164f7..456c819cfa 100644 --- a/patches/server/0502-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch +++ b/patches/server/0502-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch @@ -168,7 +168,7 @@ index 743a2adc465be5477d204185967265389d7102de..8eab7596e1f7d1beb9ab0d70d1310d26 return itemstack; diff --git a/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java b/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java -index 6dbcb1e4e7c497f88795ba633acbc97593660965..b0748adccee299c7a58c99882466ad23c29d0670 100644 +index e49bbb803399ef696665c5844a18b55a551654f6..1f2b9a9a3fa167e2ba021c823dd142b0bb18a695 100644 --- a/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java +++ b/src/main/java/net/minecraft/world/inventory/MerchantResultSlot.java @@ -47,13 +47,32 @@ public class MerchantResultSlot extends Slot { diff --git a/patches/server/0503-Implement-TargetHitEvent.patch b/patches/server/0503-Implement-TargetHitEvent.patch index feb3fe5127..78722933d9 100644 --- a/patches/server/0503-Implement-TargetHitEvent.patch +++ b/patches/server/0503-Implement-TargetHitEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement TargetHitEvent diff --git a/src/main/java/net/minecraft/world/level/block/TargetBlock.java b/src/main/java/net/minecraft/world/level/block/TargetBlock.java -index 7da9374e40a90caede4c0961529a85d14d08ff37..e219b861c00ac838be6fdfbfcf61d896adb9954b 100644 +index fdaba168dd1ed25ed8d5b4cdd89d4ad801b10388..69eaf1341d282c4783dab84533ea2c053deed529 100644 --- a/src/main/java/net/minecraft/world/level/block/TargetBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TargetBlock.java @@ -35,6 +35,10 @@ public class TargetBlock extends Block { diff --git a/patches/server/0504-MC-4-Fix-item-position-desync.patch b/patches/server/0504-MC-4-Fix-item-position-desync.patch index 650ae1bc18..5559b6862a 100644 --- a/patches/server/0504-MC-4-Fix-item-position-desync.patch +++ b/patches/server/0504-MC-4-Fix-item-position-desync.patch @@ -9,7 +9,7 @@ loss, which forces the server to lose the same precision as the client keeping them in sync. diff --git a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java -index 20baca3c790799590fcd0e9603cfc89c8b8f7ae4..a9af0cbf5232b57e5f455db7f938d225226210a3 100644 +index 05ac41e136da43284fb24a6b698ebd36318278fb..33d9131e9c75ef23cd637f5d6c39a2704a0c92a5 100644 --- a/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java +++ b/src/main/java/net/minecraft/network/protocol/game/VecDeltaCodec.java @@ -9,12 +9,12 @@ public class VecDeltaCodec { diff --git a/patches/server/0511-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/server/0511-Implement-PlayerFlowerPotManipulateEvent.patch index 980d0641d6..8f512f54d6 100644 --- a/patches/server/0511-Implement-PlayerFlowerPotManipulateEvent.patch +++ b/patches/server/0511-Implement-PlayerFlowerPotManipulateEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerFlowerPotManipulateEvent diff --git a/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java b/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java -index d8cd872d90cebd87a763dacd14a58da620bd21a5..eb085bdb072a5c37111bbc4b15bd9c614c220dff 100644 +index 9a8fc69de43fcfeebcb31c895fa4b5868952fa0a..db05c1ea847d60ad45d33cd798cb34ad3f5cfd75 100644 --- a/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FlowerPotBlock.java @@ -52,6 +52,26 @@ public class FlowerPotBlock extends Block { diff --git a/patches/server/0522-Configurable-door-breaking-difficulty.patch b/patches/server/0522-Configurable-door-breaking-difficulty.patch index f463a0dc46..4a11a39806 100644 --- a/patches/server/0522-Configurable-door-breaking-difficulty.patch +++ b/patches/server/0522-Configurable-door-breaking-difficulty.patch @@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.Zombie DOOR_BREAKING_PREDICATE Co-authored-by: Doc diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java -index 3390e816957499524b12a9dbcbc203cb80671e12..04ac0c28887109a9f8c91118f421181fa8dd667e 100644 +index 9fec5823d99d1ae8e41d9e21f7ddb8b8e94bf887..ad41bbbf5395ed18c2c9e1e692c7661a6e0cb98c 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java @@ -197,7 +197,7 @@ public class Vindicator extends AbstractIllager { diff --git a/patches/server/0543-Inline-shift-direction-fields.patch b/patches/server/0543-Inline-shift-direction-fields.patch index ed5ed4bea6..f0c71d61f2 100644 --- a/patches/server/0543-Inline-shift-direction-fields.patch +++ b/patches/server/0543-Inline-shift-direction-fields.patch @@ -7,7 +7,7 @@ Removes a layer of indirection for EnumDirection.getAdjacent(X|Y|Z)(), which is critical section for much of the server, including the lighting engine. diff --git a/src/main/java/net/minecraft/core/Direction.java b/src/main/java/net/minecraft/core/Direction.java -index 83bd9677acc13a208210f9132235c40b9ee9de23..978755027d957a3c888e5f354a2e8466cfaae582 100644 +index 3abec6de94f0ef1d788320e33653c598887f17ca..d0a8092bf57a29ab7c00ec0ddf52a9fdb2a33267 100644 --- a/src/main/java/net/minecraft/core/Direction.java +++ b/src/main/java/net/minecraft/core/Direction.java @@ -52,6 +52,11 @@ public enum Direction implements StringRepresentable { diff --git a/patches/server/0546-living-entity-allow-attribute-registration.patch b/patches/server/0546-living-entity-allow-attribute-registration.patch index 92d9093f10..680c5b9408 100644 --- a/patches/server/0546-living-entity-allow-attribute-registration.patch +++ b/patches/server/0546-living-entity-allow-attribute-registration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] living entity allow attribute registration diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java -index 2ea862bd560ffe76202d68b785f00877ccdedefd..a26106bf1b1cc715fd3c189e46d715fedb70ee15 100644 +index d5dfb08f550f5644ff5164170d6c16a3b25a3748..7204b973c3ad9239e82355513f6d538107102e48 100644 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java @@ -152,4 +152,12 @@ public class AttributeMap { diff --git a/patches/server/0550-Remove-streams-from-SensorNearest.patch b/patches/server/0550-Remove-streams-from-SensorNearest.patch index e2e8afac27..a7ae5d1a98 100644 --- a/patches/server/0550-Remove-streams-from-SensorNearest.patch +++ b/patches/server/0550-Remove-streams-from-SensorNearest.patch @@ -19,7 +19,7 @@ compared to the previous stream-based implementation. See: https://nipafx.dev/java-stream-performance/ diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java -index e376ac99fa84b36112f36a91f2ed9981e78c39b7..dc8622a07f7694b1537ba71f1e9af83bb4fa030c 100644 +index a41c3365db8e9999b686f5bf4bd888458cee43a5..1dfcc5cba6ffb463acf161a23fff1ca452184290 100644 --- a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java +++ b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java @@ -28,11 +28,15 @@ public class NearestItemSensor extends Sensor { @@ -45,7 +45,7 @@ index e376ac99fa84b36112f36a91f2ed9981e78c39b7..dc8622a07f7694b1537ba71f1e9af83b } } diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java -index 5f2a8b42e3a5abbfcc7deb23c4298d57fbcdf45d..6f0734b1321fc53c6cce3c7c6342a6b3557e24ce 100644 +index ed1b95ec694b0fe8b647964b18b8c33707fc0b47..312775d0430f793720211dc29bb293503e799d11 100644 --- a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java +++ b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java @@ -21,18 +21,25 @@ public class PlayerSensor extends Sensor { diff --git a/patches/server/0551-Improve-ServerGUI.patch b/patches/server/0551-Improve-ServerGUI.patch index c161b9c1fa..cb4eed5f13 100644 --- a/patches/server/0551-Improve-ServerGUI.patch +++ b/patches/server/0551-Improve-ServerGUI.patch @@ -59,7 +59,7 @@ index 2e93eec8733c5b548a15269a322fe4dd1f189b7d..dd9f611efc95f7d06fd3011fedd5d031 public void windowClosing(WindowEvent windowevent) { if (!servergui.isClosing.getAndSet(true)) { diff --git a/src/main/java/net/minecraft/server/gui/StatsComponent.java b/src/main/java/net/minecraft/server/gui/StatsComponent.java -index cc103d93a9603ad41ac64295dd3b50459abbd7cb..fac8a67dd8ee3894909504df8c0910f8180d6c35 100644 +index 4c5059805715bbca53196bcabd7eda550a46c34d..88f10d729aa1e0a01790521821d691a0ecd373a2 100644 --- a/src/main/java/net/minecraft/server/gui/StatsComponent.java +++ b/src/main/java/net/minecraft/server/gui/StatsComponent.java @@ -35,8 +35,17 @@ public class StatsComponent extends JComponent { diff --git a/patches/server/0552-fix-converting-txt-to-json-file.patch b/patches/server/0552-fix-converting-txt-to-json-file.patch index 37eebf53ca..98eb8e730e 100644 --- a/patches/server/0552-fix-converting-txt-to-json-file.patch +++ b/patches/server/0552-fix-converting-txt-to-json-file.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix converting txt to json file diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java b/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java -index 38c5d5d781e90f79a4e11a398667024d1a5a6dc4..b4de9051e1df53dcc98c8e7805f29aaa4ed4c007 100644 +index a20d47f54f12dfc0a5f76dd969238e34c958b618..935dac757280731bfeb0a8f033cbe315ecac46da 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedPlayerList.java @@ -18,6 +18,11 @@ public class DedicatedPlayerList extends PlayerList { diff --git a/patches/server/0554-added-PlayerNameEntityEvent.patch b/patches/server/0554-added-PlayerNameEntityEvent.patch index 262093b42b..d5a8060153 100644 --- a/patches/server/0554-added-PlayerNameEntityEvent.patch +++ b/patches/server/0554-added-PlayerNameEntityEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] added PlayerNameEntityEvent diff --git a/src/main/java/net/minecraft/world/item/NameTagItem.java b/src/main/java/net/minecraft/world/item/NameTagItem.java -index 9f5f85629ccb75ef3e7a43e594cca480445739d8..0e32ba668ca88b6de7836b8b57cff04bd485150a 100644 +index af072de68435d1678651bdf2fa13b314ca9c9d58..2941c16ef486345b57ab2dfcd26f0272285d3b5a 100644 --- a/src/main/java/net/minecraft/world/item/NameTagItem.java +++ b/src/main/java/net/minecraft/world/item/NameTagItem.java @@ -15,9 +15,14 @@ public class NameTagItem extends Item { diff --git a/patches/server/0560-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0560-Add-fast-alternative-constructor-for-Rotations.patch index 5eed2a5260..bbdcc665bb 100644 --- a/patches/server/0560-Add-fast-alternative-constructor-for-Rotations.patch +++ b/patches/server/0560-Add-fast-alternative-constructor-for-Rotations.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add fast alternative constructor for Rotations Signed-off-by: Irmo van den Berge diff --git a/src/main/java/net/minecraft/core/Rotations.java b/src/main/java/net/minecraft/core/Rotations.java -index d51027087603f4d3eae33e777afa14d2951e975e..fa527523d78fc8af1fdee238f34a43366ca85132 100644 +index e4b4e78de933b93be87805501d9cbfec429cf68c..152b1a2cb88c6456282b537611c18975d6da5f57 100644 --- a/src/main/java/net/minecraft/core/Rotations.java +++ b/src/main/java/net/minecraft/core/Rotations.java @@ -19,6 +19,18 @@ public class Rotations { diff --git a/patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch b/patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch index f9a8bcefd8..c7ef10a7bc 100644 --- a/patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch +++ b/patches/server/0593-additions-to-PlayerGameModeChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] additions to PlayerGameModeChangeEvent diff --git a/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java b/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java -index 7feb060c098a1420b559d1395f6707ed52259bbc..ded2f66b3c034c261f166a25d46ad1f473429d4c 100644 +index 50e581613156cca765dfd8e3596dcb3b58520cec..12d4c141a1bc72e53e18f73d7ee4d5a2467e08e1 100644 --- a/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java +++ b/src/main/java/net/minecraft/server/commands/DefaultGameModeCommands.java @@ -25,9 +25,13 @@ public class DefaultGameModeCommands { @@ -25,7 +25,7 @@ index 7feb060c098a1420b559d1395f6707ed52259bbc..ded2f66b3c034c261f166a25d46ad1f4 } diff --git a/src/main/java/net/minecraft/server/commands/GameModeCommand.java b/src/main/java/net/minecraft/server/commands/GameModeCommand.java -index 0d33ef5f925fff6dc5da018ee1ae32bd936dbb34..4c7af22f636f92a35a8909078be7e50dfd197153 100644 +index aee8618e27b893b72931e925724dd683d2e6d2aa..5cb15e2209d7b315904a1fc6d650ce1e75584271 100644 --- a/src/main/java/net/minecraft/server/commands/GameModeCommand.java +++ b/src/main/java/net/minecraft/server/commands/GameModeCommand.java @@ -48,9 +48,14 @@ public class GameModeCommand { diff --git a/patches/server/0597-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0597-Fix-and-optimise-world-force-upgrading.patch index f881d3694a..f890bcecbc 100644 --- a/patches/server/0597-Fix-and-optimise-world-force-upgrading.patch +++ b/patches/server/0597-Fix-and-optimise-world-force-upgrading.patch @@ -326,10 +326,10 @@ index 8236bfd8d0bdd322d1aeee7d4b1e32ae5dc1ae1f..24949c13b6e6c2297812e8a3988d4e52 return this.world; } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 390569f89b21c375357fb71d7b7730f0ea789545..16346d727a854996ec1d2adb56ebca2a9ff7ab3b 100644 +index 37144c084bd242f9c50b972f46da5ac2671ed20d..66b07ea1b1611b7194a2d3ae1fe748b760166947 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -@@ -30,6 +30,31 @@ public final class RegionFileStorage implements AutoCloseable { +@@ -30,6 +30,31 @@ public class RegionFileStorage implements AutoCloseable { this.sync = dsync; } diff --git a/patches/server/0600-Add-EntityInsideBlockEvent.patch b/patches/server/0600-Add-EntityInsideBlockEvent.patch index 8c4e87a67f..aef98d33da 100644 --- a/patches/server/0600-Add-EntityInsideBlockEvent.patch +++ b/patches/server/0600-Add-EntityInsideBlockEvent.patch @@ -41,7 +41,7 @@ index a6f245a516714615cf1f204e54eb7ab5248cafe7..54cf35b0c48d96ecfb27ff13cd685c16 if (state.getValue(BigDripleafBlock.TILT) == Tilt.NONE && BigDripleafBlock.canEntityTilt(pos, entity) && !world.hasNeighborSignal(pos)) { // CraftBukkit start - tilt dripleaf diff --git a/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java b/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java -index 505a81459374fc77e26eb42f995ed42991d5ac21..172063b79efc4ea43030b72a80e834c71983fbdc 100644 +index 42265fa901aeb2bb7a564cc94162a938208c1f90..ed36a378b79f62c3dce3da637a337595415f14ac 100644 --- a/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java +++ b/src/main/java/net/minecraft/world/level/block/BubbleColumnBlock.java @@ -40,6 +40,7 @@ public class BubbleColumnBlock extends Block implements BucketPickup { @@ -125,7 +125,7 @@ index d8ff821bf35275b8792f38ec786767026e368bba..45b427f314da778cc13da9ad6e4e1316 ResourceKey resourcekey = world.getTypeKey() == LevelStem.END ? Level.OVERWORLD : Level.END; // CraftBukkit - SPIGOT-6152: send back to main overworld in custom ends ServerLevel worldserver = ((ServerLevel) world).getServer().getLevel(resourcekey); diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java -index 29b9193fb0b5f754d5c382a90dc8dbdbab83a5e4..e1d5b42d101133c808624ef8cf3a6d39d4398d19 100644 +index b63835fe3eda974746163e7a9e26080da7538c4d..834c5e3fbff3819f3f72e95a1072d9b9e57f25b3 100644 --- a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java @@ -71,6 +71,7 @@ public class FrogspawnBlock extends Block { @@ -137,7 +137,7 @@ index 29b9193fb0b5f754d5c382a90dc8dbdbab83a5e4..e1d5b42d101133c808624ef8cf3a6d39 this.destroyBlock(world, pos); } diff --git a/src/main/java/net/minecraft/world/level/block/HoneyBlock.java b/src/main/java/net/minecraft/world/level/block/HoneyBlock.java -index 030b955bd5e0bdc3b161f66587cff13fe03e793e..c5b896251b149e08d1a4bfc832e23e93ac8dae1e 100644 +index f2206cea243b2281471bc9e939dd79971b0025eb..745f33ce496a7ce8c788f24c093b37933a74148a 100644 --- a/src/main/java/net/minecraft/world/level/block/HoneyBlock.java +++ b/src/main/java/net/minecraft/world/level/block/HoneyBlock.java @@ -54,6 +54,7 @@ public class HoneyBlock extends HalfTransparentBlock { @@ -149,7 +149,7 @@ index 030b955bd5e0bdc3b161f66587cff13fe03e793e..c5b896251b149e08d1a4bfc832e23e93 this.maybeDoSlideAchievement(entity, pos); this.doSlideMovement(entity); diff --git a/src/main/java/net/minecraft/world/level/block/HopperBlock.java b/src/main/java/net/minecraft/world/level/block/HopperBlock.java -index f6499af607b9eea1afd43b5317a89f844c5263c5..6c01126c06c92304953a75ff0b8c7eb3b62937bd 100644 +index 67833347206a913f0eb2d8d9ae14f14fe0e4d181..4311c97edd2a70e9ed8fed3fdf9471c513ddc1d4 100644 --- a/src/main/java/net/minecraft/world/level/block/HopperBlock.java +++ b/src/main/java/net/minecraft/world/level/block/HopperBlock.java @@ -200,6 +200,7 @@ public class HopperBlock extends BaseEntityBlock { @@ -161,7 +161,7 @@ index f6499af607b9eea1afd43b5317a89f844c5263c5..6c01126c06c92304953a75ff0b8c7eb3 if (blockEntity instanceof HopperBlockEntity) { HopperBlockEntity.entityInside(world, pos, state, entity, (HopperBlockEntity)blockEntity); diff --git a/src/main/java/net/minecraft/world/level/block/LavaCauldronBlock.java b/src/main/java/net/minecraft/world/level/block/LavaCauldronBlock.java -index a3ce3cb3d26be025c58618813e3a02b602335c3b..e045beb144058d8dcd2033cb3326c9a208285bdb 100644 +index f0a3ef0529951e7732602d358ddea1782001db7e..6588b207d93d96934e72176874ba60c81e9a098c 100644 --- a/src/main/java/net/minecraft/world/level/block/LavaCauldronBlock.java +++ b/src/main/java/net/minecraft/world/level/block/LavaCauldronBlock.java @@ -24,6 +24,7 @@ public class LavaCauldronBlock extends AbstractCauldronBlock { @@ -197,7 +197,7 @@ index 69f34c566bf825259253abbefd7d7ba2e847231b..a6ab0d0defc05e56a91084c498970596 // CraftBukkit start - Entity in portal EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ())); diff --git a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java -index f3a3f2c3b9adbd4c270e8fc375c7a9bd8568d7c1..b11bf1a67a3c05371bec9f18f07a6c7f0f555379 100644 +index 2762ec1b3404e8761733119a8ead0aecef328c85..20fdd6cc35bec8f707a83fb682257f68163ed6fc 100644 --- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java +++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java @@ -87,6 +87,7 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl @@ -257,7 +257,7 @@ index 63e3e6653938069557e8f6a01d5e7d4b6700345d..b13d89b1516130507402cd3b4bdb9f3c // CraftBukkit start if (!CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.AIR.defaultBlockState())) { diff --git a/src/main/java/net/minecraft/world/level/block/WebBlock.java b/src/main/java/net/minecraft/world/level/block/WebBlock.java -index 226164e437fff6c9e5cbf0b2f1a3d7db2dd98125..5c0a3b96c684c32561a1d2399b324e4c519f4a9f 100644 +index 6964308822ebf8a7027ce426062ba43a70c20c15..763fa221c562e96c2abd09c7055e91a86ac03d43 100644 --- a/src/main/java/net/minecraft/world/level/block/WebBlock.java +++ b/src/main/java/net/minecraft/world/level/block/WebBlock.java @@ -14,6 +14,7 @@ public class WebBlock extends Block { diff --git a/patches/server/0605-Add-PlayerKickEvent-causes.patch b/patches/server/0605-Add-PlayerKickEvent-causes.patch index d5b88b81b3..08fa62c12c 100644 --- a/patches/server/0605-Add-PlayerKickEvent-causes.patch +++ b/patches/server/0605-Add-PlayerKickEvent-causes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java -index 1d769b850269ecc4ecac29a8620bff1001cd2886..2499a874f7b52bced81e75eba6b995bce13391fa 100644 +index b5f54ee82905e3e6ab5bfde35ab625f5feeb1393..c0a80824a0307ea673805015119cc834b268f0dc 100644 --- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java +++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java @@ -39,7 +39,7 @@ public class SignedMessageChain { @@ -49,7 +49,7 @@ index 8f24c53f4c0d399d8583a862025da62445b1547d..ee8d5345e8ce8e0e082d82e9e52f5918 } diff --git a/src/main/java/net/minecraft/server/commands/BanIpCommands.java b/src/main/java/net/minecraft/server/commands/BanIpCommands.java -index e60796819fc412b66684b562ed4219f78ff80961..b30e5d1810d0bc24108e08508b0effb8aa964352 100644 +index 78345cf28be16b2e9bf2237ea60a3be424a8dabf..5397a5013bee9589b59c76ce5a2c00a7dc3ec262 100644 --- a/src/main/java/net/minecraft/server/commands/BanIpCommands.java +++ b/src/main/java/net/minecraft/server/commands/BanIpCommands.java @@ -62,7 +62,7 @@ public class BanIpCommands { @@ -62,7 +62,7 @@ index e60796819fc412b66684b562ed4219f78ff80961..b30e5d1810d0bc24108e08508b0effb8 return list.size(); diff --git a/src/main/java/net/minecraft/server/commands/BanPlayerCommands.java b/src/main/java/net/minecraft/server/commands/BanPlayerCommands.java -index 1056feea3ffe805d8dc29abda59a9e2ae1303c7a..e8b07b8ff40853a7d6eb049e3212fabc6ce03cef 100644 +index 46f45b315011d43c081fb3f004ab62f3da67036a..42c930443505e94ca91a02e65a8df86801034280 100644 --- a/src/main/java/net/minecraft/server/commands/BanPlayerCommands.java +++ b/src/main/java/net/minecraft/server/commands/BanPlayerCommands.java @@ -43,7 +43,7 @@ public class BanPlayerCommands { @@ -75,7 +75,7 @@ index 1056feea3ffe805d8dc29abda59a9e2ae1303c7a..e8b07b8ff40853a7d6eb049e3212fabc } } diff --git a/src/main/java/net/minecraft/server/commands/KickCommand.java b/src/main/java/net/minecraft/server/commands/KickCommand.java -index 893b86d858c6fa16dec4b5f4fa0cb76993ded030..67a66a451f72e2b504aa3f3425be41cbca1a261a 100644 +index c68bac4727f6b2ca95fc8c438303097af14286f2..bb629ec263959c8268de88ca807bddb62e9f877e 100644 --- a/src/main/java/net/minecraft/server/commands/KickCommand.java +++ b/src/main/java/net/minecraft/server/commands/KickCommand.java @@ -22,7 +22,7 @@ public class KickCommand { @@ -449,7 +449,7 @@ index 43dd6dbbc510320432aaafc1c5e4e91117fd8189..53c453814c840ce8afed27cea4c6f5e0 // CraftBukkit end diff --git a/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java b/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java -index 3f19fb1d7b52e45166836b3b38c534abecc25191..5fefb359ac93cb2731e779ece865d54f04f05add 100644 +index 6724d0a1af13e97bc1d3bd94fd43fef742a0deab..20ba0a0c9eae28658888a77dd2170f629bbcb65b 100644 --- a/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java +++ b/src/main/java/net/minecraft/world/entity/player/ProfilePublicKey.java @@ -24,7 +24,7 @@ public record ProfilePublicKey(ProfilePublicKey.Data data) { diff --git a/patches/server/0608-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0608-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch index b89286ff6b..4a44dd7ad0 100644 --- a/patches/server/0608-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch +++ b/patches/server/0608-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch @@ -14,7 +14,7 @@ contention situations. And this is extremely a low contention situation. diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index 4ba793b448691b455859b8c34d2fc5b05955c8d7..b802a1b4f81965c8440a40e8abc7fe12c877adac 100644 +index 1219200cd915d6239a32a2bd09d325cd8fa9b346..dfae0918079425df92d958b04275be8ae60d4b60 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -32,14 +32,14 @@ public class PalettedContainer implements PaletteResize, PalettedContainer diff --git a/patches/server/0611-Fix-invulnerable-end-crystals.patch b/patches/server/0611-Fix-invulnerable-end-crystals.patch index 6b25991adb..195d6b8a42 100644 --- a/patches/server/0611-Fix-invulnerable-end-crystals.patch +++ b/patches/server/0611-Fix-invulnerable-end-crystals.patch @@ -52,7 +52,7 @@ index cc3f1532a2108ea915d0e8c840e87bc56ab60a65..ffc5b68c4246a7111845230a75552bb1 } diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java -index 648587cba52a46d3a195e43b12a7a3f29640e8b0..ab93065f5f912d9f2b54dee9bdc88ea70978eb8d 100644 +index 4b685e185ebac8553f1f81d1a5a04be8166a6ca4..dbd1e440ced5d23f2f813b12808f9400a49c3f8f 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/SpikeFeature.java @@ -101,6 +101,7 @@ public class SpikeFeature extends Feature { diff --git a/patches/server/0614-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0614-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch index 9885072d78..ef457d74af 100644 --- a/patches/server/0614-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch +++ b/patches/server/0614-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning Uses an EnumMap as well as a Set paired List for O(1) contains calls. diff --git a/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java b/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java -index aebf8feb6c5e5f0793b5cfaccd7c06959c863fd5..2a7a1131ea67510a74d7b072f717f64ee253f924 100644 +index 4f4ef3349f512cc6e1588eb58de5b2558c0bd8b9..9e2f7fc64b284efd6388be35f250642c47e7603b 100644 --- a/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java +++ b/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java @@ -61,11 +61,43 @@ public class MobSpawnSettings { diff --git a/patches/server/0621-Missing-Entity-API.patch b/patches/server/0621-Missing-Entity-API.patch index 5052e9328b..85698b3120 100644 --- a/patches/server/0621-Missing-Entity-API.patch +++ b/patches/server/0621-Missing-Entity-API.patch @@ -111,7 +111,7 @@ index 0000000000000000000000000000000000000000..41bf71d116ffc5431586ce54abba7f8d + } +} diff --git a/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java b/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java -index afac0fd1d5c7f732ec0614bd64a224e2a890e45c..235e86549b691c0698f13c8438b35e76d528f0b5 100644 +index 39ed3ca76d6b64ef3917280ec822721cc02afada..86b437836cb4b1f6e8ca9acd5f1f93b925cf9e51 100644 --- a/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java +++ b/src/main/java/net/minecraft/world/entity/animal/AbstractSchoolingFish.java @@ -52,6 +52,7 @@ public abstract class AbstractSchoolingFish extends AbstractFish { diff --git a/patches/server/0631-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0631-Rate-options-and-timings-for-sensors-and-behaviors.patch index d6cfa6ea24..297c6b3a06 100644 --- a/patches/server/0631-Rate-options-and-timings-for-sensors-and-behaviors.patch +++ b/patches/server/0631-Rate-options-and-timings-for-sensors-and-behaviors.patch @@ -28,7 +28,7 @@ index 59affb62cb487d60e8c3e32decf89d6cb7d22f8d..4d861f9a58f8ea238471af22f387854d * Get a named timer for the specified tile entity type to track type specific timings. * @param entity diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java -index a298dde4e870176256986c58dc00afb350c62aa8..532d4b9e260ebea70e724bc2bf1e941d1450a1c7 100644 +index 4ea437253539e3ee533ca9da77a337cbf4d1e807..57ef7fbba3028c28231abf7b7ae78aa019323536 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java @@ -13,6 +13,10 @@ public abstract class Behavior implements BehaviorContro @@ -93,7 +93,7 @@ index a298dde4e870176256986c58dc00afb350c62aa8..532d4b9e260ebea70e724bc2bf1e941d } diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java -index afae9bca181cfc34f859016bf7a612794695d718..57d8397b9d2f087b7a0f271ad88487781a5ed44e 100644 +index 7970eebbd6935402223e6bba962bb8ba7d861dfd..fcdb9bde8e1605e30dde3e580491522d4b62cdc0 100644 --- a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java +++ b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java @@ -19,8 +19,21 @@ public abstract class Sensor { diff --git a/patches/server/0632-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/server/0632-Add-a-bunch-of-missing-forceDrop-toggles.patch index a54f0635b9..4a998000b2 100644 --- a/patches/server/0632-Add-a-bunch-of-missing-forceDrop-toggles.patch +++ b/patches/server/0632-Add-a-bunch-of-missing-forceDrop-toggles.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add a bunch of missing forceDrop toggles diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java b/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java -index d71c7d34db5c6eaee306b870e7352fdbeb2f9ba9..f3d643af2c72a3da572e7dd0e5ea5b0aad14356c 100644 +index 012586360a48369dad243dbb8892579a1dbcca90..b4f0e80c507157cb0a807070c3375c2d305b8c40 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/WorkAtComposter.java @@ -87,7 +87,9 @@ public class WorkAtComposter extends WorkAtPoi { diff --git a/patches/server/0637-Improve-boat-collision-performance.patch b/patches/server/0637-Improve-boat-collision-performance.patch index 25986af78c..d9f6854afd 100644 --- a/patches/server/0637-Improve-boat-collision-performance.patch +++ b/patches/server/0637-Improve-boat-collision-performance.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Improve boat collision performance diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index d3791c92432493f60b48fa59714b370739eb4fed..2a397fba87deb0dec89b6016b0f5113f91f35195 100644 +index 5e9401f0c2de0743aca9237ee8c4dfba586cfdb9..25b2d7016b60ee9bad0a2fb4a2c7c8ee34af50eb 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java @@ -114,6 +114,7 @@ public class Util { diff --git a/patches/server/0650-Add-BlockBreakBlockEvent.patch b/patches/server/0650-Add-BlockBreakBlockEvent.patch index 33f6a1e32d..2fd4cd307f 100644 --- a/patches/server/0650-Add-BlockBreakBlockEvent.patch +++ b/patches/server/0650-Add-BlockBreakBlockEvent.patch @@ -67,7 +67,7 @@ index f7527ed1d47901e52df4e3fffbdcd838782c90db..55208b4889f4af60f2b2b66ed6b102b2 private static short getCacheKey(BlockPos from, BlockPos to) { diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java -index a03af92483fc2865c8503a05b85d5ca0c8d2f9a2..fed9e41fc46f7afd3de27be5425f5b16894e7b9f 100644 +index 1897c0012800d5ba9d2fc386f3e2bf57c9d878bb..82e85fbbd45244d02df90fa00c9046e7f51275a2 100644 --- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java +++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java @@ -64,6 +64,13 @@ public abstract class WaterFluid extends FlowingFluid { diff --git a/patches/server/0658-Add-more-advancement-API.patch b/patches/server/0658-Add-more-advancement-API.patch index 5c803853fd..0def40b23f 100644 --- a/patches/server/0658-Add-more-advancement-API.patch +++ b/patches/server/0658-Add-more-advancement-API.patch @@ -84,7 +84,7 @@ index 0000000000000000000000000000000000000000..1705f65d897114dd0813f6d366124cef + } +} diff --git a/src/main/java/net/minecraft/advancements/DisplayInfo.java b/src/main/java/net/minecraft/advancements/DisplayInfo.java -index fedb26c5b5fe723eac0e0a6ba2ba26d0c1c42408..e2f479c5f69d0da6dd6ac804c9cc4db804de2f70 100644 +index a6ea13198a2de14d57472681b5a2b30baf3c4280..11b26d14b863075d776884544629cdd23f219298 100644 --- a/src/main/java/net/minecraft/advancements/DisplayInfo.java +++ b/src/main/java/net/minecraft/advancements/DisplayInfo.java @@ -29,6 +29,7 @@ public class DisplayInfo { diff --git a/patches/server/0661-Fix-issues-with-mob-conversion.patch b/patches/server/0661-Fix-issues-with-mob-conversion.patch index 224bba9980..237d313b89 100644 --- a/patches/server/0661-Fix-issues-with-mob-conversion.patch +++ b/patches/server/0661-Fix-issues-with-mob-conversion.patch @@ -26,7 +26,7 @@ index e88af2dcc0f7fc5190654e2640f67d706e6c8c81..8b818a7cb835512c4bd2ea9641d4bfd9 } diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index 13b567cdbc05da4e23a95e4be681b060b0064ecb..69426f5f71a57512edf4e896c79bac9a6849e17f 100644 +index 7bcd5498c734873b74bee503992ec4806ae61df7..4257f2282152aee09533c9a2e53018d3e49effa4 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -241,6 +241,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { diff --git a/patches/server/0671-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0671-Sanitize-ResourceLocation-error-logging.patch index b2e5b6290a..989716f6fd 100644 --- a/patches/server/0671-Sanitize-ResourceLocation-error-logging.patch +++ b/patches/server/0671-Sanitize-ResourceLocation-error-logging.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Sanitize ResourceLocation error logging diff --git a/src/main/java/net/minecraft/resources/ResourceLocation.java b/src/main/java/net/minecraft/resources/ResourceLocation.java -index 0185ea054848f9b400533e97ac0b9a49b81db980..3331217a504499860f3e8476cc818b985cd65398 100644 +index d3300e43523429fdd0e61c5aa9aed2e6bc78e07e..38e2a8cec48bc779b8154d6d719031f457a2403e 100644 --- a/src/main/java/net/minecraft/resources/ResourceLocation.java +++ b/src/main/java/net/minecraft/resources/ResourceLocation.java @@ -211,7 +211,7 @@ public class ResourceLocation implements Comparable { diff --git a/patches/server/0672-Optimise-general-POI-access.patch b/patches/server/0672-Optimise-general-POI-access.patch index a894a15fc8..2bed2564be 100644 --- a/patches/server/0672-Optimise-general-POI-access.patch +++ b/patches/server/0672-Optimise-general-POI-access.patch @@ -841,7 +841,7 @@ index 0000000000000000000000000000000000000000..69be1761b3b5ba7b496c1c10a4db897e + } +} diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -index 163c266ef9455cd0d05d5efece9bc410b62aa2ff..8d90517610efb7bd21e8640774293ab859300920 100644 +index 9fd6cf0c98cbf6300ef23d4aab32a6110aeba665..d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java @@ -62,7 +62,11 @@ public class AcquirePoi { @@ -858,7 +858,7 @@ index 163c266ef9455cd0d05d5efece9bc410b62aa2ff..8d90517610efb7bd21e8640774293ab8 if (path != null && path.canReach()) { BlockPos blockPos = path.getTarget(); diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java -index 1744d759bf5f2a52a3e13f4bead507fbd4429a0e..93e61d6a6df5f1eeb5f82b3d2aa45cc64de6ab42 100644 +index 33fbf72b440e0d164ecd4fb0fdec72e2394d0a1e..8db20db72cd51046213625fac46c35854c59ec5d 100644 --- a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java +++ b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java @@ -53,10 +53,12 @@ public class NearestBedSensor extends Sensor { @@ -879,7 +879,7 @@ index 1744d759bf5f2a52a3e13f4bead507fbd4429a0e..93e61d6a6df5f1eeb5f82b3d2aa45cc6 BlockPos blockPos = path.getTarget(); Optional> optional = poiManager.getType(blockPos); diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java -index bcf54eded41eb370b28807dc63d5497ce8d368cc..b42b66b40c37125d613e848de5c423655daf7ef0 100644 +index b18b896c624d5cadc02b1db9d011d82124d61d54..a0299e87bff5f86622efcc26530b9400ab928e44 100644 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java +++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiManager.java @@ -111,43 +111,62 @@ public class PoiManager extends SectionStorage { @@ -965,7 +965,7 @@ index bcf54eded41eb370b28807dc63d5497ce8d368cc..b42b66b40c37125d613e848de5c42365 public boolean release(BlockPos pos) { diff --git a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java -index b349c3836f4a63d5da3129af028fb03d002a88b4..664d7ec031f58dcdaa6ebf8dc82be6bcbd677c1a 100644 +index 795a02941d7cecb58ec45b5e79c8d510ff21163a..5308c8ddb9f2413d332fe30e1c303e6260eaa1aa 100644 --- a/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java +++ b/src/main/java/net/minecraft/world/entity/ai/village/poi/PoiSection.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; @@ -978,7 +978,7 @@ index b349c3836f4a63d5da3129af028fb03d002a88b4..664d7ec031f58dcdaa6ebf8dc82be6bc private boolean isValid; diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java -index ab829edd451fed983f88b5571b32a1c443d74350..95e0638e9fe0058c8666df57d8d6cf4be05335af 100644 +index 56f0e217276b01aed2f20a71f6849826285fc15b..087b7699c8a519923999a4bc079bf0b193ae5e7d 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/SectionStorage.java @@ -70,11 +70,11 @@ public class SectionStorage implements AutoCloseable { diff --git a/patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch index e947d9e38d..0023c8bd8c 100644 --- a/patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch +++ b/patches/server/0673-Custom-table-implementation-for-blockstate-state-loo.patch @@ -173,7 +173,7 @@ index 0000000000000000000000000000000000000000..57d0cd3ad6f972e986c72a57f1a6e360 + } +} diff --git a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java -index dd6e7d2c703b888ad372664a938bb2737c57454e..dbb13be8cd5135782fdbce02dcc60f57dcb9935b 100644 +index 89ba12d44865ecddebabbc39c769af4cd8c82702..5f285d190186a2ff5a61d05070593e1d633dd79a 100644 --- a/src/main/java/net/minecraft/world/level/block/state/StateHolder.java +++ b/src/main/java/net/minecraft/world/level/block/state/StateHolder.java @@ -39,11 +39,13 @@ public abstract class StateHolder { @@ -246,7 +246,7 @@ index dd6e7d2c703b888ad372664a938bb2737c57454e..dbb13be8cd5135782fdbce02dcc60f57 } diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java -index 7c111568b0cb15be0021c704aa1d96f4d7189928..7a585b828eb117e02b43b71cc9dc0d7105957b03 100644 +index bf7ed22094ac92a152e522bafccffb9589f84343..591ee974391c465be0e523e2da0f176436a7d567 100644 --- a/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java +++ b/src/main/java/net/minecraft/world/level/block/state/properties/BooleanProperty.java @@ -7,6 +7,13 @@ import java.util.Optional; @@ -264,7 +264,7 @@ index 7c111568b0cb15be0021c704aa1d96f4d7189928..7a585b828eb117e02b43b71cc9dc0d71 super(name, Boolean.class); } diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java -index a39d77e3f007411aacdbea5bf9facb4d70f14fbc..7e2f2170d590e04012662000b6e8542e9e77e7ce 100644 +index 2d69d1c17f734ee38667d51e6fd0a268211ec595..034b2618aa178c003c34eb621c6beb7c30958a38 100644 --- a/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java +++ b/src/main/java/net/minecraft/world/level/block/state/properties/EnumProperty.java @@ -15,6 +15,15 @@ public class EnumProperty & StringRepresentable> extends Prope @@ -299,7 +299,7 @@ index a39d77e3f007411aacdbea5bf9facb4d70f14fbc..7e2f2170d590e04012662000b6e8542e @Override diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java b/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java -index 9523762404be6443bd5d4e5d2ea07d215c40db07..a55134037f410d844de6b803bce6bdbb60443a38 100644 +index 33268d953b30d384564eee6dfab2a37fa722e465..dfeec6c580963e4a6f907e1344e2265d39326027 100644 --- a/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java +++ b/src/main/java/net/minecraft/world/level/block/state/properties/IntegerProperty.java @@ -11,6 +11,16 @@ public class IntegerProperty extends Property { @@ -320,7 +320,7 @@ index 9523762404be6443bd5d4e5d2ea07d215c40db07..a55134037f410d844de6b803bce6bdbb super(name, Integer.class); if (min < 0) { diff --git a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java -index e6bc018d5b1fc9be4881ec9f439ff16f0ecbb8b4..a74e4b5658024d02a2885486030356c411883fba 100644 +index 66b8e23d799adaf872233ea44c54330d75135544..9d4faa3da8d62028074ce25f4a728e9ba5281428 100644 --- a/src/main/java/net/minecraft/world/level/block/state/properties/Property.java +++ b/src/main/java/net/minecraft/world/level/block/state/properties/Property.java @@ -24,6 +24,17 @@ public abstract class Property> { diff --git a/patches/server/0674-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0674-Manually-inline-methods-in-BlockPosition.patch index e3df3106b7..c8b8adfce9 100644 --- a/patches/server/0674-Manually-inline-methods-in-BlockPosition.patch +++ b/patches/server/0674-Manually-inline-methods-in-BlockPosition.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Manually inline methods in BlockPosition diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index f2758e3c9447dbf307b2306c8d56bdc2d5ee7edf..cf3c1b32677143a4bcf249bd471d336ef00757b3 100644 +index 441ea6b9fd55a5288f264472d7297728d0546d6b..83cab746d1d6fe25c043c8aee28c39412b90c127 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java @@ -515,9 +515,9 @@ public class BlockPos extends Vec3i { @@ -45,7 +45,7 @@ index f2758e3c9447dbf307b2306c8d56bdc2d5ee7edf..cf3c1b32677143a4bcf249bd471d336e } // Paper end diff --git a/src/main/java/net/minecraft/core/Vec3i.java b/src/main/java/net/minecraft/core/Vec3i.java -index 509702714fa9c5565fcc766d76874a0e051e9c72..279ef2fc921a86a607a505ed179f0d736279494b 100644 +index e87ef99260bff134529e00b9a75381cecaec01a4..74a3f2ba6aaec39ba4721fb546bfccb325c86343 100644 --- a/src/main/java/net/minecraft/core/Vec3i.java +++ b/src/main/java/net/minecraft/core/Vec3i.java @@ -19,9 +19,9 @@ public class Vec3i implements Comparable { diff --git a/patches/server/0682-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0682-Oprimise-map-impl-for-tracked-players.patch index 2dc6d78481..4350d9fd37 100644 --- a/patches/server/0682-Oprimise-map-impl-for-tracked-players.patch +++ b/patches/server/0682-Oprimise-map-impl-for-tracked-players.patch @@ -7,7 +7,7 @@ Reference2BooleanOpenHashMap is going to have better lookups than HashMap. diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 9cdebd7715fca949cc390684d044235d75b89c24..567f264ec20dd9657f5618aeaafcfdf40680675f 100644 +index 4fa2076efd11a628e17d8124f3d89342a3299375..a1962946a32d73bcf2b3988482bc7c9199b8cbfc 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1775,7 +1775,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0684-Optimise-random-block-ticking.patch b/patches/server/0684-Optimise-random-block-ticking.patch index 4e1a998c42..3cb4baa38b 100644 --- a/patches/server/0684-Optimise-random-block-ticking.patch +++ b/patches/server/0684-Optimise-random-block-ticking.patch @@ -232,7 +232,7 @@ index 3cb0a648ad3f101acdbcae5d0666cf3aa0f8ce2c..bfdd623be1e84d7a761e1cd5ded7c9f7 } diff --git a/src/main/java/net/minecraft/util/BitStorage.java b/src/main/java/net/minecraft/util/BitStorage.java -index bb43cb546b614853b478ab8554f9d739ed71ebd0..b447c97b559fe27e1436a4c32618e287d5253b5f 100644 +index 68648c5a5e3ff079f832092af0f2f801c42d1ede..8bafd5fd7499ba4a04bf706cfd1e156073716e21 100644 --- a/src/main/java/net/minecraft/util/BitStorage.java +++ b/src/main/java/net/minecraft/util/BitStorage.java @@ -20,4 +20,15 @@ public interface BitStorage { @@ -252,7 +252,7 @@ index bb43cb546b614853b478ab8554f9d739ed71ebd0..b447c97b559fe27e1436a4c32618e287 + // Paper end } diff --git a/src/main/java/net/minecraft/util/SimpleBitStorage.java b/src/main/java/net/minecraft/util/SimpleBitStorage.java -index 5501b3e0aa5ab7dd4a6558b2c08936947ac8828a..8ccadc5142cd5763e22e0e592aa1bad218454237 100644 +index 2b3fd62dca2d1475075b5dcde56cea85b749cb44..e4d0d7e8fc58b8f9f614d74a141e452166e0364c 100644 --- a/src/main/java/net/minecraft/util/SimpleBitStorage.java +++ b/src/main/java/net/minecraft/util/SimpleBitStorage.java @@ -124,6 +124,28 @@ public class SimpleBitStorage implements BitStorage { @@ -285,7 +285,7 @@ index 5501b3e0aa5ab7dd4a6558b2c08936947ac8828a..8ccadc5142cd5763e22e0e592aa1bad2 public void getAll(IntConsumer action) { int i = 0; diff --git a/src/main/java/net/minecraft/util/ZeroBitStorage.java b/src/main/java/net/minecraft/util/ZeroBitStorage.java -index 86b444566a859dbc9a40a72a4bf32d4a1eb692ce..4de69718c73580070127250e0ae4a348ff063ff1 100644 +index f0f764f36fb92c64ab2dc8a0a50c3f48321c3c9a..311625277a26c9c187025a1036978229241b965f 100644 --- a/src/main/java/net/minecraft/util/ZeroBitStorage.java +++ b/src/main/java/net/minecraft/util/ZeroBitStorage.java @@ -46,6 +46,15 @@ public class ZeroBitStorage implements BitStorage { @@ -435,7 +435,7 @@ index 789664d53584c7d958572c63db22f904fb411a58..5d53b09e19b664fad337ea5098bf9cf4 public PalettedContainer getStates() { diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java -index b802a1b4f81965c8440a40e8abc7fe12c877adac..e882cef33aa0497a32513d305a8c02c4844aecb0 100644 +index dfae0918079425df92d958b04275be8ae60d4b60..79d4f2104fe941f28156355c22837bb4c3605863 100644 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java @@ -316,6 +316,14 @@ public class PalettedContainer implements PaletteResize, PalettedContainer diff --git a/patches/server/0685-Remove-streams-for-villager-AI.patch b/patches/server/0685-Remove-streams-for-villager-AI.patch index 71aa5b7098..225b1f7a12 100644 --- a/patches/server/0685-Remove-streams-for-villager-AI.patch +++ b/patches/server/0685-Remove-streams-for-villager-AI.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove streams for villager AI diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java -index 94ba40cc39270ed1c712d6dbf56387fd83613215..3cac6ca15d6c33f6d45cae439bc80f8d8d9f29e4 100644 +index b45c4f50705f80163d44d9e588f86a5770f5be38..10cbb80c7cd9ba30150d8d935c0d115719c35509 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/GateBehavior.java @@ -52,7 +52,7 @@ public class GateBehavior implements BehaviorControl @@ -99,7 +99,7 @@ index 94ba40cc39270ed1c712d6dbf56387fd83613215..3cac6ca15d6c33f6d45cae439bc80f8d } } diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java -index 3be2217911aa4711a74654ef06bce7ff40b1dd64..83313dd422c5e52ae0a4b3a6fc20e98444f4b08b 100644 +index 731ef21dbbd25d6924717de42f4569a9b5935643..fe3ab3d388f0481fb0db06b7f730f868dbf8e8a5 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/ShufflingList.java @@ -14,7 +14,7 @@ import java.util.stream.Stream; @@ -112,7 +112,7 @@ index 3be2217911aa4711a74654ef06bce7ff40b1dd64..83313dd422c5e52ae0a4b3a6fc20e984 private final boolean isUnsafe; // Paper diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java -index dc8622a07f7694b1537ba71f1e9af83bb4fa030c..41e3775f231ffdcf31f18327462120c0b50391ec 100644 +index 1dfcc5cba6ffb463acf161a23fff1ca452184290..61a164c5bfc86faa3f4d04a66e0257016cfd937d 100644 --- a/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java +++ b/src/main/java/net/minecraft/world/entity/ai/sensing/NearestItemSensor.java @@ -25,13 +25,16 @@ public class NearestItemSensor extends Sensor { @@ -137,7 +137,7 @@ index dc8622a07f7694b1537ba71f1e9af83bb4fa030c..41e3775f231ffdcf31f18327462120c0 break; } diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java -index 6f0734b1321fc53c6cce3c7c6342a6b3557e24ce..9101ed61bc42aee5b761ecd00b1c6deb36c4de16 100644 +index 312775d0430f793720211dc29bb293503e799d11..75d9c4f011b5a97def215784c92bb57bbb35d06b 100644 --- a/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java +++ b/src/main/java/net/minecraft/world/entity/ai/sensing/PlayerSensor.java @@ -21,25 +21,30 @@ public class PlayerSensor extends Sensor { diff --git a/patches/server/0686-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0686-Use-Velocity-compression-and-cipher-natives.patch index 47b4c0432c..5b7ec427b7 100644 --- a/patches/server/0686-Use-Velocity-compression-and-cipher-natives.patch +++ b/patches/server/0686-Use-Velocity-compression-and-cipher-natives.patch @@ -21,7 +21,7 @@ index b81b99a7767e3b0d3549e49529e98efdb7334101..7df1b44674ba5e826ad7c96c9d242865 runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5") runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") diff --git a/src/main/java/net/minecraft/network/CipherDecoder.java b/src/main/java/net/minecraft/network/CipherDecoder.java -index c76d406dd0ec9a65579b8cde293cff9306ce1c9d..937c47db17472f34ec6e783a81afad76ac0c252c 100644 +index 778beb445eac5769b9e4e07b4d1294c50ae2602b..c712fb8193115e1ab71b5e40fb0ccb9413062b03 100644 --- a/src/main/java/net/minecraft/network/CipherDecoder.java +++ b/src/main/java/net/minecraft/network/CipherDecoder.java @@ -7,13 +7,29 @@ import java.util.List; @@ -59,7 +59,7 @@ index c76d406dd0ec9a65579b8cde293cff9306ce1c9d..937c47db17472f34ec6e783a81afad76 + // Paper end } diff --git a/src/main/java/net/minecraft/network/CipherEncoder.java b/src/main/java/net/minecraft/network/CipherEncoder.java -index fcfbf35a76f92875bc2e2a3b2d900420d91945a8..7ed0d37ecbf79e8642e8b730d8e81abeeed653ea 100644 +index 0f3d502a9680006bcdcd7d272240a2e5c3b46790..5dd7be70603e8754d2625bb9d16900cb01b9c730 100644 --- a/src/main/java/net/minecraft/network/CipherEncoder.java +++ b/src/main/java/net/minecraft/network/CipherEncoder.java @@ -4,15 +4,32 @@ import io.netty.buffer.ByteBuf; @@ -102,7 +102,7 @@ index fcfbf35a76f92875bc2e2a3b2d900420d91945a8..7ed0d37ecbf79e8642e8b730d8e81abe + // Paper end } diff --git a/src/main/java/net/minecraft/network/CompressionDecoder.java b/src/main/java/net/minecraft/network/CompressionDecoder.java -index 64767b4e542a78e91eafb83a40ef34fb9272598f..0d519b4e51909e62e9aae24f9ee98910d0e449aa 100644 +index 2758c257cb4e2b0497bd9243c635f8fe3dbc414c..a0bab433d003de49bf55e71fd744ce47d6899182 100644 --- a/src/main/java/net/minecraft/network/CompressionDecoder.java +++ b/src/main/java/net/minecraft/network/CompressionDecoder.java @@ -13,13 +13,20 @@ public class CompressionDecoder extends ByteToMessageDecoder { @@ -171,76 +171,26 @@ index 64767b4e542a78e91eafb83a40ef34fb9272598f..0d519b4e51909e62e9aae24f9ee98910 ByteBuffer byteBuffer; if (buf.nioBufferCount() > 0) { diff --git a/src/main/java/net/minecraft/network/CompressionEncoder.java b/src/main/java/net/minecraft/network/CompressionEncoder.java -index 0a8a00b2fcaf8ac171a5cce60a50ffd37de87b57..ec7239fd6a2ecf732d2843f9426e4cb69d166ce6 100644 +index 859af8c845bae9781a62fa4acae56c6e2d449e10..ec7239fd6a2ecf732d2843f9426e4cb69d166ce6 100644 --- a/src/main/java/net/minecraft/network/CompressionEncoder.java +++ b/src/main/java/net/minecraft/network/CompressionEncoder.java -@@ -1,47 +1,100 @@ --package net.minecraft.network; -- --import io.netty.buffer.ByteBuf; --import io.netty.channel.ChannelHandlerContext; --import io.netty.handler.codec.MessageToByteEncoder; --import java.util.zip.Deflater; -- --public class CompressionEncoder extends MessageToByteEncoder { +@@ -6,21 +6,36 @@ import io.netty.handler.codec.MessageToByteEncoder; + import java.util.zip.Deflater; + + public class CompressionEncoder extends MessageToByteEncoder { - private final byte[] encodeBuf = new byte[8192]; -- private final Deflater deflater; -- private int threshold; -- -- public CompressionEncoder(int compressionThreshold) { -- this.threshold = compressionThreshold; -- this.deflater = new Deflater(); -- } -- -- protected void encode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, ByteBuf byteBuf2) { -- int i = byteBuf.readableBytes(); -- if (i < this.threshold) { -- VarInt.write(byteBuf2, 0); -- byteBuf2.writeBytes(byteBuf); -- } else { -- byte[] bs = new byte[i]; -- byteBuf.readBytes(bs); -- VarInt.write(byteBuf2, bs.length); -- this.deflater.setInput(bs, 0, i); -- this.deflater.finish(); -- -- while(!this.deflater.finished()) { -- int j = this.deflater.deflate(this.encodeBuf); -- byteBuf2.writeBytes(this.encodeBuf, 0, j); -- } -- -- this.deflater.reset(); -- } -- -- } -- -- public int getThreshold() { -- return this.threshold; -- } -- -- public void setThreshold(int compressionThreshold) { -- this.threshold = compressionThreshold; -- } --} -+package net.minecraft.network; -+ -+import io.netty.buffer.ByteBuf; -+import io.netty.channel.ChannelHandlerContext; -+import io.netty.handler.codec.MessageToByteEncoder; -+import java.util.zip.Deflater; -+ -+public class CompressionEncoder extends MessageToByteEncoder { + private final byte[] encodeBuf; // Paper -+ private final Deflater deflater; + private final Deflater deflater; + private final com.velocitypowered.natives.compression.VelocityCompressor compressor; // Paper -+ private int threshold; -+ + private int threshold; + + // Paper start -+ public CompressionEncoder(int compressionThreshold) { + public CompressionEncoder(int compressionThreshold) { + this(null, compressionThreshold); + } + public CompressionEncoder(com.velocitypowered.natives.compression.VelocityCompressor compressor, int compressionThreshold) { -+ this.threshold = compressionThreshold; + this.threshold = compressionThreshold; +- this.deflater = new Deflater(); + if (compressor == null) { + this.encodeBuf = new byte[8192]; + this.deflater = new Deflater(); @@ -250,28 +200,24 @@ index 0a8a00b2fcaf8ac171a5cce60a50ffd37de87b57..ec7239fd6a2ecf732d2843f9426e4cb6 + } + this.compressor = compressor; + // Paper end -+ } -+ + } + +- protected void encode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, ByteBuf byteBuf2) { + protected void encode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, ByteBuf byteBuf2) throws Exception { // Paper -+ int i = byteBuf.readableBytes(); -+ if (i < this.threshold) { -+ VarInt.write(byteBuf2, 0); -+ byteBuf2.writeBytes(byteBuf); -+ } else { + int i = byteBuf.readableBytes(); + if (i < this.threshold) { + VarInt.write(byteBuf2, 0); + byteBuf2.writeBytes(byteBuf); + } else { + // Paper start + if (this.deflater != null) { -+ byte[] bs = new byte[i]; -+ byteBuf.readBytes(bs); -+ VarInt.write(byteBuf2, bs.length); -+ this.deflater.setInput(bs, 0, i); -+ this.deflater.finish(); -+ -+ while(!this.deflater.finished()) { -+ int j = this.deflater.deflate(this.encodeBuf); -+ byteBuf2.writeBytes(this.encodeBuf, 0, j); -+ } -+ -+ this.deflater.reset(); + byte[] bs = new byte[i]; + byteBuf.readBytes(bs); + VarInt.write(byteBuf2, bs.length); +@@ -33,10 +48,48 @@ public class CompressionEncoder extends MessageToByteEncoder { + } + + this.deflater.reset(); + return; + } + @@ -283,10 +229,10 @@ index 0a8a00b2fcaf8ac171a5cce60a50ffd37de87b57..ec7239fd6a2ecf732d2843f9426e4cb6 + compatibleIn.release(); + } + // Paper end -+ } -+ -+ } -+ + } + + } + + // Paper start + @Override + protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, ByteBuf msg, boolean preferDirect) throws Exception{ @@ -314,14 +260,9 @@ index 0a8a00b2fcaf8ac171a5cce60a50ffd37de87b57..ec7239fd6a2ecf732d2843f9426e4cb6 + } + // Paper end + -+ public int getThreshold() { -+ return this.threshold; -+ } -+ -+ public void setThreshold(int compressionThreshold) { -+ this.threshold = compressionThreshold; -+ } -+} + public int getThreshold() { + return this.threshold; + } diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java index 07fc88f8d057c59070e5de97b91c5bf5760ff09a..8ce56c24c0d8016b03ec626341609080e7cef232 100644 --- a/src/main/java/net/minecraft/network/Connection.java diff --git a/patches/server/0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch index 72a0a453e7..429df0d968 100644 --- a/patches/server/0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch +++ b/patches/server/0687-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Reduce worldgen thread worker count for low core count CPUs diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index 2a397fba87deb0dec89b6016b0f5113f91f35195..1bff47c7305d222d2d560a4ef181b232f6275e6e 100644 +index 25b2d7016b60ee9bad0a2fb4a2c7c8ee34af50eb..a17e61f6f59eae179b76179985a9bd7a32a7e40a 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java @@ -148,7 +148,19 @@ public class Util { diff --git a/patches/server/0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch index bced5a4120..b415f668ab 100644 --- a/patches/server/0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch +++ b/patches/server/0695-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix CocaoDecorator causing a crash when trying to generate diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java b/src/main/java/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java -index 246407bc4975c013f5204ff69c4acdb6106d07fc..0251790226f75ccbaea543ddcd56503700eddab1 100644 +index 42b4b306ee89a9e422d234bdaa9b43b118f8bd0a..0fc355bd847749f7ce716b283dd571f143824795 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java @@ -25,6 +25,7 @@ public class CocoaDecorator extends TreeDecorator { diff --git a/patches/server/0700-prevent-unintended-light-block-manipulation.patch b/patches/server/0700-prevent-unintended-light-block-manipulation.patch index e2c2d2c7b4..745b4cd9b5 100644 --- a/patches/server/0700-prevent-unintended-light-block-manipulation.patch +++ b/patches/server/0700-prevent-unintended-light-block-manipulation.patch @@ -5,7 +5,7 @@ Subject: [PATCH] prevent unintended light block manipulation diff --git a/src/main/java/net/minecraft/world/level/block/LightBlock.java b/src/main/java/net/minecraft/world/level/block/LightBlock.java -index 7fca6ce9693f0e02863ab6ae61ff97bf8ed77c4a..5d210556a25da32aaf994cba2e985c0d9d7a17e8 100644 +index 6427302f53336fe035882d0a09e3e2d2d929d3b7..6eec44c484763f877aece6d9676ffc166bc10395 100644 --- a/src/main/java/net/minecraft/world/level/block/LightBlock.java +++ b/src/main/java/net/minecraft/world/level/block/LightBlock.java @@ -46,6 +46,7 @@ public class LightBlock extends Block implements SimpleWaterloggedBlock { diff --git a/patches/server/0708-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0708-Remove-client-side-code-using-deprecated-for-removal.patch index 7c1ebac907..db5dd67f1b 100644 --- a/patches/server/0708-Remove-client-side-code-using-deprecated-for-removal.patch +++ b/patches/server/0708-Remove-client-side-code-using-deprecated-for-removal.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Remove client-side code using deprecated for removal Fixes warnings on build diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index 1bff47c7305d222d2d560a4ef181b232f6275e6e..8ceb1d7c13c8b50aef988c07b94ef31d927774fc 100644 +index a17e61f6f59eae179b76179985a9bd7a32a7e40a..5c1503f5b173138fc9e918d5562a981ca8b66d06 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java @@ -910,17 +910,7 @@ public class Util { diff --git a/patches/server/0710-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0710-Prevent-sending-oversized-item-data-in-equipment-and.patch index 4d75cdac5b..b8ea5ad3dc 100644 --- a/patches/server/0710-Prevent-sending-oversized-item-data-in-equipment-and.patch +++ b/patches/server/0710-Prevent-sending-oversized-item-data-in-equipment-and.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent sending oversized item data in equipment and metadata diff --git a/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java b/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java -index c676bba2ed96ae129152de046b5f6471ae15e722..c520095022c1328993d4c462bd3b912f680b5ba9 100644 +index 97da8896865ff0bdd4fe8f2155b0830b42051bb1..9ca897d92c5bdd2764d114c74d64c776674d6beb 100644 --- a/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java +++ b/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java @@ -42,7 +42,7 @@ public class EntityDataSerializers { diff --git a/patches/server/0712-Fix-Spigot-growth-modifiers.patch b/patches/server/0712-Fix-Spigot-growth-modifiers.patch index f90533c5b9..c83c76a287 100644 --- a/patches/server/0712-Fix-Spigot-growth-modifiers.patch +++ b/patches/server/0712-Fix-Spigot-growth-modifiers.patch @@ -13,7 +13,7 @@ Co-authored-by: Noah van der Aa Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java -index ec1a3812d866021a4b746c95097ca1754f03de61..9229b1ca57264a377576eb4060436ee61d3032d6 100644 +index e628b4d6683eb0bc4f83c12480ab750ecbc1599b..ead7b37122c76d43af2cdd17af7f0da8014efb26 100644 --- a/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java +++ b/src/main/java/net/minecraft/world/level/block/CaveVinesBlock.java @@ -47,9 +47,17 @@ public class CaveVinesBlock extends GrowingPlantHeadBlock implements Bonemealabl @@ -75,7 +75,7 @@ index d123f476ce2573bf3b5ee964cf515e9b07c60cec..b325fdec8eb99ce57152a5c0fefa5059 return (BlockState) state.cycle(GrowingPlantHeadBlock.AGE); } diff --git a/src/main/java/net/minecraft/world/level/block/MangrovePropaguleBlock.java b/src/main/java/net/minecraft/world/level/block/MangrovePropaguleBlock.java -index 82db5e4d1c1d371a5d1a09b6249d8cbeb2e6dd08..82b02e53ea6f0dc0540c874c29173bfdcf48f05b 100644 +index 2aab37b35214432b472414a81c314e3b5e7f1201..cf240750aecc57d287efc986b471e66a860850ee 100644 --- a/src/main/java/net/minecraft/world/level/block/MangrovePropaguleBlock.java +++ b/src/main/java/net/minecraft/world/level/block/MangrovePropaguleBlock.java @@ -89,7 +89,7 @@ public class MangrovePropaguleBlock extends SaplingBlock implements SimpleWaterl @@ -88,7 +88,7 @@ index 82db5e4d1c1d371a5d1a09b6249d8cbeb2e6dd08..82b02e53ea6f0dc0540c874c29173bfd } diff --git a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java -index b11bf1a67a3c05371bec9f18f07a6c7f0f555379..455ad1cf57518abf7e71b8e613b1e2934ae3c93e 100644 +index 20fdd6cc35bec8f707a83fb682257f68163ed6fc..aca205d641b4a87d093b140585cf04fa4fefca86 100644 --- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java +++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java @@ -112,7 +112,7 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl diff --git a/patches/server/0715-Optimize-HashMapPalette.patch b/patches/server/0715-Optimize-HashMapPalette.patch index 0467f9dd70..9e2b26701e 100644 --- a/patches/server/0715-Optimize-HashMapPalette.patch +++ b/patches/server/0715-Optimize-HashMapPalette.patch @@ -24,7 +24,7 @@ to corrupted data. This is also something that Anti-Xray is currently relying on. diff --git a/src/main/java/net/minecraft/world/level/chunk/HashMapPalette.java b/src/main/java/net/minecraft/world/level/chunk/HashMapPalette.java -index e4eb9b8fa0e39b706e41dbe32324ff970723aed5..d07c893adf38432639c9050f1e1468ded35f8eb4 100644 +index 26e093243c70313b777483d9555fb1557443c9b8..7b7b614e5c3a30be89eeea2d25112fc9bcb3052c 100644 --- a/src/main/java/net/minecraft/world/level/chunk/HashMapPalette.java +++ b/src/main/java/net/minecraft/world/level/chunk/HashMapPalette.java @@ -20,7 +20,7 @@ public class HashMapPalette implements Palette { diff --git a/patches/server/0717-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0717-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch index cf7d1fb108..7a23969860 100644 --- a/patches/server/0717-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch +++ b/patches/server/0717-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch @@ -1403,7 +1403,7 @@ index 658fd3abef087c873ebc2833a38a111660311576..71b5d3a7ecbdc798847209c02458d11d } diff --git a/src/main/java/net/minecraft/world/level/BlockCollisions.java b/src/main/java/net/minecraft/world/level/BlockCollisions.java -index 6284701b83883e93838c7de11c6cd05eaef0c086..27afbb147cabbc778eba584b8019817baace335d 100644 +index a3eaf80b020c3bbc0306c5d17659ee661dfd275b..1b6f72932fbdd567a1534bcf15e8a610b00f974d 100644 --- a/src/main/java/net/minecraft/world/level/BlockCollisions.java +++ b/src/main/java/net/minecraft/world/level/BlockCollisions.java @@ -105,7 +105,7 @@ public class BlockCollisions extends AbstractIterator { @@ -1416,7 +1416,7 @@ index 6284701b83883e93838c7de11c6cd05eaef0c086..27afbb147cabbc778eba584b8019817b } diff --git a/src/main/java/net/minecraft/world/level/CollisionGetter.java b/src/main/java/net/minecraft/world/level/CollisionGetter.java -index bbace777cbbd5014c0115380aa05d179c0e3fe22..c5d33fe572c1d0d6bf744f4e0fe57abe23c8cd2f 100644 +index c476e37df8a75d77f5093b2a449e04f25ef2c2dd..05d91e5c09015a4064317a3a9c0d4bd06485cec9 100644 --- a/src/main/java/net/minecraft/world/level/CollisionGetter.java +++ b/src/main/java/net/minecraft/world/level/CollisionGetter.java @@ -35,31 +35,33 @@ public interface CollisionGetter extends BlockGetter { @@ -1472,7 +1472,7 @@ index bbace777cbbd5014c0115380aa05d179c0e3fe22..c5d33fe572c1d0d6bf744f4e0fe57abe default boolean noBlockCollision(@Nullable Entity entity, AABB box) { diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java -index 65aba5ddf3e53c9889ade3bf2456f6950dbdb400..a6ec4e0d95d548081ef10ee196ac602af2d063d1 100644 +index c41d0efb40f137d71b2a038dd362d17ddb2fac60..e82a56c32f4179dc6a8df97f314dc3b4370e818d 100644 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java @@ -37,7 +37,7 @@ public interface EntityGetter { @@ -1689,7 +1689,7 @@ index 5d53b09e19b664fad337ea5098bf9cf41a7168f8..f150a16fbf888455301d8b9043f0b45f public PalettedContainer getStates() { diff --git a/src/main/java/net/minecraft/world/phys/AABB.java b/src/main/java/net/minecraft/world/phys/AABB.java -index 097214481bcc933988c0aede61869b9141e4e03e..014a066e6cf098404189ef41b46f41226859b6b6 100644 +index f80783dc163997626850189f5647c06f9d15da6c..ffc76354ead6937daf366c3d87bcb51d3e4c47f5 100644 --- a/src/main/java/net/minecraft/world/phys/AABB.java +++ b/src/main/java/net/minecraft/world/phys/AABB.java @@ -25,6 +25,17 @@ public class AABB { @@ -1711,7 +1711,7 @@ index 097214481bcc933988c0aede61869b9141e4e03e..014a066e6cf098404189ef41b46f4122 this((double)pos.getX(), (double)pos.getY(), (double)pos.getZ(), (double)(pos.getX() + 1), (double)(pos.getY() + 1), (double)(pos.getZ() + 1)); } diff --git a/src/main/java/net/minecraft/world/phys/shapes/ArrayVoxelShape.java b/src/main/java/net/minecraft/world/phys/shapes/ArrayVoxelShape.java -index 33185ed85125b5c6cc3a706a144fa3bc4492e30d..f4e90c717e262dd27ab994d779c2a22bfc516790 100644 +index 9d627b8e6bf3140b894d38b9a720896e2d776369..ca5f01be5d5ccfcc56780ff93cca3824409ffc0d 100644 --- a/src/main/java/net/minecraft/world/phys/shapes/ArrayVoxelShape.java +++ b/src/main/java/net/minecraft/world/phys/shapes/ArrayVoxelShape.java @@ -6,6 +6,9 @@ import java.util.Arrays; @@ -1903,7 +1903,7 @@ index 33185ed85125b5c6cc3a706a144fa3bc4492e30d..f4e90c717e262dd27ab994d779c2a22b + } diff --git a/src/main/java/net/minecraft/world/phys/shapes/Shapes.java b/src/main/java/net/minecraft/world/phys/shapes/Shapes.java -index b073361134dbe2c5034261d32dd26a6de9af60a1..2e1fba82dc1fceab42628d944e4ef429ce46c0f9 100644 +index 9176735c08a75854209f24113b0e78332249dc4d..731c7dd15f131dc124be6af8f342b122cb89491b 100644 --- a/src/main/java/net/minecraft/world/phys/shapes/Shapes.java +++ b/src/main/java/net/minecraft/world/phys/shapes/Shapes.java @@ -19,16 +19,17 @@ public final class Shapes { @@ -2087,7 +2087,7 @@ index b073361134dbe2c5034261d32dd26a6de9af60a1..2e1fba82dc1fceab42628d944e4ef429 if (one.isEmpty() && two.isEmpty()) { return false; diff --git a/src/main/java/net/minecraft/world/phys/shapes/VoxelShape.java b/src/main/java/net/minecraft/world/phys/shapes/VoxelShape.java -index 355ae0373a8c7235045a42002e72f2c3c38b1763..97a7a9086f855a20dd28cab107ee87a9b688067a 100644 +index 15e2dfa9a17b4f19768c0cde0ad8031f0122cd33..c9b376949cefbcb6292ce393dfcdd85ff9855b11 100644 --- a/src/main/java/net/minecraft/world/phys/shapes/VoxelShape.java +++ b/src/main/java/net/minecraft/world/phys/shapes/VoxelShape.java @@ -16,11 +16,17 @@ import net.minecraft.world.phys.BlockHitResult; diff --git a/patches/server/0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch index f67ebf464e..13b66f0ec2 100644 --- a/patches/server/0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch +++ b/patches/server/0721-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch @@ -47,10 +47,10 @@ index 13ab2d2d8d0d3ab0facbae8285b09267765cc97d..a030d149d7b65d9d3983fecc77a560fb ByteBuffer bytebuffer = ByteBuffer.wrap(this.buf, 0, this.count); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 16346d727a854996ec1d2adb56ebca2a9ff7ab3b..96e5d67f9150c0962b06b2fb67222857fd948db1 100644 +index 66b07ea1b1611b7194a2d3ae1fe748b760166947..224b25f748c9a942c19349511d7a25402e31d7a2 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -@@ -239,10 +239,17 @@ public final class RegionFileStorage implements AutoCloseable { +@@ -239,10 +239,17 @@ public class RegionFileStorage implements AutoCloseable { NbtIo.write(nbt, (DataOutput) dataoutputstream); regionfile.setStatus(pos.x, pos.z, ChunkSerializer.getStatus(nbt)); // Paper - cache status on disk regionfile.setOversized(pos.x, pos.z, false); // Paper - We don't do this anymore, mojang stores differently, but clear old meta flag if it exists to get rid of our own meta file once last oversized is gone @@ -69,7 +69,7 @@ index 16346d727a854996ec1d2adb56ebca2a9ff7ab3b..96e5d67f9150c0962b06b2fb67222857 } catch (Throwable throwable1) { throwable.addSuppressed(throwable1); } -@@ -250,10 +257,7 @@ public final class RegionFileStorage implements AutoCloseable { +@@ -250,10 +257,7 @@ public class RegionFileStorage implements AutoCloseable { throw throwable; } @@ -81,7 +81,7 @@ index 16346d727a854996ec1d2adb56ebca2a9ff7ab3b..96e5d67f9150c0962b06b2fb67222857 } // Paper start return; -@@ -296,4 +300,13 @@ public final class RegionFileStorage implements AutoCloseable { +@@ -296,4 +300,13 @@ public class RegionFileStorage implements AutoCloseable { } } diff --git a/patches/server/0727-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0727-Fix-entity-type-tags-suggestions-in-selectors.patch index eb885f7a68..213b301fc1 100644 --- a/patches/server/0727-Fix-entity-type-tags-suggestions-in-selectors.patch +++ b/patches/server/0727-Fix-entity-type-tags-suggestions-in-selectors.patch @@ -118,7 +118,7 @@ index 3e5774139132b58fa447bcdf622150c0c9733a86..799f34d1ddb6c504329637a5171d06a9 this.level = MinMaxBounds.Ints.ANY; this.rotX = WrappedMinMaxBounds.ANY; diff --git a/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java b/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java -index 7389b17d81658d5484d559769ce3043f20782ee9..a281ee79d3c95af9ed56c0c4ba6360db1f702fd9 100644 +index a159ca2b6a2c6f3c69dbf4b499db57007d0df6aa..63c7c46eb5982a07b5dc0782d33e09c6c0fc44cf 100644 --- a/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java +++ b/src/main/java/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.java @@ -69,6 +69,19 @@ public class EntitySelectorOptions { diff --git a/patches/server/0728-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0728-Configurable-max-block-light-for-monster-spawning.patch index 154e279ee8..baf913d352 100644 --- a/patches/server/0728-Configurable-max-block-light-for-monster-spawning.patch +++ b/patches/server/0728-Configurable-max-block-light-for-monster-spawning.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable max block light for monster spawning diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java -index 78a170c4f2f52a6cff36b3602c9f86b3b4d95e72..eb6fc5c903a60453d33005148f3ce864203708cc 100644 +index 6e0bd0eab0b06a4ac3042496bbb91292544e9f3c..55c245d0dfa369dc6de2197ae37335fba4fae4ae 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Monster.java +++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java @@ -93,7 +93,7 @@ public abstract class Monster extends PathfinderMob implements Enemy { diff --git a/patches/server/0730-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0730-Load-effect-amplifiers-greater-than-127-correctly.patch index fd76fb0cd6..b0884e52bd 100644 --- a/patches/server/0730-Load-effect-amplifiers-greater-than-127-correctly.patch +++ b/patches/server/0730-Load-effect-amplifiers-greater-than-127-correctly.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Load effect amplifiers greater than 127 correctly MOJIRA: MC-118857 diff --git a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java -index cc802adda0364ed7249ead0454fc174a3af87d3a..587ceac5471b201e8b972da52f1c0131682f85cd 100644 +index af7889fbed11ca413124908cb174a285d6d973e2..68e1b8271475996020af50b3b2cf04cd25aa6c85 100644 --- a/src/main/java/net/minecraft/world/effect/MobEffectInstance.java +++ b/src/main/java/net/minecraft/world/effect/MobEffectInstance.java @@ -293,7 +293,7 @@ public class MobEffectInstance implements Comparable { diff --git a/patches/server/0735-Make-water-animal-spawn-height-configurable.patch b/patches/server/0735-Make-water-animal-spawn-height-configurable.patch index 246cde2404..9e90672eb5 100644 --- a/patches/server/0735-Make-water-animal-spawn-height-configurable.patch +++ b/patches/server/0735-Make-water-animal-spawn-height-configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make water animal spawn height configurable diff --git a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java -index ca3b84a6f39257b3f30d3ff8724289f31c8e1ab2..96a40a1901e7e2708bfadb6f3f6c52e5d4789311 100644 +index 36c4f9a8d3b56dd28f6291cc6958b00364f7a394..cd2ce5bcb8c30e4657cd0e340d80544c7e805905 100644 --- a/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java +++ b/src/main/java/net/minecraft/world/entity/animal/WaterAnimal.java @@ -78,6 +78,10 @@ public abstract class WaterAnimal extends PathfinderMob { diff --git a/patches/server/0739-Multiple-Entries-with-Scoreboards.patch b/patches/server/0739-Multiple-Entries-with-Scoreboards.patch index cedbf8bee2..f5b866130a 100644 --- a/patches/server/0739-Multiple-Entries-with-Scoreboards.patch +++ b/patches/server/0739-Multiple-Entries-with-Scoreboards.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Multiple Entries with Scoreboards diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java -index 6e681540711ce59183408107a8a61aff2dac1d57..30249556bc8d05c39619be04fbce082006cd2682 100644 +index ee37ec0de1ca969144824427ae42b0c81434a1b4..4ebe22ac20f1a98694cc3bec570ef5bbf06f00aa 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket.java @@ -42,6 +42,12 @@ public class ClientboundSetPlayerTeamPacket implements Packet po diff --git a/patches/server/0818-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0818-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch index 9b49730b00..3956916b04 100644 --- a/patches/server/0818-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch +++ b/patches/server/0818-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch @@ -15,7 +15,7 @@ to account for the case where the chunk is _not_ currently loaded and then later loaded. diff --git a/src/main/java/net/minecraft/world/level/gameevent/DynamicGameEventListener.java b/src/main/java/net/minecraft/world/level/gameevent/DynamicGameEventListener.java -index 6a1a3748d0ff4aa5404f7dd8fae69f59a01ec0fb..0eca3994dee50753524a2a898e6b953992335d29 100644 +index e64435c1dfbaf182d2292a1123701033f817ec38..d368ba29fec49a989be1cacd2422599d6d613c29 100644 --- a/src/main/java/net/minecraft/world/level/gameevent/DynamicGameEventListener.java +++ b/src/main/java/net/minecraft/world/level/gameevent/DynamicGameEventListener.java @@ -48,7 +48,7 @@ public class DynamicGameEventListener { diff --git a/patches/server/0829-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0829-Add-and-fix-missing-BlockFadeEvents.patch index 5aab250a66..dd7008cfb5 100644 --- a/patches/server/0829-Add-and-fix-missing-BlockFadeEvents.patch +++ b/patches/server/0829-Add-and-fix-missing-BlockFadeEvents.patch @@ -10,7 +10,7 @@ potentially waterlogged block states fading. Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java -index e1d5b42d101133c808624ef8cf3a6d39d4398d19..ceb896583630c096429e70d4c37c0c8542b342a4 100644 +index 834c5e3fbff3819f3f72e95a1072d9b9e57f25b3..294d22b6b27e96b59c77527efcfefa9410b756e4 100644 --- a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java @@ -85,6 +85,11 @@ public class FrogspawnBlock extends Block { @@ -39,7 +39,7 @@ index f99082c58743e8b73e263655dbebc34e904c45bc..e9358522e526505d5c200e19b193bbcf FallingBlockEntity.fall(world, pos, iblockdata1); } else { diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java -index bf9615adf85f1a3a3698102ec3dc159da087eb12..a7d1b55d380d8665de9f8ea55ffb3b6a84b39ca3 100644 +index 1e115adfcfee518667559100d04050f5e71c8a23..8aaa3cb2248a02b5ee25251cc837a145edd34341 100644 --- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java +++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java @@ -54,12 +54,26 @@ public class SnifferEggBlock extends Block { diff --git a/patches/server/0838-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0838-Fire-EntityChangeBlockEvent-in-more-places.patch index cad709255c..3bf6e98229 100644 --- a/patches/server/0838-Fire-EntityChangeBlockEvent-in-more-places.patch +++ b/patches/server/0838-Fire-EntityChangeBlockEvent-in-more-places.patch @@ -79,7 +79,7 @@ index 80740ca823915fb2c854f13445d81964e0e971e5..255fb5e922c63130708e4bcab208b4db }); world.levelEvent(3002, blockposition1, -1); diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java b/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java -index 38910cbe7e190d9ec1cc1971494ab2ab451a5ebd..ac60c07945d3299d9d8178223532fef92f35b8c4 100644 +index 2c443b421e342ebfbdf941a431ba20560521920b..91b68ee3605afdb845405e455c869e48a7fc9aab 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/TryLaySpawnOnWaterNearLand.java @@ -27,6 +27,12 @@ public class TryLaySpawnOnWaterNearLand { @@ -96,7 +96,7 @@ index 38910cbe7e190d9ec1cc1971494ab2ab451a5ebd..ac60c07945d3299d9d8178223532fef9 world.gameEvent(GameEvent.BLOCK_PLACE, blockPos3, GameEvent.Context.of(entity, blockState)); world.playSound((Player)null, entity, SoundEvents.FROG_LAY_SPAWN, SoundSource.BLOCKS, 1.0F, 1.0F); diff --git a/src/main/java/net/minecraft/world/item/AxeItem.java b/src/main/java/net/minecraft/world/item/AxeItem.java -index 759075e61a7fb1fe50b469e9f27689ddfced734b..464e43c68888131ad99e0b351a74fc19aae6c4ae 100644 +index 2f8ae1786a4c4438515c59fa56acaefdff60703d..18898e16ec42f6b694b06e09d9174b60d62450d7 100644 --- a/src/main/java/net/minecraft/world/item/AxeItem.java +++ b/src/main/java/net/minecraft/world/item/AxeItem.java @@ -54,6 +54,11 @@ public class AxeItem extends DiggerItem { @@ -128,7 +128,7 @@ index 1fddc9025a9e5079f05dd6c86f6ca43c5d51d9c3..6d45e3ebea6721b9c168fea572e9bd61 Block.pushEntitiesUp(iblockdata, iblockdata1, world, blockposition); world.setBlock(blockposition, iblockdata1, 2); diff --git a/src/main/java/net/minecraft/world/item/HoneycombItem.java b/src/main/java/net/minecraft/world/item/HoneycombItem.java -index debf55f490df9525ef2b4b580f27421315193eee..3732a2077568fa41e980c7f9648912070df2e1d2 100644 +index 5ab115834cddb9ab3209c11bd0fe657b06a02eb2..eaa263db594d5cf8758c8205ea06bbd37d56cdd4 100644 --- a/src/main/java/net/minecraft/world/item/HoneycombItem.java +++ b/src/main/java/net/minecraft/world/item/HoneycombItem.java @@ -39,6 +39,14 @@ public class HoneycombItem extends Item implements SignApplicator { @@ -164,7 +164,7 @@ index 8c79ca75089e739d4899421106833e42e4e57280..88df7093c47f2a90f79a55797a04d7e4 entityhuman.setItemInHand(context.getHand(), ItemUtils.createFilledResult(itemstack, entityhuman, new ItemStack(Items.GLASS_BOTTLE))); entityhuman.awardStat(Stats.ITEM_USED.get(itemstack.getItem())); diff --git a/src/main/java/net/minecraft/world/item/ShovelItem.java b/src/main/java/net/minecraft/world/item/ShovelItem.java -index 35305de996a103bed1b71b149adc93412792a14c..96b2e3b58203cf4a03076e7f9980430ac52f9dfa 100644 +index 32995cb5efdad0bc34ecacacb78cccd21220ba8d..21212462e6b415e96536a27b2c009d1562f18946 100644 --- a/src/main/java/net/minecraft/world/item/ShovelItem.java +++ b/src/main/java/net/minecraft/world/item/ShovelItem.java @@ -36,20 +36,29 @@ public class ShovelItem extends DiggerItem { diff --git a/patches/server/0839-Missing-eating-regain-reason.patch b/patches/server/0839-Missing-eating-regain-reason.patch index 3b1d56201c..e04644ebf1 100644 --- a/patches/server/0839-Missing-eating-regain-reason.patch +++ b/patches/server/0839-Missing-eating-regain-reason.patch @@ -18,7 +18,7 @@ index 40af8405c6f3ecc5a8168bb62607eb79862cefa6..de51ce9875e12961e6e549e87d76f492 } diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -index 6ebde4b17a535b9131bc589601bb7870ac1d1baf..7407d7758f47273cfea8fdb8c8269a5fe74ebf17 100644 +index 3aa98f7c282cb4884589cb83b1546b924e66f096..faf3e31f23d71bbc345bf98d4240490ac4677843 100644 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java @@ -384,7 +384,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl diff --git a/patches/server/0840-Missing-effect-cause.patch b/patches/server/0840-Missing-effect-cause.patch index 8f5ef10536..cdde105841 100644 --- a/patches/server/0840-Missing-effect-cause.patch +++ b/patches/server/0840-Missing-effect-cause.patch @@ -18,7 +18,7 @@ index c1b95715a1ae8c89ce98848332b1e9e1c905a6f5..aa850cfaa0534d57e83f37360724da24 @Override diff --git a/src/main/java/net/minecraft/world/item/HoneyBottleItem.java b/src/main/java/net/minecraft/world/item/HoneyBottleItem.java -index a50c3785bcd4374008aed35e27978de5dbd78fae..2232ad471a1f03eadc2c1503c723559a62761e8c 100644 +index c8e783014a6a09d59e85715a7fbf2a5f65201e77..5cba503c7342f66018af568be200999e14aa8d6e 100644 --- a/src/main/java/net/minecraft/world/item/HoneyBottleItem.java +++ b/src/main/java/net/minecraft/world/item/HoneyBottleItem.java @@ -28,7 +28,7 @@ public class HoneyBottleItem extends Item { @@ -31,7 +31,7 @@ index a50c3785bcd4374008aed35e27978de5dbd78fae..2232ad471a1f03eadc2c1503c723559a if (stack.isEmpty()) { diff --git a/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java b/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java -index f4e195fa7336804bd43652d2c246160e6a1fa4f3..0c2e5d536e8c3bed9def9cc07beb4498ff0e8bab 100644 +index e6d4dfdbe824cc3dbbad988cdc2ca7c7f6c7a99f..5cf732818a1f1811de2a408d9165c48a61466b3e 100644 --- a/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java +++ b/src/main/java/net/minecraft/world/item/SuspiciousStewItem.java @@ -66,7 +66,7 @@ public class SuspiciousStewItem extends Item { diff --git a/patches/server/0843-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0843-Call-BlockPhysicsEvent-more-often.patch index 7c165f10cc..ea04c3e249 100644 --- a/patches/server/0843-Call-BlockPhysicsEvent-more-often.patch +++ b/patches/server/0843-Call-BlockPhysicsEvent-more-often.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Call BlockPhysicsEvent more often diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java -index 09b5c347c934193ffae9cf1b318949c1499712ae..48fc70bd94dc0579f2c5d78972fcbd6659b8b1d5 100644 +index 7d54abc2553f4b319df4d533a0b689c1807b6102..598dc0d3a2b9387e76d7e4e19e54c4573a24bc54 100644 --- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java +++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java @@ -119,7 +119,27 @@ public class CollectingNeighborUpdater implements NeighborUpdater { diff --git a/patches/server/0846-fix-Jigsaw-block-kicking-user.patch b/patches/server/0846-fix-Jigsaw-block-kicking-user.patch index 89ff863811..6206d8d028 100644 --- a/patches/server/0846-fix-Jigsaw-block-kicking-user.patch +++ b/patches/server/0846-fix-Jigsaw-block-kicking-user.patch @@ -5,7 +5,7 @@ Subject: [PATCH] fix Jigsaw block kicking user diff --git a/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java -index 5a2144d56c9acc82118cb687cbdbe9e37a09a8f2..6086b26786d86897ea5aafe4fcce423cc7fc049e 100644 +index 8efdd41fbd14a2127a6d52577550bb781bc8c5f7..182e16c1d968707a11329150d71b7d01df6c6e52 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/JigsawBlockEntity.java @@ -109,7 +109,12 @@ public class JigsawBlockEntity extends BlockEntity { @@ -23,7 +23,7 @@ index 5a2144d56c9acc82118cb687cbdbe9e37a09a8f2..6086b26786d86897ea5aafe4fcce423c } diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool.java b/src/main/java/net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool.java -index 344a9f7f758b78bbd5e05dfb733f2ab2abf50088..1c86d40daaafc86799d2ee4d578d3f20f356431d 100644 +index 2c5165835dede1abc07ff508c820f0fe1a1027d0..194864460a5508b6b60f445d6c7923c2ae14a15b 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool.java +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool.java @@ -85,7 +85,13 @@ public class StructureTemplatePool { diff --git a/patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch index 40b263a10f..82ce18cc8d 100644 --- a/patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch +++ b/patches/server/0849-Fix-a-bunch-of-vanilla-bugs.patch @@ -85,7 +85,7 @@ index b5ea499b78970ec1575893e3b52900bf34feb3ec..e9db6b5096e7368b4a32a0e86eebccac this.setSuccess(true); return stack; diff --git a/src/main/java/net/minecraft/server/commands/DeOpCommands.java b/src/main/java/net/minecraft/server/commands/DeOpCommands.java -index bb748f081ebc630a985f82469f3dd8672e6b4f44..122764d41ac499d6aed92ab469af364cd4898328 100644 +index 40490d10649e92cf622849f1bb87538102b130c7..797efca662dcc0fe7f4cf0b4b7baa235ea044f1f 100644 --- a/src/main/java/net/minecraft/server/commands/DeOpCommands.java +++ b/src/main/java/net/minecraft/server/commands/DeOpCommands.java @@ -34,7 +34,7 @@ public class DeOpCommands { @@ -98,7 +98,7 @@ index bb748f081ebc630a985f82469f3dd8672e6b4f44..122764d41ac499d6aed92ab469af364c } } diff --git a/src/main/java/net/minecraft/server/commands/OpCommand.java b/src/main/java/net/minecraft/server/commands/OpCommand.java -index 51310c118be4270e94006dca56df8781a16abf90..87d6358f96de93295f2b6b17f02c36ad7f262d1d 100644 +index 6cd6d69a20e95e344fc18ab67dc300824537a59b..2e2a7c2cf3081187da817479a9da3eb10f662a6d 100644 --- a/src/main/java/net/minecraft/server/commands/OpCommand.java +++ b/src/main/java/net/minecraft/server/commands/OpCommand.java @@ -39,7 +39,7 @@ public class OpCommand { @@ -111,7 +111,7 @@ index 51310c118be4270e94006dca56df8781a16abf90..87d6358f96de93295f2b6b17f02c36ad } } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 567f264ec20dd9657f5618aeaafcfdf40680675f..a04cf2cb736dc327f063a5ce035af5817657b052 100644 +index a1962946a32d73bcf2b3988482bc7c9199b8cbfc..93937a1cb4526f093db74d71d2bf3bd72785ca13 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1331,7 +1331,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -150,7 +150,7 @@ index 73e2948210139e40e234b5e2107f9008f3094964..fb7a401269a2ebfc998c14e1957dfd58 this.player.server.getPlayerList().broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_GAME_MODE, this.player), this.player); // CraftBukkit this.level.updateSleepingPlayerList(); diff --git a/src/main/java/net/minecraft/world/entity/Saddleable.java b/src/main/java/net/minecraft/world/entity/Saddleable.java -index 00b07c65537e3a6afa5ea12a0bf542e41041e461..4c7b7b28f0271f9973c7ac01cd59cd48e3301305 100644 +index effe4c4fb37fe13aece70cdef4966047d4719af9..7152674d3f3fb98198585cb5ece2bb88877345f9 100644 --- a/src/main/java/net/minecraft/world/entity/Saddleable.java +++ b/src/main/java/net/minecraft/world/entity/Saddleable.java @@ -9,6 +9,11 @@ public interface Saddleable { @@ -166,7 +166,7 @@ index 00b07c65537e3a6afa5ea12a0bf542e41041e461..4c7b7b28f0271f9973c7ac01cd59cd48 default SoundEvent getSaddleSoundEvent() { return SoundEvents.HORSE_SADDLE; diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java -index d69f3f9158b67bf9e3e0a56cecdc86ede3ca1a98..a484274fd32661dab7f79c806ffcaf168d00f07d 100644 +index 9a46007245399481fb6e749d95e9e4791e799250..2afca5652541c9166278f8f2590ddb81003ae579 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/BegGoal.java @@ -65,7 +65,7 @@ public class BegGoal extends Goal { @@ -224,7 +224,7 @@ index 11cc26954b4e97114b59df35a4f9b75a09132e20..0a3f7dcc0e205a85dbaa6dee1fc9ae2c @Override diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java -index 84a1af5604fbafd81b879b6da42c916f4418ef7a..799d5e7eced99a2220d0d3e671695fa782f1159a 100644 +index 19540fd4a7f992888fadb6501d0c8a5a7e71fcf6..e241ae250f4f04a17ef2c583d00b065a4ca56a4c 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java @@ -21,6 +21,13 @@ public class SwellGoal extends Goal { @@ -309,7 +309,7 @@ index 7fe90ebc8eced53f72c7f935e40745075f02421b..fd1b5a1beea7594fa65decfdcccfa157 } else { itemstack.hurtAndBreak(1, player, (entityhuman1) -> { diff --git a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java -index 6ade6f1911731bcab6d708bffa6b911e516f5744..36bd665edec8f522962453702ea0243f4ad6310c 100644 +index f174094febfdfdc309f1b50877be60bae8a98156..5f407535298a31a34cfe114dd863fd6a9b977707 100644 --- a/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java +++ b/src/main/java/net/minecraft/world/entity/npc/CatSpawner.java @@ -87,8 +87,8 @@ public class CatSpawner implements CustomSpawner { @@ -361,7 +361,7 @@ index 685c35419de7e3c4e854a28118a243e65250ef59..0b1a0be964d799f1706c273092dc653f // Paper start io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent event = new io.papermc.paper.event.player.PlayerChangeBeaconEffectEvent((org.bukkit.entity.Player) this.player.player.getBukkitEntity(), convert(primary), convert(secondary), this.access.getLocation().getBlock()); diff --git a/src/main/java/net/minecraft/world/item/BundleItem.java b/src/main/java/net/minecraft/world/item/BundleItem.java -index d7177ac2da09317db9b83d921df23bd2017886c3..7ee08c42bc37bdaca807f520a7fd4e4a9d48ed6d 100644 +index 10b0720ce7eed58fa3cd8c8051efa6225f7d73e1..ac0bc87f60c4e1562d1301522183e449558d42f8 100644 --- a/src/main/java/net/minecraft/world/item/BundleItem.java +++ b/src/main/java/net/minecraft/world/item/BundleItem.java @@ -52,7 +52,7 @@ public class BundleItem extends Item { @@ -383,7 +383,7 @@ index d7177ac2da09317db9b83d921df23bd2017886c3..7ee08c42bc37bdaca807f520a7fd4e4a } else { ListTag listTag = compoundTag.getList("Items", 10); diff --git a/src/main/java/net/minecraft/world/item/SaddleItem.java b/src/main/java/net/minecraft/world/item/SaddleItem.java -index 7782fc6b6c83fb5bd627c9c38c32521b64dff426..d24dd85d6c9380f360346f18f10d8a9779132ae2 100644 +index ca6a2b9840c9ade87ec8effab01d4f184fe876b7..43129ecefcc8beccbcf2978f262b1ce8cf49ca43 100644 --- a/src/main/java/net/minecraft/world/item/SaddleItem.java +++ b/src/main/java/net/minecraft/world/item/SaddleItem.java @@ -18,7 +18,7 @@ public class SaddleItem extends Item { @@ -396,7 +396,7 @@ index 7782fc6b6c83fb5bd627c9c38c32521b64dff426..d24dd85d6c9380f360346f18f10d8a97 stack.shrink(1); } diff --git a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java -index dc4ee7366be64ca99b8f19899fb8fad6c28c4db5..b265703d07f6c415c625fb16c5256800deadde8f 100644 +index eba153ad0025d92ffb5d8de65f69a8e812b81533..087f3b3cc180e16195efdc0b402701fd9f5d78b4 100644 --- a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java +++ b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java @@ -45,4 +45,11 @@ public class AzaleaBlock extends BushBlock implements BonemealableBlock { diff --git a/patches/server/0854-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0854-Add-PlayerInventorySlotChangeEvent.patch index 3bb79cd34d..c24277ab39 100644 --- a/patches/server/0854-Add-PlayerInventorySlotChangeEvent.patch +++ b/patches/server/0854-Add-PlayerInventorySlotChangeEvent.patch @@ -48,7 +48,7 @@ index 1a19c6dc49cac784ca56d92ec755d6ead9811b20..176c8048f2fb3822fc14af9bfe5676c9 } diff --git a/src/main/java/net/minecraft/world/inventory/ContainerListener.java b/src/main/java/net/minecraft/world/inventory/ContainerListener.java -index 38edba4cb28adf27e50b73d0f8871135a1d45b55..1c32c25bd19e400c40031217d9f861b33dc7213e 100644 +index 0e19cc55646625bf32a354d3df2dc2d6bcff96f4..8ca9c14310b1e809662dd4ca6d35668992c2fc8d 100644 --- a/src/main/java/net/minecraft/world/inventory/ContainerListener.java +++ b/src/main/java/net/minecraft/world/inventory/ContainerListener.java @@ -5,5 +5,11 @@ import net.minecraft.world.item.ItemStack; diff --git a/patches/server/0861-Added-EntityToggleSitEvent.patch b/patches/server/0861-Added-EntityToggleSitEvent.patch index 82a47733ab..f1617cb3ca 100644 --- a/patches/server/0861-Added-EntityToggleSitEvent.patch +++ b/patches/server/0861-Added-EntityToggleSitEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Added EntityToggleSitEvent diff --git a/src/main/java/net/minecraft/world/entity/TamableAnimal.java b/src/main/java/net/minecraft/world/entity/TamableAnimal.java -index 188b4f2256058f9ebe96f3f2894dd30dc2e76b77..702efba07158330a8a747661673722223bc4d1e0 100644 +index 9fb11df7131f400e6e631146c32efccea83adf56..1282911b97292cde30dff83de756bc91bf319cb2 100644 --- a/src/main/java/net/minecraft/world/entity/TamableAnimal.java +++ b/src/main/java/net/minecraft/world/entity/TamableAnimal.java @@ -67,7 +67,7 @@ public abstract class TamableAnimal extends Animal implements OwnableEntity { @@ -69,7 +69,7 @@ index 130761afcaa6723e0a9d9a518f1b526c344484b4..683cc5f9f066d554383fcd30e3654ac0 } diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -index 7407d7758f47273cfea8fdb8c8269a5fe74ebf17..5f83d8a950c5b90bc79f9274cdd4f3c332c1d3c2 100644 +index faf3e31f23d71bbc345bf98d4240490ac4677843..1d9427da270edb447a2c8e031c4f05fe5d39603b 100644 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java @@ -556,7 +556,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl diff --git a/patches/server/0868-Prevent-compass-from-loading-chunks.patch b/patches/server/0868-Prevent-compass-from-loading-chunks.patch index 5e1b891ee5..fd21636990 100644 --- a/patches/server/0868-Prevent-compass-from-loading-chunks.patch +++ b/patches/server/0868-Prevent-compass-from-loading-chunks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent compass from loading chunks diff --git a/src/main/java/net/minecraft/world/item/CompassItem.java b/src/main/java/net/minecraft/world/item/CompassItem.java -index de09d93a4d1bce83e46a0d35416218d0d71f47d5..572785e8515576b30116cd7704805d3745caa35a 100644 +index 5d3047a420efe59063e90bfc7b42392127e0ad7d..7c4a2f8bb3efd11db2f8711952cc26a067c6d56b 100644 --- a/src/main/java/net/minecraft/world/item/CompassItem.java +++ b/src/main/java/net/minecraft/world/item/CompassItem.java @@ -77,7 +77,7 @@ public class CompassItem extends Item implements Vanishable { diff --git a/patches/server/0875-check-global-player-list-where-appropriate.patch b/patches/server/0875-check-global-player-list-where-appropriate.patch index e7c16192a5..72ac559acb 100644 --- a/patches/server/0875-check-global-player-list-where-appropriate.patch +++ b/patches/server/0875-check-global-player-list-where-appropriate.patch @@ -50,7 +50,7 @@ index 4b2cd6d34ea4081cad86041f57ccda41807d4279..807cff3fb51269b97d9aecbcc4706f0a if (entityhuman instanceof ServerPlayer) { CriteriaTriggers.CURED_ZOMBIE_VILLAGER.trigger((ServerPlayer) entityhuman, this, entityvillager); diff --git a/src/main/java/net/minecraft/world/level/EntityGetter.java b/src/main/java/net/minecraft/world/level/EntityGetter.java -index a6ec4e0d95d548081ef10ee196ac602af2d063d1..295d67bc26d0f58f737929878d243330803bf007 100644 +index e82a56c32f4179dc6a8df97f314dc3b4370e818d..8f3c767449f63fad54e45cbbb7a50352e5dbee4b 100644 --- a/src/main/java/net/minecraft/world/level/EntityGetter.java +++ b/src/main/java/net/minecraft/world/level/EntityGetter.java @@ -231,4 +231,11 @@ public interface EntityGetter { @@ -66,7 +66,7 @@ index a6ec4e0d95d548081ef10ee196ac602af2d063d1..295d67bc26d0f58f737929878d243330 + // Paper end } diff --git a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java -index b91a5294f7b0832924dfaa6c712f8014afb5c49a..076213e60538d1501a6af1fcb7bf0548d59aa736 100644 +index faad948f089575e4988d989790cc1dd13f8a79cd..5935cf23ec11ae48b6c7cec9bd696d10d808e729 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/SculkShriekerBlockEntity.java @@ -100,6 +100,13 @@ public class SculkShriekerBlockEntity extends BlockEntity implements GameEventLi diff --git a/patches/server/0881-Sync-offhand-slot-in-menus.patch b/patches/server/0881-Sync-offhand-slot-in-menus.patch index fe5d2ecac0..c8f730ce02 100644 --- a/patches/server/0881-Sync-offhand-slot-in-menus.patch +++ b/patches/server/0881-Sync-offhand-slot-in-menus.patch @@ -38,7 +38,7 @@ index 176c8048f2fb3822fc14af9bfe5676c9d0768ca3..3ef712299fe248602b0b117c0a8e285c } diff --git a/src/main/java/net/minecraft/world/inventory/ContainerSynchronizer.java b/src/main/java/net/minecraft/world/inventory/ContainerSynchronizer.java -index 9421108170f88642488b8621b4b725b0cdd29a6f..42165e8daaba3df1ef3b489d8527ad993f5ed317 100644 +index ff4fa86f9408e83e505f7e27692d3423f8570c48..db6c290dcbb8f5cb502f85e154b42ac89350a460 100644 --- a/src/main/java/net/minecraft/world/inventory/ContainerSynchronizer.java +++ b/src/main/java/net/minecraft/world/inventory/ContainerSynchronizer.java @@ -6,6 +6,7 @@ import net.minecraft.world.item.ItemStack; diff --git a/patches/server/0882-Player-Entity-Tracking-Events.patch b/patches/server/0882-Player-Entity-Tracking-Events.patch index 31b3e67774..470f1edb23 100644 --- a/patches/server/0882-Player-Entity-Tracking-Events.patch +++ b/patches/server/0882-Player-Entity-Tracking-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player Entity Tracking Events diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index a04cf2cb736dc327f063a5ce035af5817657b052..0f543ccb5363037647f471d21171ab0ed3d0d993 100644 +index 93937a1cb4526f093db74d71d2bf3bd72785ca13..3dabfece31e57bdd1d416cdb0f30ac942842be49 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1847,9 +1847,18 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider diff --git a/patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch index caece0e10a..f13dac0c4e 100644 --- a/patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch +++ b/patches/server/0885-Fixes-and-additions-to-the-SpawnReason-API.patch @@ -21,7 +21,7 @@ index 5981b2bd5745ac32cdb377c15c4384d074a47680..0d38fe5a88af0afce85b8be7051d0e2f @Nullable diff --git a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java -index 52eb930c5425bc4db32e65ac2b1fb07300617725..09ae4e30445354f7628e3368321700a119f3eeef 100644 +index 9652e3385ad10e5d825dd141f6be3522c596916d..6256ce68d6ecada66745fb09360cba2bf991360c 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java +++ b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java @@ -54,7 +54,7 @@ public class DragonFireball extends AbstractHurtingProjectile { @@ -57,7 +57,7 @@ index 41a74780ce9edc8442732b04785396c245ee5c32..23c487e295b3b736d8800f0c884324c9 } CarvedPumpkinBlock.clearPatternBlocks(world, patternResult); // CraftBukkit - from above diff --git a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java -index ceb896583630c096429e70d4c37c0c8542b342a4..4f4cec646c058e9da43b1f0a7a7fc5efff563641 100644 +index 294d22b6b27e96b59c77527efcfefa9410b756e4..bebcdc70c4cb01764428836fff76f03b94f2eae8 100644 --- a/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FrogspawnBlock.java @@ -110,7 +110,7 @@ public class FrogspawnBlock extends Block { @@ -70,7 +70,7 @@ index ceb896583630c096429e70d4c37c0c8542b342a4..4f4cec646c058e9da43b1f0a7a7fc5ef } diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java -index a7d1b55d380d8665de9f8ea55ffb3b6a84b39ca3..eb9ded37f98aa97f754ac1d02529d19ea101bb8b 100644 +index 8aaa3cb2248a02b5ee25251cc837a145edd34341..ecb8224beb0ee65855c7529b69ea56b7b6674664 100644 --- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java +++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java @@ -81,7 +81,7 @@ public class SnifferEggBlock extends Block { diff --git a/patches/server/0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch index 8d2bc0c084..4cc9cc8398 100644 --- a/patches/server/0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch +++ b/patches/server/0887-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch @@ -52,7 +52,7 @@ index 04b27d3797057b80e71d2d32c9e31c3fba39c86b..525632059dc7cf911ce485e925a3c8d6 } diff --git a/src/main/java/net/minecraft/world/level/material/FluidState.java b/src/main/java/net/minecraft/world/level/material/FluidState.java -index 8231708fe2a3a6a156cc72b0f25f1c0f1600f478..a4a973f2a9e154f9d6d7088f458bf9893bc91783 100644 +index ea2a04e5298832177fac93568656ac45784d5eb6..27f136815afc360387704fa1f2773e3816cccff6 100644 --- a/src/main/java/net/minecraft/world/level/material/FluidState.java +++ b/src/main/java/net/minecraft/world/level/material/FluidState.java @@ -26,8 +26,12 @@ public final class FluidState extends StateHolder { diff --git a/patches/server/0891-Improve-logging-and-errors.patch b/patches/server/0891-Improve-logging-and-errors.patch index 9ff189072a..6dfa0e48af 100644 --- a/patches/server/0891-Improve-logging-and-errors.patch +++ b/patches/server/0891-Improve-logging-and-errors.patch @@ -18,7 +18,7 @@ index 9c260a029eea77c4bc47596458e2f77f1c9dc1c2..74dab2bc00ea3ea4fa1d93f73a51129d } diff --git a/src/main/java/net/minecraft/server/packs/PathPackResources.java b/src/main/java/net/minecraft/server/packs/PathPackResources.java -index 6c985e5087ceaa3935827236c57f43bb24062812..90668194a25a56d191c7e89ef332be3d19f5a8e8 100644 +index 89aa86a49eda563c82ccedc99641e699f8e578b0..4822f94ce183a99ad9e0d1bdc6c5708d958f6104 100644 --- a/src/main/java/net/minecraft/server/packs/PathPackResources.java +++ b/src/main/java/net/minecraft/server/packs/PathPackResources.java @@ -108,6 +108,12 @@ public class PathPackResources extends AbstractPackResources { diff --git a/patches/server/0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch index 827905b05c..efaf1a6e90 100644 --- a/patches/server/0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch +++ b/patches/server/0906-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch @@ -10,7 +10,7 @@ https://bugs.mojang.com/browse/MC-157464 https://github.com/PaperMC/Paper/issues/8569 diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java -index 074668db1cd0e1c7c226591067e7b25774967028..ca669bb41afe545e3f177afafc3d2849b60b3cce 100644 +index 9400556aca4cd06ad311975d74a9e7eb2ccd9c73..cd7a90ec1073b2b452ca70decefe6a594445003b 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/VillagerGoalPackages.java @@ -22,7 +22,7 @@ public class VillagerGoalPackages { diff --git a/patches/server/0908-Add-EntityFertilizeEggEvent.patch b/patches/server/0908-Add-EntityFertilizeEggEvent.patch index 37d66afe3b..a55692c021 100644 --- a/patches/server/0908-Add-EntityFertilizeEggEvent.patch +++ b/patches/server/0908-Add-EntityFertilizeEggEvent.patch @@ -29,7 +29,7 @@ index 5f57f13d50e051c621e401b63c0b55b3a2a73fa3..490472bb618e9ac07da5883a71dff892 } diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java -index 73d2973f604ccd0403abcee6a7eacb96e9df2e29..c2c5f80db9dbdedbdea410442a4279b81423a264 100644 +index 7d1e6427ab5f2dabe9072d092d733b0ff34e0b44..5000ebc5f19dee72a86360062b822aecd60beb47 100644 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java @@ -244,7 +244,12 @@ public class Frog extends Animal implements VariantHolder { diff --git a/patches/server/0913-Fix-text-display-error-on-spawn.patch b/patches/server/0913-Fix-text-display-error-on-spawn.patch index 0a12a833f5..43191b58fb 100644 --- a/patches/server/0913-Fix-text-display-error-on-spawn.patch +++ b/patches/server/0913-Fix-text-display-error-on-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix text display error on spawn diff --git a/src/main/java/net/minecraft/world/entity/Display.java b/src/main/java/net/minecraft/world/entity/Display.java -index 043928f5c86c8a818237a0aeeb9b06ca64a9801b..5906b59967368737bb945a54acc8257f3b8a011b 100644 +index 355800fe33a24b47379a14139711459a54e90c5a..ec4325b90b5707e97927b95064ef4dd840b2a538 100644 --- a/src/main/java/net/minecraft/world/entity/Display.java +++ b/src/main/java/net/minecraft/world/entity/Display.java @@ -862,7 +862,7 @@ public abstract class Display extends Entity { diff --git a/patches/server/0918-Optimize-Hoppers.patch b/patches/server/0918-Optimize-Hoppers.patch index 08a00255ee..1c11d8da9a 100644 --- a/patches/server/0918-Optimize-Hoppers.patch +++ b/patches/server/0918-Optimize-Hoppers.patch @@ -581,7 +581,7 @@ index f98367830e87d5f1428448931f756d9277699563..e2e845a01e43bc01aba7a148d2b2d55b @Override diff --git a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java -index 205ea28e9b60fbfac8c7e700a596d83747c54582..6fe3e92d4a040dddd4326c99815a5218f9a59338 100644 +index e11618247ad889fa8fadbb2c7addd0de94caf249..081691f9710ff1115e4308f79ed49fbc38941193 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/RandomizableContainerBlockEntity.java @@ -95,12 +95,19 @@ public abstract class RandomizableContainerBlockEntity extends BaseContainerBloc diff --git a/patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch index 633b9a2469..3c9dd41d35 100644 --- a/patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch +++ b/patches/server/0923-Prevent-causing-expired-keys-from-impacting-new-join.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent causing expired keys from impacting new joins diff --git a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java -index 184c7325343122c10961be8caff71213f370f968..7953520253df504ae94b204e5bec8dcdc1ba8cc9 100644 +index 40ac5cf19934207f06755fbea02d4626d7aa0511..32e3f347e2e025e2675e9410116386e472bd6a79 100644 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket.java @@ -96,7 +96,13 @@ public class ClientboundPlayerInfoUpdatePacket implements Packet extends DelegatingOps { diff --git a/patches/server/0941-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0941-Call-BlockGrowEvent-for-missing-blocks.patch index 6c80dd5f01..69fc87cf3f 100644 --- a/patches/server/0941-Call-BlockGrowEvent-for-missing-blocks.patch +++ b/patches/server/0941-Call-BlockGrowEvent-for-missing-blocks.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Call BlockGrowEvent for missing blocks Call the event for pitcher crops and sniffer egg diff --git a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java -index 455ad1cf57518abf7e71b8e613b1e2934ae3c93e..833898247ac300b37766a487828dbe66dd45ed13 100644 +index aca205d641b4a87d093b140585cf04fa4fefca86..1641453fd17938bc8fcdba7f89a0515ebeef20c5 100644 --- a/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java +++ b/src/main/java/net/minecraft/world/level/block/PitcherCropBlock.java @@ -123,7 +123,7 @@ public class PitcherCropBlock extends DoublePlantBlock implements BonemealableBl @@ -19,7 +19,7 @@ index 455ad1cf57518abf7e71b8e613b1e2934ae3c93e..833898247ac300b37766a487828dbe66 world.setBlock(pos.above(), blockState.setValue(HALF, DoubleBlockHalf.UPPER), 3); } diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java -index eb9ded37f98aa97f754ac1d02529d19ea101bb8b..7ea7b70e87b03b5e2bfc5a5823b8eb0eeb0f138c 100644 +index ecb8224beb0ee65855c7529b69ea56b7b6674664..fab44502b3e22eb8d1311068f88290ce31adb437 100644 --- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java +++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java @@ -65,8 +65,13 @@ public class SnifferEggBlock extends Block { diff --git a/patches/server/0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch index ca604e3a8c..cfcf15909a 100644 --- a/patches/server/0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch +++ b/patches/server/0947-Fix-incorrect-crafting-result-amount-for-fireworks.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Fix incorrect crafting result amount for fireworks Although vanilla does not specifically call this method anywhere, this fixes a bug where the result using the Bukkit API returns the wrong amount. diff --git a/src/main/java/net/minecraft/world/item/crafting/FireworkRocketRecipe.java b/src/main/java/net/minecraft/world/item/crafting/FireworkRocketRecipe.java -index 129f16dc1416732b7a2121346b0571f475c48c97..e5035cce1df5a10bc5a7216156823abe0454f257 100644 +index af7e7a63eacad2367453924806ffb002c33db951..25405c8eb76e428e689b3afad2c00529f687f550 100644 --- a/src/main/java/net/minecraft/world/item/crafting/FireworkRocketRecipe.java +++ b/src/main/java/net/minecraft/world/item/crafting/FireworkRocketRecipe.java @@ -81,7 +81,7 @@ public class FireworkRocketRecipe extends CustomRecipe { diff --git a/patches/server/0952-Add-option-to-disable-block-updates.patch b/patches/server/0952-Add-option-to-disable-block-updates.patch index 08168b9ebb..ae431df4ef 100644 --- a/patches/server/0952-Add-option-to-disable-block-updates.patch +++ b/patches/server/0952-Add-option-to-disable-block-updates.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to disable block updates diff --git a/src/main/java/net/minecraft/world/level/block/ChorusPlantBlock.java b/src/main/java/net/minecraft/world/level/block/ChorusPlantBlock.java -index e7dd1dd1f489597b624c736ab014e97ff95e4557..c14c75ee15a20a777b48fb36a116a70118416d19 100644 +index a6c25647fb37f59307de0d390f8e8cf55504d7d3..2e8bf4463b8da8da50cd14d3f84aba5e930e5710 100644 --- a/src/main/java/net/minecraft/world/level/block/ChorusPlantBlock.java +++ b/src/main/java/net/minecraft/world/level/block/ChorusPlantBlock.java @@ -21,6 +21,7 @@ public class ChorusPlantBlock extends PipeBlock { @@ -41,7 +41,7 @@ index e7dd1dd1f489597b624c736ab014e97ff95e4557..c14c75ee15a20a777b48fb36a116a701 boolean bl = !world.getBlockState(pos.above()).isAir() && !blockState.isAir(); diff --git a/src/main/java/net/minecraft/world/level/block/HugeMushroomBlock.java b/src/main/java/net/minecraft/world/level/block/HugeMushroomBlock.java -index 178d38268026e3ec8e945297b58e97c2d29f269e..eac804138bdd9054727e63f6790fc9ed269b1f56 100644 +index 3c6d97b51c6fec130b80e5965afa2c49d48843c9..1dd44eb0ab977093660e8fe6f49338e7f5ef7b28 100644 --- a/src/main/java/net/minecraft/world/level/block/HugeMushroomBlock.java +++ b/src/main/java/net/minecraft/world/level/block/HugeMushroomBlock.java @@ -27,6 +27,7 @@ public class HugeMushroomBlock extends Block { diff --git a/patches/server/0961-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0961-Determine-lava-and-water-fluid-explosion-resistance-.patch index b7fa2fbe11..05fb1ac2ac 100644 --- a/patches/server/0961-Determine-lava-and-water-fluid-explosion-resistance-.patch +++ b/patches/server/0961-Determine-lava-and-water-fluid-explosion-resistance-.patch @@ -22,7 +22,7 @@ index 72f8b72c6436ca3b8eaeb39c7d3efe2c1462ae1d..c3f8e1e2dd89c168b8b4a15b589109db @Override diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java -index fed9e41fc46f7afd3de27be5425f5b16894e7b9f..97cf555c9111efb155cb8934468f26ebdafbb609 100644 +index 82e85fbbd45244d02df90fa00c9046e7f51275a2..d280c98aed5262c4ce39526c917de884f25a8584 100644 --- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java +++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java @@ -109,7 +109,7 @@ public abstract class WaterFluid extends FlowingFluid { diff --git a/patches/server/0965-Don-t-tick-signs.patch b/patches/server/0965-Don-t-tick-signs.patch index 5abb37a1b0..759f4ef4d2 100644 --- a/patches/server/0965-Don-t-tick-signs.patch +++ b/patches/server/0965-Don-t-tick-signs.patch @@ -9,7 +9,7 @@ Minecraft now ticks signs in order to validate the playerWhoMayEdit field. This private net.minecraft.world.level.block.entity.SignBlockEntity playerWhoMayEdit diff --git a/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java b/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java -index 1af2e9eb1dcc8cf90afd38ea0fbe1b65396455f4..d94ea22e357e0606ceff9d1153d45e96ca3a0ffc 100644 +index 6c9d163b9f857806461dc72e54713f1a4f3a5c31..0bd8ea3143b2e9755d492af4596622d1dca1afaf 100644 --- a/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java +++ b/src/main/java/net/minecraft/world/level/block/CeilingHangingSignBlock.java @@ -144,6 +144,6 @@ public class CeilingHangingSignBlock extends SignBlock { @@ -33,7 +33,7 @@ index 0c1c6fbcf625da4a28514e0d040deb6c98ba9507..614777d15bcf4141a89d0a0f7bd88052 } } diff --git a/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java b/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java -index 3a89fd4fe175b6e209548e5c98d18ce3fcff07b9..dd177d67fbb08508e634140a829b13a9f71327b9 100644 +index d818d3ea6d28aa6ffb62127d4efd585d6f2935d1..ae232311f12c72ff62d3d18f25e3ebf46ce1ace2 100644 --- a/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java +++ b/src/main/java/net/minecraft/world/level/block/WallHangingSignBlock.java @@ -167,6 +167,6 @@ public class WallHangingSignBlock extends SignBlock { diff --git a/patches/server/0967-Add-whitelist-events.patch b/patches/server/0967-Add-whitelist-events.patch index 0111ca6f4f..42eff5bfe1 100644 --- a/patches/server/0967-Add-whitelist-events.patch +++ b/patches/server/0967-Add-whitelist-events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add whitelist events diff --git a/src/main/java/net/minecraft/server/players/UserWhiteList.java b/src/main/java/net/minecraft/server/players/UserWhiteList.java -index ccbeed395f018009ec8d549302863a5b7f2d00c1..2e1902ec563db14b353629024df54034ab80cddf 100644 +index a6c70decad1a496595944a5dd2aeeb387757fef3..e5c218833f5bcb1c908cd62bdc57cc5152d37be5 100644 --- a/src/main/java/net/minecraft/server/players/UserWhiteList.java +++ b/src/main/java/net/minecraft/server/players/UserWhiteList.java @@ -30,4 +30,23 @@ public class UserWhiteList extends StoredUserList recipeholder = (RecipeHolder) optional.get(); diff --git a/src/main/java/net/minecraft/world/inventory/ResultSlot.java b/src/main/java/net/minecraft/world/inventory/ResultSlot.java -index 82f225f4fa43118009e5434f63962adf658b651c..fdd1f75198b201278a2ef23ee56a179e8e719190 100644 +index 525ba0bdc4c6782480930bea94f73a72efe6fc4c..2554f7b1d687f83f42d69bf8ab54336ba793e301 100644 --- a/src/main/java/net/minecraft/world/inventory/ResultSlot.java +++ b/src/main/java/net/minecraft/world/inventory/ResultSlot.java @@ -59,7 +59,7 @@ public class ResultSlot extends Slot { diff --git a/patches/server/1002-Configure-sniffer-egg-hatch-time.patch b/patches/server/1002-Configure-sniffer-egg-hatch-time.patch index 992c6d1abc..6c035ed11f 100644 --- a/patches/server/1002-Configure-sniffer-egg-hatch-time.patch +++ b/patches/server/1002-Configure-sniffer-egg-hatch-time.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configure sniffer egg hatch time diff --git a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java -index 7ea7b70e87b03b5e2bfc5a5823b8eb0eeb0f138c..84aec5dc1e59e77a1d84adfe6e9514862935f300 100644 +index fab44502b3e22eb8d1311068f88290ce31adb437..16c5be04658a66ff94f2aad8782e34f450e9a729 100644 --- a/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java +++ b/src/main/java/net/minecraft/world/level/block/SnifferEggBlock.java @@ -56,7 +56,7 @@ public class SnifferEggBlock extends Block { diff --git a/patches/server/1004-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/1004-Skip-POI-finding-if-stuck-in-vehicle.patch index fb811b0686..e45ced771d 100644 --- a/patches/server/1004-Skip-POI-finding-if-stuck-in-vehicle.patch +++ b/patches/server/1004-Skip-POI-finding-if-stuck-in-vehicle.patch @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java -index 8d90517610efb7bd21e8640774293ab859300920..79ca0992c7d0e81d955a6bbd54e29a6c293da1ea 100644 +index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..8f8b29f80d1573981ccffd207dd6e0941e71a352 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/AcquirePoi.java @@ -47,6 +47,7 @@ public class AcquirePoi {