diff --git a/patches/server/0036-Entity-Origin-API.patch b/patches/server/0036-Entity-Origin-API.patch index 17636f53d1..e583d68651 100644 --- a/patches/server/0036-Entity-Origin-API.patch +++ b/patches/server/0036-Entity-Origin-API.patch @@ -5,10 +5,10 @@ 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 9415c699ed2bc2b4237ab5e14cb8316410ac9fa5..7ca86e73d6e206e697578c805f170f08f35f5b5a 100644 +index 5d5d6e4c2cb978f43ccb0977216c8338b7bdc7ba..718fecd96fc69904c31bfe94aaeead252a775ac1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2193,6 +2193,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2197,6 +2197,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe entity.updateDynamicGameEventListener(DynamicGameEventListener::add); entity.inWorld = true; // CraftBukkit - Mark entity as in world entity.valid = true; // CraftBukkit diff --git a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch index 0bb1405b36..33448a982c 100644 --- a/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/patches/server/0077-Entity-AddTo-RemoveFrom-World-Events.patch @@ -5,10 +5,10 @@ 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 1dcdb40c1d3def6e3fb1628100d74bf77a45efe3..c0e4c3fe5e996f84dcbaa2d78f5b845147e5ae84 100644 +index 79e3c458475ba5ce041e75d1c5d5fc345cfb2e26..c5151d833ade79b1acf1276162b061d6fce6f471 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2205,6 +2205,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2209,6 +2209,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe entity.setOrigin(entity.getOriginVector().toLocation(getWorld())); } // Paper end - Entity origin API @@ -16,7 +16,7 @@ index 1dcdb40c1d3def6e3fb1628100d74bf77a45efe3..c0e4c3fe5e996f84dcbaa2d78f5b8451 } public void onTrackingEnd(Entity entity) { -@@ -2275,6 +2276,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2279,6 +2280,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } } // CraftBukkit end diff --git a/patches/server/0100-Fix-global-sound-handling.patch b/patches/server/0100-Fix-global-sound-handling.patch index aa06ccf2c3..2a25811ec0 100644 --- a/patches/server/0100-Fix-global-sound-handling.patch +++ b/patches/server/0100-Fix-global-sound-handling.patch @@ -11,7 +11,7 @@ Co-authored-by: lexikiq Co-authored-by: Aikar diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7611f58246960ec3fd0521ab5f1743a5b08d8241..9cb02b168384f597fce1251696e77a1e74f0d774 100644 +index b73cb7413596a87ad482814a00584c4342273344..4bfe35ab17b3f26a19cc6d25e3558f4a222b7cdc 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1311,7 +1311,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -23,7 +23,7 @@ index 7611f58246960ec3fd0521ab5f1743a5b08d8241..9cb02b168384f597fce1251696e77a1e } public int getLogicalHeight() { -@@ -2133,6 +2133,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2137,6 +2137,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe return this.serverLevelData.getGameRules(); } diff --git a/patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch index 0baeb8eaad..9ca5010ead 100644 --- a/patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/server/0185-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -10,12 +10,12 @@ 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 9cb02b168384f597fce1251696e77a1e74f0d774..95c3b8524faac2218a4966965d4a8e322c0bdcd7 100644 +index 4bfe35ab17b3f26a19cc6d25e3558f4a222b7cdc..8dc3e53d21a341afd2947c5a37280de5f6a872a2 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1542,12 +1542,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe - } +@@ -1546,12 +1546,17 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe + // CraftBukkit start - visibility api support public int sendParticlesSource(ServerPlayer sender, T t0, boolean flag, boolean flag1, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) { + // Paper start - Particle API + return this.sendParticlesSource(this.players, sender, t0, flag, flag1, d0, d1, d2, i, d3, d4, d5, d6); diff --git a/patches/server/0206-InventoryCloseEvent-Reason-API.patch b/patches/server/0206-InventoryCloseEvent-Reason-API.patch index f88c5966dd..97bb56c098 100644 --- a/patches/server/0206-InventoryCloseEvent-Reason-API.patch +++ b/patches/server/0206-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 1c15dc6143ce00aa4a8cdc6468d9fba0e398ec43..2ed077ba041f9d1a629320cd41b87ba19f3803d0 100644 +index 84d811fc7dd5b74aae751fbe02e268191e003344..26b4c1deab18a96b5438141ad973ab3e17d145c1 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1210,7 +1210,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -19,7 +19,7 @@ index 1c15dc6143ce00aa4a8cdc6468d9fba0e398ec43..2ed077ba041f9d1a629320cd41b87ba1 } } } -@@ -2260,7 +2260,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2264,7 +2264,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe // Spigot Start if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) { diff --git a/patches/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index 2c2336e60a..d7626e4743 100644 --- a/patches/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/patches/server/0327-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -25,10 +25,10 @@ index 9baec6e78bdebd9b38b3f12e4fba99f9ad039c1e..914e9e0af7533cbf487ea0413da447d5 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 578d284a3e39368c5285eafe84056b081a240e3d..eb65b1768c46f3cc3f490b06c2215044aebab178 100644 +index 5b47505353bf96bcb555910d1ebf645d14052f46..c631ea4e75798e36cc6418b1e71eeca89c8263d5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2213,7 +2213,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2217,7 +2217,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe public void onTrackingStart(Entity entity) { org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot @@ -37,7 +37,7 @@ index 578d284a3e39368c5285eafe84056b081a240e3d..eb65b1768c46f3cc3f490b06c2215044 if (entity instanceof ServerPlayer entityplayer) { ServerLevel.this.players.add(entityplayer); ServerLevel.this.updateSleepingPlayerList(); -@@ -2243,6 +2243,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2247,6 +2247,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe entity.updateDynamicGameEventListener(DynamicGameEventListener::add); entity.inWorld = true; // CraftBukkit - Mark entity as in world entity.valid = true; // CraftBukkit diff --git a/patches/server/0389-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0389-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index b89249bc58..152014d89c 100644 --- a/patches/server/0389-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0389-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -5,10 +5,10 @@ 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 eb65b1768c46f3cc3f490b06c2215044aebab178..f01fe053888f7f5124c6b157044dfd46ea98ae23 100644 +index c631ea4e75798e36cc6418b1e71eeca89c8263d5..d32606cba7222aa538cca3882314f9f87f33684f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1711,7 +1711,9 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1715,7 +1715,9 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe float f1 = this.levelData.getSpawnAngle(); if (!blockposition1.equals(pos) || f1 != angle) { diff --git a/patches/server/0461-Remove-stale-POIs.patch b/patches/server/0461-Remove-stale-POIs.patch index 1f2723ec86..2c29fc65e4 100644 --- a/patches/server/0461-Remove-stale-POIs.patch +++ b/patches/server/0461-Remove-stale-POIs.patch @@ -5,10 +5,10 @@ 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 1ed0940d8bdc4210992a335b3691c1cd3a13580a..e56f9e823f9460854c6f0f2f05422136c12aabba 100644 +index f6b91771445ab4f48525f24025a9f5249f176cd5..412c1af3282d5d5bbcb7276c6cf90e9ce87668ba 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1786,6 +1786,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1790,6 +1790,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe }); optional1.ifPresent((holder) -> { this.getServer().execute(() -> { diff --git a/patches/server/0601-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0601-Fix-merchant-inventory-not-closing-on-entity-removal.patch index 70a334e012..553f865869 100644 --- a/patches/server/0601-Fix-merchant-inventory-not-closing-on-entity-removal.patch +++ b/patches/server/0601-Fix-merchant-inventory-not-closing-on-entity-removal.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix merchant inventory not closing on entity removal diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 2ac09e8eece6ff772c94bb1efd01cc1c45194435..3205ef2b0027a2fa7f9ba5ed3437f71f1c6e02b5 100644 +index 1301622961ffdcfcccc9658a0e4498bc04ad93f5..3ed78515fed78f5a679b9002e2e3a0aa6984aa70 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2309,6 +2309,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2313,6 +2313,11 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe // Spigot end // Spigot Start if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message diff --git a/patches/server/0689-Don-t-tick-markers.patch b/patches/server/0689-Don-t-tick-markers.patch index 8486b3dbe8..64875a4975 100644 --- a/patches/server/0689-Don-t-tick-markers.patch +++ b/patches/server/0689-Don-t-tick-markers.patch @@ -23,10 +23,10 @@ index 9d9d133e0d973ecda1ef1efc872a51ee10463fd1..f671b74e4179fc29bc600b52e456ba9f } }); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index fda4b5f2b848b432138207eff9a77fed6aaf3805..08b819c19eda2ab53b1b37af7a90e38b06b67b85 100644 +index 8ca9a5d274a28f5feab492a446afea6b187b5d6a..ee0459e37b817648e37b1ea84a3edf7c52d00855 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2230,6 +2230,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2234,6 +2234,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } public void onTickingStart(Entity entity) { diff --git a/patches/server/0735-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0735-Remove-unnecessary-onTrackingStart-during-navigation.patch index 6fccf99621..3bc7296f88 100644 --- a/patches/server/0735-Remove-unnecessary-onTrackingStart-during-navigation.patch +++ b/patches/server/0735-Remove-unnecessary-onTrackingStart-during-navigation.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remove unnecessary onTrackingStart during navigation warning diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 03959bd6f40db9fb8f5da83377b8427ed0341f8a..ee1b0bb6c6681c32b32ebf50e15e261a123beb1a 100644 +index d778f3dbe84b57f42703042ddd161e5c4bd4f14d..ad39671baae44714488eefbdbd4924824fd45fbc 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2248,7 +2248,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2252,7 +2252,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } if (entity instanceof Mob entityinsentient) { @@ -17,7 +17,7 @@ index 03959bd6f40db9fb8f5da83377b8427ed0341f8a..ee1b0bb6c6681c32b32ebf50e15e261a String s = "onTrackingStart called during navigation iteration"; Util.logAndPauseIfInIde("onTrackingStart called during navigation iteration", new IllegalStateException("onTrackingStart called during navigation iteration")); -@@ -2328,7 +2328,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2332,7 +2332,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } if (entity instanceof Mob entityinsentient) { diff --git a/patches/server/0755-check-global-player-list-where-appropriate.patch b/patches/server/0755-check-global-player-list-where-appropriate.patch index 12092601ea..2c629600b2 100644 --- a/patches/server/0755-check-global-player-list-where-appropriate.patch +++ b/patches/server/0755-check-global-player-list-where-appropriate.patch @@ -7,10 +7,10 @@ Makes certain entities check all players when searching for a player instead of just checking players in their world. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ee1b0bb6c6681c32b32ebf50e15e261a123beb1a..334b21a37196f4bf1046d9506c9a491d2662adad 100644 +index ad39671baae44714488eefbdbd4924824fd45fbc..8e72d36c2e2b5ff91b16188c95646b8447b6b2b8 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2364,4 +2364,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2368,4 +2368,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe entity.updateDynamicGameEventListener(DynamicGameEventListener::move); } } diff --git a/patches/server/0833-Only-capture-actual-tree-growth.patch b/patches/server/0833-Only-capture-actual-tree-growth.patch index c423748d1e..738f88f33b 100644 --- a/patches/server/0833-Only-capture-actual-tree-growth.patch +++ b/patches/server/0833-Only-capture-actual-tree-growth.patch @@ -17,10 +17,10 @@ index 8322b54451a6203a8969fdc96ed63bbcc0dd2f5a..5414f05a7a2d9858785d68446f03f2b8 } } diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 362e4466f443a9c1a04bda74f7c60f7df8944169..48b93220fb7429cc4ce498cf9b862b8e6bee70d4 100644 +index 1242ddeb98c5a0582591a071ef615f726f6aa132..9b4e3144b062007b936b3b444320646061cc0133 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2209,6 +2209,16 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2213,6 +2213,16 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe return range <= 0 ? 64.0 * 64.0 : range * range; // 64 is taken from default in ServerLevel#levelEvent } // Paper end - respect global sound events gamerule diff --git a/patches/server/0876-Fix-missing-map-initialize-event-call.patch b/patches/server/0876-Fix-missing-map-initialize-event-call.patch index 1048876aa5..f9d9852b1b 100644 --- a/patches/server/0876-Fix-missing-map-initialize-event-call.patch +++ b/patches/server/0876-Fix-missing-map-initialize-event-call.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Fix missing map initialize event call public net.minecraft.world.level.storage.DimensionDataStorage readSavedData(Ljava/util/function/Function;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 48b93220fb7429cc4ce498cf9b862b8e6bee70d4..1197788c4e0cc8740e69cfcc36d731bf6bc9fcb1 100644 +index 9b4e3144b062007b936b3b444320646061cc0133..2a56e7846b3def7d1e9a2d5e473a6806a1acec28 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1707,13 +1707,29 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1711,13 +1711,29 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @Nullable @Override public MapItemSavedData getMapData(MapId id) { diff --git a/patches/server/0969-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0969-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index 7a02496ea9..b5ae9afd5c 100644 --- a/patches/server/0969-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/patches/server/0969-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -15,10 +15,10 @@ Additionally, numerous issues to player position tracking on maps has been fixed Feature patch diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 1a823b403fef4cbd12ed737036894220a9435ebf..abd416ecf8b9e847d80704f13a5076f61ed846ef 100644 +index 1977815fce8acc10c8f2d1f168e6342c9faff5c0..629e7ac9fd6a849b89f75b9611495270e8589a82 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2344,6 +2344,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2348,6 +2348,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe { if ( iter.next().player == entity ) { diff --git a/patches/server/1035-Moonrise-optimisation-patches.patch b/patches/server/1035-Moonrise-optimisation-patches.patch index aec703697c..399e1c0451 100644 --- a/patches/server/1035-Moonrise-optimisation-patches.patch +++ b/patches/server/1035-Moonrise-optimisation-patches.patch @@ -26536,7 +26536,7 @@ index d5bc702f2676b1b7a32c8f3a4a349fc2710ee825..301e8d6599d200cb0f1328f0e386af2f if (!list.equals(this.lastPassengers)) { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index c785a76f1291c65310bca0c4a75078fe1055e4e5..5889a47a25abf3494fba74ebb3c5e07a2408f161 100644 +index 6947cba2daae941924f9c9726411c7ae6e4ccfa5..33267af4258f36df0d9525ac581b52bfeebc7591 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -186,7 +186,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; @@ -27171,7 +27171,7 @@ index c785a76f1291c65310bca0c4a75078fe1055e4e5..5889a47a25abf3494fba74ebb3c5e07a return false; } else { this.addFreshEntityWithPassengers(entity, reason); // CraftBukkit -@@ -1912,7 +2206,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1916,7 +2210,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } } @@ -27180,7 +27180,7 @@ index c785a76f1291c65310bca0c4a75078fe1055e4e5..5889a47a25abf3494fba74ebb3c5e07a bufferedwriter.write(String.format(Locale.ROOT, "block_entity_tickers: %d\n", this.blockEntityTickers.size())); bufferedwriter.write(String.format(Locale.ROOT, "block_ticks: %d\n", this.getBlockTicks().count())); bufferedwriter.write(String.format(Locale.ROOT, "fluid_ticks: %d\n", this.getFluidTicks().count())); -@@ -1961,7 +2255,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1965,7 +2259,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe BufferedWriter bufferedwriter2 = Files.newBufferedWriter(path1); try { @@ -27189,7 +27189,7 @@ index c785a76f1291c65310bca0c4a75078fe1055e4e5..5889a47a25abf3494fba74ebb3c5e07a } catch (Throwable throwable4) { if (bufferedwriter2 != null) { try { -@@ -1982,7 +2276,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -1986,7 +2280,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe BufferedWriter bufferedwriter3 = Files.newBufferedWriter(path2); try { @@ -27198,7 +27198,7 @@ index c785a76f1291c65310bca0c4a75078fe1055e4e5..5889a47a25abf3494fba74ebb3c5e07a } catch (Throwable throwable6) { if (bufferedwriter3 != null) { try { -@@ -2124,7 +2418,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2128,7 +2422,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @VisibleForTesting public String getWatchdogStats() { @@ -27207,7 +27207,7 @@ index c785a76f1291c65310bca0c4a75078fe1055e4e5..5889a47a25abf3494fba74ebb3c5e07a return BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString(); }), this.blockEntityTickers.size(), ServerLevel.getTypeCount(this.blockEntityTickers, TickingBlockEntity::getType), this.getBlockTicks().count(), this.getFluidTicks().count(), this.gatherChunkSourceStats()); } -@@ -2154,15 +2448,25 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2158,15 +2452,25 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @Override public LevelEntityGetter getEntities() { org.spigotmc.AsyncCatcher.catchOp("Chunk getEntities call"); // Spigot @@ -27236,7 +27236,7 @@ index c785a76f1291c65310bca0c4a75078fe1055e4e5..5889a47a25abf3494fba74ebb3c5e07a } public void startTickingChunk(LevelChunk chunk) { -@@ -2182,34 +2486,47 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2186,34 +2490,47 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @Override public void close() throws IOException { super.close(); @@ -27291,7 +27291,7 @@ index c785a76f1291c65310bca0c4a75078fe1055e4e5..5889a47a25abf3494fba74ebb3c5e07a } @Override -@@ -2265,7 +2582,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2269,7 +2586,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe CrashReportCategory crashreportsystemdetails = super.fillReportDetails(report); crashreportsystemdetails.setDetail("Loaded entity count", () -> { diff --git a/patches/server/1039-Add-startup-flag-to-disable-gamerule-limits.patch b/patches/server/1039-Add-startup-flag-to-disable-gamerule-limits.patch index 9ad4196621..c36b3a527e 100644 --- a/patches/server/1039-Add-startup-flag-to-disable-gamerule-limits.patch +++ b/patches/server/1039-Add-startup-flag-to-disable-gamerule-limits.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add startup flag to disable gamerule limits -DPaper.DisableGameRuleLimits=true will disable gamerule limits diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5889a47a25abf3494fba74ebb3c5e07a2408f161..e4a50b2f6cdc9daf6a018aaf44bb029c5003fa65 100644 +index 33267af4258f36df0d9525ac581b52bfeebc7591..346cffdd8ca047980eb4fc99d99b577d9e4cde13 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2077,13 +2077,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2081,13 +2081,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe } if (this.lastSpawnChunkRadius > 1) { diff --git a/patches/server/1055-Block-Enderpearl-Travel-Exploit.patch b/patches/server/1055-Block-Enderpearl-Travel-Exploit.patch index ca3570dc03..440fcb5d1c 100644 --- a/patches/server/1055-Block-Enderpearl-Travel-Exploit.patch +++ b/patches/server/1055-Block-Enderpearl-Travel-Exploit.patch @@ -19,10 +19,10 @@ fully prevent enderpearl travel exploits. 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 020ef251fd3d03c9e8fb9fc859d4ef9fc04cd3ba..17ddec036cb6135c7489efbd76121304e76c32c0 100644 +index 3817703e5b759a27bb6c722f56b41ef321b9c432..5c9d15dbc55aec3ec99143a255e42b5e28a9e95e 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2678,6 +2678,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2682,6 +2682,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe public void onTickingEnd(Entity entity) { ServerLevel.this.entityTickList.remove(entity); diff --git a/patches/server/1058-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch b/patches/server/1058-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch index a03d8a4094..594dad2b53 100644 --- a/patches/server/1058-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch +++ b/patches/server/1058-Call-CraftPlayer-onEntityRemove-for-all-online-playe.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Call CraftPlayer#onEntityRemove for all online players diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 17ddec036cb6135c7489efbd76121304e76c32c0..7e8713373315eebf57541f8afe10902681449ad9 100644 +index 5c9d15dbc55aec3ec99143a255e42b5e28a9e95e..b3e709c9ce116bf41cd050674ee1fb31b08e684f 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -2800,7 +2800,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2804,7 +2804,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe // CraftBukkit start entity.valid = false; if (!(entity instanceof ServerPlayer)) { diff --git a/patches/server/1062-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1062-Add-Alternate-Current-redstone-implementation.patch index 125b43d205..659f92b393 100644 --- a/patches/server/1062-Add-Alternate-Current-redstone-implementation.patch +++ b/patches/server/1062-Add-Alternate-Current-redstone-implementation.patch @@ -2328,7 +2328,7 @@ index 0000000000000000000000000000000000000000..298076a0db4e6ee6e4775ac43bf749d9 + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7e8713373315eebf57541f8afe10902681449ad9..7270a94246df73ee195156fc7b62470d090a337a 100644 +index b3e709c9ce116bf41cd050674ee1fb31b08e684f..1f898500d0e9b18a880645ceb0a8ff0fe75f4e48 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -231,6 +231,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe @@ -2339,7 +2339,7 @@ index 7e8713373315eebf57541f8afe10902681449ad9..7270a94246df73ee195156fc7b62470d public LevelChunk getChunkIfLoaded(int x, int z) { return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately -@@ -2661,6 +2662,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe +@@ -2665,6 +2666,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe return this.chunkSource.getGenerator().getSeaLevel(); } diff --git a/work/CraftBukkit b/work/CraftBukkit index ff9a8bf828..c294e05d7a 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit ff9a8bf8287245918b691aca892f7517e0930a02 +Subproject commit c294e05d7aad9096cf1f5c19e6db1f1dfdfa202d