From 662b6c5ca8e32ac88585ca7a166251a3aeed7cff Mon Sep 17 00:00:00 2001 From: Bjarne Koll Date: Fri, 22 Sep 2023 14:33:54 +0200 Subject: [PATCH] Port sidebar slots patch --- patches/server/0005-Paper-config-files.patch | 2 +- patches/server/0008-CB-fixes.patch | 2 +- patches/server/0009-MC-Utils.patch | 2 +- patches/server/0014-Timings-v2.patch | 2 +- patches/server/0032-Entity-Origin-API.patch | 2 +- patches/server/0041-Disable-thunder.patch | 2 +- .../server/0042-Disable-ice-and-snow.patch | 2 +- .../server/0070-Add-World-Util-Methods.patch | 2 +- ...le-spawn-chances-for-skeleton-horses.patch | 2 +- ...ckPhysicsEvent-if-a-plugin-has-a-lis.patch | 2 +- ...Entity-AddTo-RemoveFrom-World-Events.patch | 2 +- ...g-BlockPlaceEvent-triggering-physics.patch | 2 +- ...item-frames-performance-and-bug-fixe.patch | 2 +- ...0191-Block-Enderpearl-Travel-Exploit.patch | 2 +- ...ld.spawnParticle-API-and-add-Builder.patch | 2 +- .../0215-InventoryCloseEvent-Reason-API.patch | 2 +- ...ies-option-to-debug-dupe-uuid-issues.patch | 2 +- .../0299-Entity-getEntitySpawnReason.patch | 2 +- ...le-Keep-Spawn-Loaded-range-per-world.patch | 2 +- ...ptimise-EntityGetter-getPlayerByUUID.patch | 2 +- .../0334-Entity-Activation-Range-2.0.patch | 2 +- .../0343-Add-debug-for-sync-chunk-loads.patch | 2 +- ...-PlayerChunkMap-adds-crashing-server.patch | 2 +- ...ktraces-in-log-messages-crash-report.patch | 2 +- ...-incremental-chunk-and-player-saving.patch | 2 +- ...geEvent-not-firing-for-all-use-cases.patch | 2 +- ...p-capture-to-capture-all-items-added.patch | 2 +- patches/server/0524-Remove-stale-POIs.patch | 2 +- patches/server/0541-EntityMoveEvent.patch | 2 +- ...disable-pathfinding-updates-on-block.patch | 2 +- ...cause-to-Weather-ThunderChangeEvents.patch | 2 +- ...etChunkIfLoadedImmediately-in-places.patch | 2 +- ...-missing-team-sidebar-display-slots.patch} | 21 ++++++++++--------- .../0664-Add-back-EntityPortalExitEvent.patch | 0 ...o-find-targets-for-lightning-strikes.patch | 0 .../0666-Get-entity-default-attributes.patch | 0 .../{ => server}/0667-Left-handed-API.patch | 0 .../0668-Add-more-advancement-API.patch | 0 ...0669-Add-ItemFactory-getSpawnEgg-API.patch | 0 39 files changed, 43 insertions(+), 42 deletions(-) rename patches/{unapplied/0663-Add-missing-team-sidebar-display-slots.patch => server/0653-Add-missing-team-sidebar-display-slots.patch} (84%) rename patches/unapplied/{ => server}/0664-Add-back-EntityPortalExitEvent.patch (100%) rename patches/unapplied/{ => server}/0665-Add-methods-to-find-targets-for-lightning-strikes.patch (100%) rename patches/unapplied/{ => server}/0666-Get-entity-default-attributes.patch (100%) rename patches/unapplied/{ => server}/0667-Left-handed-API.patch (100%) rename patches/unapplied/{ => server}/0668-Add-more-advancement-API.patch (100%) rename patches/unapplied/{ => server}/0669-Add-ItemFactory-getSpawnEgg-API.patch (100%) diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch index a51d84b717..76904c3a8f 100644 --- a/patches/server/0005-Paper-config-files.patch +++ b/patches/server/0005-Paper-config-files.patch @@ -4676,7 +4676,7 @@ index 37ab411817008d4e6194e177d88d50931e53b42e..ca23639f15107ccd43b874ae38fa3727 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 099c0f97b276d411205f1a50846fb1c756cdf112..a10da1e3b8d8d341f1667a25d88905d847d38072 100644 +index df03b655bc5b864164da101bbf7edbca4cc7e147..f3a41559be5ad0b40762d368d8582704c8305961 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -234,7 +234,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch index e63cbdfccc..91e27248d7 100644 --- a/patches/server/0008-CB-fixes.patch +++ b/patches/server/0008-CB-fixes.patch @@ -17,7 +17,7 @@ Subject: [PATCH] CB fixes Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a10da1e3b8d8d341f1667a25d88905d847d38072..ca5398aca3fb782799c43c0daa06fbec4b993726 100644 +index f3a41559be5ad0b40762d368d8582704c8305961..32565740c6b013d9ad644e7c62d6721bdbd15b10 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -294,7 +294,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch index 77d837f14d..00ab2f6b4e 100644 --- a/patches/server/0009-MC-Utils.patch +++ b/patches/server/0009-MC-Utils.patch @@ -6434,7 +6434,7 @@ index 6c94ffc01377e3a066771509727e62521b2cea78..f402341b95c7752a2706edd502098696 ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ca5398aca3fb782799c43c0daa06fbec4b993726..60c4dce091c322ca15c0605a6269bd6af42d1236 100644 +index 32565740c6b013d9ad644e7c62d6721bdbd15b10..e2eff46cae9771931b2e0dfee5e73fd4842e3ab5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -176,6 +176,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch index 520a426603..4956800193 100644 --- a/patches/server/0014-Timings-v2.patch +++ b/patches/server/0014-Timings-v2.patch @@ -1159,7 +1159,7 @@ index f402341b95c7752a2706edd502098696f786f4ef..b1fd6118132ba38f60d2a2b15c09231f } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 60c4dce091c322ca15c0605a6269bd6af42d1236..a682feafd803ab89a9817d32e42a92a06d6e3443 100644 +index e2eff46cae9771931b2e0dfee5e73fd4842e3ab5..988a17cd0b960a07795d999dd125eae3a63d4227 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1,6 +1,8 @@ diff --git a/patches/server/0032-Entity-Origin-API.patch b/patches/server/0032-Entity-Origin-API.patch index b2988febff..6a5465e9b6 100644 --- a/patches/server/0032-Entity-Origin-API.patch +++ b/patches/server/0032-Entity-Origin-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a682feafd803ab89a9817d32e42a92a06d6e3443..cc725d41f99cde11377cce7778b6059f165effd8 100644 +index 988a17cd0b960a07795d999dd125eae3a63d4227..1ba20de63a5c6a8c3dc1977a6a48154fd83ef0a2 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2105,6 +2105,15 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0041-Disable-thunder.patch b/patches/server/0041-Disable-thunder.patch index b396e0372f..83d57d717e 100644 --- a/patches/server/0041-Disable-thunder.patch +++ b/patches/server/0041-Disable-thunder.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable thunder diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index cc725d41f99cde11377cce7778b6059f165effd8..22d814d9e2ad6664494b9954ef1c32bbab698e78 100644 +index 1ba20de63a5c6a8c3dc1977a6a48154fd83ef0a2..521da94115387efb389569fce0765dacd86e95c6 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -593,7 +593,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0042-Disable-ice-and-snow.patch b/patches/server/0042-Disable-ice-and-snow.patch index b6a9f50902..06ba40fcce 100644 --- a/patches/server/0042-Disable-ice-and-snow.patch +++ b/patches/server/0042-Disable-ice-and-snow.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable ice and snow diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 22d814d9e2ad6664494b9954ef1c32bbab698e78..b22f599b3b5c5b24f8b0d0842105013628b52100 100644 +index 521da94115387efb389569fce0765dacd86e95c6..511f27358cad1fa067497914c61855ee6ea3846a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -623,11 +623,13 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0070-Add-World-Util-Methods.patch b/patches/server/0070-Add-World-Util-Methods.patch index 2eb430fffc..8d92d3ac71 100644 --- a/patches/server/0070-Add-World-Util-Methods.patch +++ b/patches/server/0070-Add-World-Util-Methods.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b22f599b3b5c5b24f8b0d0842105013628b52100..548e5cf1ec95c1eb15b6774b34b3760dd9f96055 100644 +index 511f27358cad1fa067497914c61855ee6ea3846a..c5974d23eb2c0f0a71a5c438f387762516f7a1d9 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -221,7 +221,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch index 0b344696f3..5210f274c0 100644 --- a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable spawn chances for skeleton horses diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 548e5cf1ec95c1eb15b6774b34b3760dd9f96055..c9fe4677949b6757a6fdb74ea66d4ddab01791a6 100644 +index c5974d23eb2c0f0a71a5c438f387762516f7a1d9..3310ad37178c6397e00291186a518bffce876570 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -598,7 +598,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index a29b3a2dcd..1ae76f59e7 100644 --- a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -18,7 +18,7 @@ index 4eb9d3a3de91a7af2930f7e014256eeeafcb4ac7..19cb043e5c501b664d101b11717b759b this.profiler.push(() -> { return worldserver + " " + worldserver.dimension().location(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c9fe4677949b6757a6fdb74ea66d4ddab01791a6..86c36905dd93905b200502ac6cceb683b42c9eab 100644 +index 3310ad37178c6397e00291186a518bffce876570..db86df427b604e4a0959181eb2ee161bdda6bfad 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch index 022e9eb31c..96eebd1121 100644 --- a/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 86c36905dd93905b200502ac6cceb683b42c9eab..dae907cf6f3269492199dd305462006e5748efd8 100644 +index db86df427b604e4a0959181eb2ee161bdda6bfad..71e448a44b1d85bba4481fd02612d687aa9df4a1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2117,6 +2117,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index de349f7fa7..ad60a4eac0 100644 --- a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index dae907cf6f3269492199dd305462006e5748efd8..9f8ec5b462ca9919f9fc1572ec673fde0d0df655 100644 +index 71e448a44b1d85bba4481fd02612d687aa9df4a1..f0820ab21ff17601c896099d664d18283c759384 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1366,6 +1366,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 486d613f2c..b49fbf9bf3 100644 --- a/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system. Additionally, numerous issues to player position tracking on maps has been fixed. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 9f8ec5b462ca9919f9fc1572ec673fde0d0df655..3dc29f63893fa1635e3ebdfedb1b49859c228918 100644 +index f0820ab21ff17601c896099d664d18283c759384..303ce1ef47ae9aad137ee29f23b9084d08717cbb 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2138,6 +2138,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch b/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch index 1659ec96be..11c7a01a3a 100644 --- a/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch +++ b/patches/server/0191-Block-Enderpearl-Travel-Exploit.patch @@ -16,7 +16,7 @@ public net.minecraft.world.entity.projectile.Projectile cachedOwner public net.minecraft.world.entity.projectile.Projectile ownerUUID diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3dc29f63893fa1635e3ebdfedb1b49859c228918..dc6ebe41d3ebceb8c6fa706847b347d8b5842c6f 100644 +index 303ce1ef47ae9aad137ee29f23b9084d08717cbb..024854ba480643b28c4334dbff0523fb3b023ba3 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2071,6 +2071,12 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch index bc2130944c..81fc864ce7 100644 --- a/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/server/0192-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle. This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index dc6ebe41d3ebceb8c6fa706847b347d8b5842c6f..2fd0994e890152a7268d57f73d9481da7053b41e 100644 +index 024854ba480643b28c4334dbff0523fb3b023ba3..9242f42ad622897721a86b5a443aa67619e52918 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1485,12 +1485,17 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0215-InventoryCloseEvent-Reason-API.patch b/patches/server/0215-InventoryCloseEvent-Reason-API.patch index 3cbf5711f3..b3273b5727 100644 --- a/patches/server/0215-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0215-InventoryCloseEvent-Reason-API.patch @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 2fd0994e890152a7268d57f73d9481da7053b41e..709d8ba8e36bd3cdf39d50bd7cc0208a1107692a 100644 +index 9242f42ad622897721a86b5a443aa67619e52918..0e60542256d8e6ded167a3b9a75cca7d0915cb2f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1217,7 +1217,7 @@ public class ServerLevel extends Level implements WorldGenLevel { 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 9048298c39..9bdaa031fb 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 @@ -29,7 +29,7 @@ index 6352e3f0a78822b4d5167a688a5230b599541159..62c36060989acb54eb12a145909a6819 protected void tick() { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 709d8ba8e36bd3cdf39d50bd7cc0208a1107692a..1c67ca5ddcfb1098800b851482e780c9638acc1b 100644 +index 0e60542256d8e6ded167a3b9a75cca7d0915cb2f..af33e4be10c9d571eb6f7ba5730b7ed4d8647761 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -221,6 +221,9 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0299-Entity-getEntitySpawnReason.patch b/patches/server/0299-Entity-getEntitySpawnReason.patch index 9584ff9623..4db244395b 100644 --- a/patches/server/0299-Entity-getEntitySpawnReason.patch +++ b/patches/server/0299-Entity-getEntitySpawnReason.patch @@ -22,7 +22,7 @@ index 2eddeb8d5239bbfeefbf4d3bd363f1ad083299b6..a7c89cdf20cb63792c76de81c1ff9f2c }); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 1c67ca5ddcfb1098800b851482e780c9638acc1b..a07876f1c2659263cd7b83c6faa805a2382b4c05 100644 +index af33e4be10c9d571eb6f7ba5730b7ed4d8647761..6978abb97da6c33099db2e4ead3f33b0ca87bed1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1197,6 +1197,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 4f5aa97793..3fc5d96721 100644 --- a/patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/patches/server/0311-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -63,7 +63,7 @@ index 8ce9b9444c46956eeace333206eefd3ebca1e0c0..5b274f766e8cf55151ac6499fa1a68b9 // this.updateMobSpawningFlags(); worldserver.setSpawnSettings(this.isSpawningMonsters(), this.isSpawningAnimals()); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index a07876f1c2659263cd7b83c6faa805a2382b4c05..9b589239f18950f9544b09aa42a9edfe0cf91034 100644 +index 6978abb97da6c33099db2e4ead3f33b0ca87bed1..74bddd7f37af06355549128bb0bfc1d7eedd2bb8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1625,12 +1625,84 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch index 4c832d9f36..ed3f293f2f 100644 --- a/patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch +++ b/patches/server/0330-Optimise-EntityGetter-getPlayerByUUID.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise EntityGetter#getPlayerByUUID Use the PlayerList map instead of iterating over all players diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 9b589239f18950f9544b09aa42a9edfe0cf91034..0fe89c538a02192cfd1ee0feafe1634839e044b8 100644 +index 74bddd7f37af06355549128bb0bfc1d7eedd2bb8..0b928a1cf86de9c83fd50472226be48443ed65a6 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -326,6 +326,15 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0334-Entity-Activation-Range-2.0.patch b/patches/server/0334-Entity-Activation-Range-2.0.patch index 75a391e1d0..e73b9c627b 100644 --- a/patches/server/0334-Entity-Activation-Range-2.0.patch +++ b/patches/server/0334-Entity-Activation-Range-2.0.patch @@ -18,7 +18,7 @@ public net.minecraft.world.entity.Entity isInsidePortal public net.minecraft.world.entity.LivingEntity jumping diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0fe89c538a02192cfd1ee0feafe1634839e044b8..b7b038e56ee2beb4a72c415911eb1b3b67c119b4 100644 +index 0b928a1cf86de9c83fd50472226be48443ed65a6..9bcf1fee8df0186f7355bf37ba7c39553bdbf1d0 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2,7 +2,6 @@ package net.minecraft.server.level; diff --git a/patches/server/0343-Add-debug-for-sync-chunk-loads.patch b/patches/server/0343-Add-debug-for-sync-chunk-loads.patch index 1626cef8d9..095dfaf041 100644 --- a/patches/server/0343-Add-debug-for-sync-chunk-loads.patch +++ b/patches/server/0343-Add-debug-for-sync-chunk-loads.patch @@ -320,7 +320,7 @@ index b6461fdd77895fbeae10e92c76e8799c7e846ac5..7aceefc28f310e704ca8803e95c40ada chunkproviderserver_b.managedBlock(completablefuture::isDone); this.level.timings.syncChunkLoad.stopTiming(); // Paper diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b7b038e56ee2beb4a72c415911eb1b3b67c119b4..08ee28524ea9ca091e9da277a9029aa1ee47c9df 100644 +index 9bcf1fee8df0186f7355bf37ba7c39553bdbf1d0..79229f3563cc642568487ea92840c8753c536240 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -416,6 +416,13 @@ public class ServerLevel extends Level implements WorldGenLevel { 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 e7b274f446..4aaecfe6df 100644 --- a/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/patches/server/0361-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -25,7 +25,7 @@ index 842f7423d113f23d4b95162c81d407efd765679a..b652019a5feffeeec2871011e2df0d60 EntityType entitytypes = entity.getType(); int i = entitytypes.clientTrackingRange() * 16; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 08ee28524ea9ca091e9da277a9029aa1ee47c9df..b51071d35f5a6a13c81938cee9a5572c48353c57 100644 +index 79229f3563cc642568487ea92840c8753c536240..4307b72acc389ccab97b2b7f3f824ddeca5a3cda 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2217,7 +2217,7 @@ public class ServerLevel extends Level implements WorldGenLevel { 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 520850684a..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 @@ -536,7 +536,7 @@ index f72c1a4baff6ac9a3b1df83ece3925e2b1678df9..967817ad15146407668361a85c89be6b paperConfigurations.initializeWorldDefaultsConfiguration(); org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b51071d35f5a6a13c81938cee9a5572c48353c57..97726b324966f657aa797b985920ba21f19833d0 100644 +index 4307b72acc389ccab97b2b7f3f824ddeca5a3cda..6bb7f2050e93f63045ea608672751da28138d3f8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -221,7 +221,9 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0420-incremental-chunk-and-player-saving.patch b/patches/server/0420-incremental-chunk-and-player-saving.patch index 166679d029..30fff43725 100644 --- a/patches/server/0420-incremental-chunk-and-player-saving.patch +++ b/patches/server/0420-incremental-chunk-and-player-saving.patch @@ -73,7 +73,7 @@ index 7aceefc28f310e704ca8803e95c40ada13718988..70a7abf4738cc5da94d7465884d9a5a1 public void close() throws IOException { // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 97726b324966f657aa797b985920ba21f19833d0..c83b0c97d36dfe107fb02d86f924e1dea11dc6b3 100644 +index 6bb7f2050e93f63045ea608672751da28138d3f8..b84a5fcda10711c896c9a670343d961b9536f888 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1051,6 +1051,37 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index 4e33d4ca2e..90d8c3d0b7 100644 --- a/patches/server/0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0443-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c83b0c97d36dfe107fb02d86f924e1dea11dc6b3..3dc395a53de4c21b2853be19185bcebcfca96684 100644 +index b84a5fcda10711c896c9a670343d961b9536f888..15a0bbc4e3bafb754b3de03f63b19ab848fe6635 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1762,9 +1762,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0459-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0459-Extend-block-drop-capture-to-capture-all-items-added.patch index ffa99a39dc..51ac6461fd 100644 --- a/patches/server/0459-Extend-block-drop-capture-to-capture-all-items-added.patch +++ b/patches/server/0459-Extend-block-drop-capture-to-capture-all-items-added.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Extend block drop capture to capture all items added to the diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3dc395a53de4c21b2853be19185bcebcfca96684..0aba8fd33604259f9a4127670d9c4cbd21f57df1 100644 +index 15a0bbc4e3bafb754b3de03f63b19ab848fe6635..720568b34c903c80d916a5915c9733c4ed565dcf 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1275,6 +1275,12 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0524-Remove-stale-POIs.patch b/patches/server/0524-Remove-stale-POIs.patch index 8adf0b58bf..3bba02ef7c 100644 --- a/patches/server/0524-Remove-stale-POIs.patch +++ b/patches/server/0524-Remove-stale-POIs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove stale POIs diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0aba8fd33604259f9a4127670d9c4cbd21f57df1..97d59a205a64bf48a72ff779f423430ec0ff94fc 100644 +index 720568b34c903c80d916a5915c9733c4ed565dcf..752c7ecd4de3cbeded66f457248941f1604dedf5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1831,6 +1831,11 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0541-EntityMoveEvent.patch b/patches/server/0541-EntityMoveEvent.patch index 6b4de17756..2bf474bd6f 100644 --- a/patches/server/0541-EntityMoveEvent.patch +++ b/patches/server/0541-EntityMoveEvent.patch @@ -17,7 +17,7 @@ index 2d2e7fe673962cdf21a7623b51e2731132cd3c01..8788b893329dcd424af53224338868bb this.profiler.push(() -> { return worldserver + " " + worldserver.dimension().location(); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 97d59a205a64bf48a72ff779f423430ec0ff94fc..4a83dbbe3d9b2ec1f2925d65c6399c50f612af4a 100644 +index 752c7ecd4de3cbeded66f457248941f1604dedf5..cc5e6c2de2fb3455aab134b43ab207467b832107 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch index 5641f2036c..fb8ea3e316 100644 --- a/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch +++ b/patches/server/0542-added-option-to-disable-pathfinding-updates-on-block.patch @@ -5,7 +5,7 @@ Subject: [PATCH] added option to disable pathfinding updates on block changes diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 4a83dbbe3d9b2ec1f2925d65c6399c50f612af4a..430f2da7e240cea27de80b1448c900d4b422fe1c 100644 +index cc5e6c2de2fb3455aab134b43ab207467b832107..b6e2e23d773ca3b9f35c7905bbc0f7681cb4a309 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1420,6 +1420,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch index 404b0b3d5d..320f771f31 100644 --- a/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch +++ b/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add cause to Weather/ThunderChangeEvents diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 430f2da7e240cea27de80b1448c900d4b422fe1c..ba4217d34aa183f23faeaad31522dd844c316e0f 100644 +index b6e2e23d773ca3b9f35c7905bbc0f7681cb4a309..c16d0e4f30e7b3c6d2c0b320353646589a84c6c8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -437,8 +437,8 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch index 204b083d85..603bb0a473 100644 --- a/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/patches/server/0624-Use-getChunkIfLoadedImmediately-in-places.patch @@ -8,7 +8,7 @@ ticket level 33 (yes getChunkIfLoaded will actually perform a chunk load in that case). diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ba4217d34aa183f23faeaad31522dd844c316e0f..cce49e00d89e2817e3939bb3adefb2ecb34cdff5 100644 +index c16d0e4f30e7b3c6d2c0b320353646589a84c6c8..a81f77b6d057182a716549940f40052fe27e845c 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -228,7 +228,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/unapplied/0663-Add-missing-team-sidebar-display-slots.patch b/patches/server/0653-Add-missing-team-sidebar-display-slots.patch similarity index 84% rename from patches/unapplied/0663-Add-missing-team-sidebar-display-slots.patch rename to patches/server/0653-Add-missing-team-sidebar-display-slots.patch index 0ffc852554..1af8f2d323 100644 --- a/patches/unapplied/0663-Add-missing-team-sidebar-display-slots.patch +++ b/patches/server/0653-Add-missing-team-sidebar-display-slots.patch @@ -9,18 +9,18 @@ public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations toBukkitSlo public org.bukkit.craftbukkit.scoreboard.CraftScoreboardTranslations fromBukkitSlot(Lorg/bukkit/scoreboard/DisplaySlot;)I diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java -index e2d3fe9af7d3bd82bee519b20e141cd58f68bbd6..944a4fee237730c0d89567aaa6ddf268467aa0e0 100644 +index 808118a033ace90246318dcf6a3110cab353d09c..fb492372f9656d5ac8e3d07c0ba2efc0d192db9b 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardTranslations.java -@@ -7,36 +7,23 @@ import org.bukkit.scoreboard.DisplaySlot; +@@ -6,37 +6,23 @@ import org.bukkit.scoreboard.DisplaySlot; import org.bukkit.scoreboard.RenderType; public final class CraftScoreboardTranslations { - static final int MAX_DISPLAY_SLOT = 19; -+ static final int MAX_DISPLAY_SLOT = Scoreboard.getDisplaySlotNames().length; // Paper ++ static final int MAX_DISPLAY_SLOT = net.minecraft.world.scores.DisplaySlot.values().length; // Paper // TODO - revisit this. + @Deprecated // Paper static final ImmutableBiMap SLOTS = ImmutableBiMap.builder() - .put(DisplaySlot.BELOW_NAME, "belowName") + .put(DisplaySlot.BELOW_NAME, "below_name") .put(DisplaySlot.PLAYER_LIST, "list") .put(DisplaySlot.SIDEBAR, "sidebar") - .put(DisplaySlot.SIDEBAR_BLACK, "sidebar.team.black") @@ -43,16 +43,17 @@ index e2d3fe9af7d3bd82bee519b20e141cd58f68bbd6..944a4fee237730c0d89567aaa6ddf268 private CraftScoreboardTranslations() {} - public static DisplaySlot toBukkitSlot(int i) { -+ if (true) return org.bukkit.scoreboard.DisplaySlot.NAMES.value(Scoreboard.getDisplaySlotName(i)); // Paper - return CraftScoreboardTranslations.SLOTS.inverse().get(Scoreboard.getDisplaySlotName(i)); + static DisplaySlot toBukkitSlot(net.minecraft.world.scores.DisplaySlot minecraft) { ++ if (true) return org.bukkit.scoreboard.DisplaySlot.NAMES.value(minecraft.getSerializedName()); // Paper + return CraftScoreboardTranslations.SLOTS.inverse().get(minecraft.getSerializedName()); } - public static int fromBukkitSlot(DisplaySlot slot) { -+ if (true) return Scoreboard.getDisplaySlotByName(slot.getId()); // Paper - return Scoreboard.getDisplaySlotByName(CraftScoreboardTranslations.SLOTS.get(slot)); + static net.minecraft.world.scores.DisplaySlot fromBukkitSlot(DisplaySlot slot) { +- return net.minecraft.world.scores.DisplaySlot.CODEC.byName(CraftScoreboardTranslations.SLOTS.get(slot)); ++ return net.minecraft.world.scores.DisplaySlot.CODEC.byName(slot.getId()); // Paper } + static RenderType toBukkitRender(ObjectiveCriteria.RenderType display) { diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java index fe5d3b60ad740b7f1cce040f9c8d96ac51245ef6..43ffc4180b1ef2d2000991ad58b0706141470d08 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java diff --git a/patches/unapplied/0664-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0664-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/unapplied/0664-Add-back-EntityPortalExitEvent.patch rename to patches/unapplied/server/0664-Add-back-EntityPortalExitEvent.patch diff --git a/patches/unapplied/0665-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/unapplied/0665-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/unapplied/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/unapplied/0666-Get-entity-default-attributes.patch b/patches/unapplied/server/0666-Get-entity-default-attributes.patch similarity index 100% rename from patches/unapplied/0666-Get-entity-default-attributes.patch rename to patches/unapplied/server/0666-Get-entity-default-attributes.patch diff --git a/patches/unapplied/0667-Left-handed-API.patch b/patches/unapplied/server/0667-Left-handed-API.patch similarity index 100% rename from patches/unapplied/0667-Left-handed-API.patch rename to patches/unapplied/server/0667-Left-handed-API.patch diff --git a/patches/unapplied/0668-Add-more-advancement-API.patch b/patches/unapplied/server/0668-Add-more-advancement-API.patch similarity index 100% rename from patches/unapplied/0668-Add-more-advancement-API.patch rename to patches/unapplied/server/0668-Add-more-advancement-API.patch diff --git a/patches/unapplied/0669-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/0669-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/unapplied/0669-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/unapplied/server/0669-Add-ItemFactory-getSpawnEgg-API.patch