From c2b7aec8f7b418a39a2ec408e6411e6f752379da Mon Sep 17 00:00:00 2001 From: Kugge Date: Sat, 23 Sep 2023 15:26:41 +0200 Subject: [PATCH] Update upstream (Folia) --- gradle.properties | 2 +- patches/api/0001-Kaiiju-Configuration.patch | 4 ++-- ...cing-for-EntityLiving-hasLineOfSight.patch | 0 ...ove-container-checking-with-a-bitset.patch | 0 patches/server/0001-Rebranding.patch | 10 ++++---- patches/server/0002-Empty-configuration.patch | 8 +++---- .../0003-Region-format-configuration.patch | 6 ++--- .../0004-Add-Linear-region-format.patch | 24 +++++++++---------- patches/server/0007-Alternate-Keepalive.patch | 4 ++-- patches/server/0011-Server-mod-name.patch | 4 ++-- .../server/0014-Toggle-optimize-hoppers.patch | 10 ++++---- ...es.patch => 0017-Add-SIMD-utilities.patch} | 2 +- ...18-Toggle-shared-random-for-players.patch} | 4 ++-- ...019-Kick-player-instead-of-crashing.patch} | 0 ...le-fix-TripWire-state-inconsistency.patch} | 0 ...g-throttling-removal-to-prevent-lag.patch} | 4 ++-- ...h => 0022-Toggle-safe-teleportation.patch} | 4 ++-- ...tch => 0023-Toggle-sand-duplication.patch} | 0 ...24-Vanilla-end-portal-teleportation.patch} | 8 +++---- ...-Swap-distanceToSqr-and-target-test.patch} | 0 ...Use-Math.floor-instead-of-fastfloor.patch} | 4 ++-- ...-enable-moving-into-unloaded-chunks.patch} | 4 ++-- ... 0028-Don-t-pathfind-outside-region.patch} | 0 ...Don-t-spam-recipe-changes-on-update.patch} | 0 ...> 0030-Option-to-disable-vanish-api.patch} | 10 ++++---- ...0031-Option-to-disable-player-stats.patch} | 4 ++-- ...0032-Option-to-disable-achievements.patch} | 12 +++++----- ...3-Option-to-disable-arm-swing-event.patch} | 6 ++--- ...n-to-disable-creatures-spawn-events.patch} | 0 ...to-disable-dolphin-swim-to-treasure.patch} | 2 +- ...h => 0036-Unsupported-configuration.patch} | 0 ...o-disable-ensure-tick-thread-checks.patch} | 0 ...038-Don-t-kick-player-on-bad-packet.patch} | 0 ... => 0039-Skip-event-if-no-listeners.patch} | 0 ...c-if-we-cannot-move-entity-off-main.patch} | 6 ++--- ...> 0041-Add-back-worldborder-command.patch} | 0 ...patch => 0042-Add-back-data-command.patch} | 0 ...patch => 0043-Async-path-processing.patch} | 6 ++--- ...> 0044-Global-event-synchronization.patch} | 0 39 files changed, 74 insertions(+), 74 deletions(-) rename patches/{server => removed}/0017-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch (100%) rename patches/{server => removed}/0045-Improve-container-checking-with-a-bitset.patch (100%) rename patches/server/{0018-Add-SIMD-utilities.patch => 0017-Add-SIMD-utilities.patch} (98%) rename patches/server/{0019-Toggle-shared-random-for-players.patch => 0018-Toggle-shared-random-for-players.patch} (91%) rename patches/server/{0020-Kick-player-instead-of-crashing.patch => 0019-Kick-player-instead-of-crashing.patch} (100%) rename patches/server/{0021-Toggle-fix-TripWire-state-inconsistency.patch => 0020-Toggle-fix-TripWire-state-inconsistency.patch} (100%) rename patches/server/{0022-Entity-ticking-throttling-removal-to-prevent-lag.patch => 0021-Entity-ticking-throttling-removal-to-prevent-lag.patch} (98%) rename patches/server/{0023-Toggle-safe-teleportation.patch => 0022-Toggle-safe-teleportation.patch} (95%) rename patches/server/{0024-Toggle-sand-duplication.patch => 0023-Toggle-sand-duplication.patch} (100%) rename patches/server/{0025-Vanilla-end-portal-teleportation.patch => 0024-Vanilla-end-portal-teleportation.patch} (91%) rename patches/server/{0026-Swap-distanceToSqr-and-target-test.patch => 0025-Swap-distanceToSqr-and-target-test.patch} (100%) rename patches/server/{0027-Use-Math.floor-instead-of-fastfloor.patch => 0026-Use-Math.floor-instead-of-fastfloor.patch} (89%) rename patches/server/{0028-Allow-user-to-enable-moving-into-unloaded-chunks.patch => 0027-Allow-user-to-enable-moving-into-unloaded-chunks.patch} (90%) rename patches/server/{0029-Don-t-pathfind-outside-region.patch => 0028-Don-t-pathfind-outside-region.patch} (100%) rename patches/server/{0030-Don-t-spam-recipe-changes-on-update.patch => 0029-Don-t-spam-recipe-changes-on-update.patch} (100%) rename patches/server/{0031-Option-to-disable-vanish-api.patch => 0030-Option-to-disable-vanish-api.patch} (74%) rename patches/server/{0032-Option-to-disable-player-stats.patch => 0031-Option-to-disable-player-stats.patch} (91%) rename patches/server/{0033-Option-to-disable-achievements.patch => 0032-Option-to-disable-achievements.patch} (95%) rename patches/server/{0034-Option-to-disable-arm-swing-event.patch => 0033-Option-to-disable-arm-swing-event.patch} (90%) rename patches/server/{0035-Option-to-disable-creatures-spawn-events.patch => 0034-Option-to-disable-creatures-spawn-events.patch} (100%) rename patches/server/{0036-Option-to-disable-dolphin-swim-to-treasure.patch => 0035-Option-to-disable-dolphin-swim-to-treasure.patch} (96%) rename patches/server/{0037-Unsupported-configuration.patch => 0036-Unsupported-configuration.patch} (100%) rename patches/server/{0038-Option-to-disable-ensure-tick-thread-checks.patch => 0037-Option-to-disable-ensure-tick-thread-checks.patch} (100%) rename patches/server/{0039-Don-t-kick-player-on-bad-packet.patch => 0038-Don-t-kick-player-on-bad-packet.patch} (100%) rename patches/server/{0040-Skip-event-if-no-listeners.patch => 0039-Skip-event-if-no-listeners.patch} (100%) rename patches/server/{0041-Teleport-async-if-we-cannot-move-entity-off-main.patch => 0040-Teleport-async-if-we-cannot-move-entity-off-main.patch} (95%) rename patches/server/{0042-Add-back-worldborder-command.patch => 0041-Add-back-worldborder-command.patch} (100%) rename patches/server/{0043-Add-back-data-command.patch => 0042-Add-back-data-command.patch} (100%) rename patches/server/{0044-Async-path-processing.patch => 0043-Async-path-processing.patch} (99%) rename patches/server/{0046-Global-event-synchronization.patch => 0044-Global-event-synchronization.patch} (100%) diff --git a/gradle.properties b/gradle.properties index 0d9938d..c9453cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = dev.kaiijumc.kaiiju version = 1.20.1-R0.1-SNAPSHOT mcVersion = 1.20.1 -foliaRef = f6e91e9a4cd5ba4eb5a1f89f71fd6b4f2bd0fbef +foliaRef = edafbcef6884cffe493e62cd71f4957708fba7ff org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0001-Kaiiju-Configuration.patch b/patches/api/0001-Kaiiju-Configuration.patch index 5ecfb9e..65cfa98 100644 --- a/patches/api/0001-Kaiiju-Configuration.patch +++ b/patches/api/0001-Kaiiju-Configuration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Kaiiju Configuration diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index f77553fc70bc1f3f18af50e53c0041bbaaebab9a..3607ae96bed9e54b919456ca934cddd5664a5006 100644 +index b6a8217b97842cd07af24fadb21e0e44226e5bb9..ce7dcbc0709839457df357484620f21c3d7c19c5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2081,6 +2081,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2121,6 +2121,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi } // Paper end diff --git a/patches/server/0017-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/removed/0017-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch similarity index 100% rename from patches/server/0017-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch rename to patches/removed/0017-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch diff --git a/patches/server/0045-Improve-container-checking-with-a-bitset.patch b/patches/removed/0045-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0045-Improve-container-checking-with-a-bitset.patch rename to patches/removed/0045-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0001-Rebranding.patch b/patches/server/0001-Rebranding.patch index 8d3dd4b..d296488 100644 --- a/patches/server/0001-Rebranding.patch +++ b/patches/server/0001-Rebranding.patch @@ -132,10 +132,10 @@ index abe37c7c3c6f5ab73afd738ec78f06d7e4d2ed96..52fc6bb99f6024273c7438d01314b576 stringbuilder.append(CrashReport.DATE_TIME_FORMATTER.format(ZonedDateTime.now())); stringbuilder.append("\n"); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 355acd1dd3b2e9f2a086a8d95928cdebbf63d06f..7e5645d9cb64ce17f60c85619f5640c8de4b1e86 100644 +index 75eb95c330d6ab7ac1e4a69da13695bbd40f894e..a6f1068884669cfedfe8df40506b011b8b411489 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -995,7 +995,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop(Entity.class, new ServerLevel.EntityCallbacks(), entitypersistentstorage, this.entitySliceManager); // Paper // Paper - rewrite chunk system StructureTemplateManager structuretemplatemanager = minecraftserver.getStructureManager(); diff --git a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java -index e0bfeebeaac1aaea64bc07cdfdf7790e3e43ca7b..ac35e7eb8cb5f19391a18eb9d6b5ba26769ce2f6 100644 +index e16ef1b7c0bfe6d6194c09f6787a50fd9b28f55e..3b02b7905fd16be28ba986302c1f99dfb5eb2ab8 100644 --- a/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java +++ b/src/main/java/net/minecraft/util/worldupdate/WorldUpgrader.java @@ -61,7 +61,7 @@ public class WorldUpgrader { private volatile int skipped; - private final Object2FloatMap> progressMap = Object2FloatMaps.synchronize(new Object2FloatOpenCustomHashMap(Util.identityStrategy())); // CraftBukkit + private final Object2FloatMap> progressMap = Object2FloatMaps.synchronize(new Object2FloatOpenCustomHashMap(Util.identityStrategy())); private volatile Component status = Component.translatable("optimizeWorld.stage.counting"); - public static final Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.mca$"); + public static Pattern REGEX = Pattern.compile("^r\\.(-?[0-9]+)\\.(-?[0-9]+)\\.(linear | mca)$"); // Kaiiju @@ -682,8 +682,8 @@ index e0bfeebeaac1aaea64bc07cdfdf7790e3e43ca7b..ac35e7eb8cb5f19391a18eb9d6b5ba26 public WorldUpgrader(LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, Registry dimensionOptionsRegistry, boolean eraseCache) { @@ -116,7 +116,12 @@ public class WorldUpgrader { - ResourceKey resourcekey1 = (ResourceKey) iterator1.next(); // CraftBukkit - Path path = this.levelStorage.getDimensionPath((ResourceKey) null); // CraftBukkit + ResourceKey resourcekey1 = (ResourceKey) iterator1.next(); + Path path = this.levelStorage.getDimensionPath(resourcekey1); - builder1.put(resourcekey1, new ChunkStorage(path.resolve("region"), this.dataFixer, true)); + // Kaiiju start @@ -694,9 +694,9 @@ index e0bfeebeaac1aaea64bc07cdfdf7790e3e43ca7b..ac35e7eb8cb5f19391a18eb9d6b5ba26 + // Kaiiju end } - ImmutableMap, ChunkStorage> immutablemap1 = builder1.build(); // CraftBukkit + ImmutableMap, ChunkStorage> immutablemap1 = builder1.build(); @@ -235,7 +240,7 @@ public class WorldUpgrader { - File file = this.levelStorage.getDimensionPath((ResourceKey) null).toFile(); // CraftBukkit + File file = this.levelStorage.getDimensionPath(world).toFile(); File file1 = new File(file, "region"); File[] afile = file1.listFiles((file2, s) -> { - return s.endsWith(".mca"); @@ -751,7 +751,7 @@ index 8ebecb588058da174b0e0e19e54fcddfeeca1422..1d880f27dd147da683fc30ed6f1bfa43 } diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index dcfe090c269d4cbcc2eb1b6f85392848bb34656c..d42c320179ae055b8675d1ce6ce1788ecafb8e9d 100644 +index 0c5ac12b1f395bba8b7fc50baf8e825ba6488f6c..ea4a4b3e91533790eff95c028285fbc5b8fd2cb8 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java @@ -27,7 +27,7 @@ import net.minecraft.nbt.NbtIo; @@ -1066,7 +1066,7 @@ index 5561b8499a0503b850974b1dc309edfb80219549..9394d191c56aab78e63fd3f283efedd6 this.factory = factory; this.fixerUpper = dataFixer; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 723ae4b75c84fe952377c02d42cf7a710f7047ea..1bda5bf6d69bd3b7ceda03c48760629b1366e792 100644 +index 2c19648e68c8d25bd295e2a37ce701bb3cf61e29..11ec1c94d432be7215728240f2cc1bfbdd27f836 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -561,7 +561,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0007-Alternate-Keepalive.patch b/patches/server/0007-Alternate-Keepalive.patch index 2f90ce9..4a89f03 100644 --- a/patches/server/0007-Alternate-Keepalive.patch +++ b/patches/server/0007-Alternate-Keepalive.patch @@ -22,7 +22,7 @@ index 47e23a196ae5e44600a64184b69141c00235baca..95b53b50606ea0ad47f407bebbb9e2bd } } diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 88c57c1ef147045315e923a5ba3b6f9394900f92..544c38d6ea9abaa49e3eaa457cab73d6ed032986 100644 +index 678bba9d636a0eb34270a2d26b5b3d0d6d900115..564b2e668d50f05863080288d20bd54077588db9 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -265,6 +265,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -54,7 +54,7 @@ index 88c57c1ef147045315e923a5ba3b6f9394900f92..544c38d6ea9abaa49e3eaa457cab73d6 if (this.keepAlivePending) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info -@@ -3597,6 +3612,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3610,6 +3625,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { diff --git a/patches/server/0011-Server-mod-name.patch b/patches/server/0011-Server-mod-name.patch index 7045518..a1d750e 100644 --- a/patches/server/0011-Server-mod-name.patch +++ b/patches/server/0011-Server-mod-name.patch @@ -19,10 +19,10 @@ index 46ae5b84ee5b87b0ed0b93e920689e44288a50d2..778de435ca3c13ccc2f2d86030e35294 } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bc9204d2c925437e9ff5c5d62d9faf38c2938e48..5168d16b7e9ed08bdedd0e386f9671a63b6859be 100644 +index 7243443d4bf24ad0b32b8a76d9b8701cca8612a7..3a358d159532faaf29af0118ecbfc255d9610969 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1812,7 +1812,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { -@@ -500,48 +508,50 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen + // merge container isEmpty check and move logic into one loop +@@ -571,48 +579,50 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen private static boolean a(Hopper ihopper, Container iinventory, int i, Direction enumdirection, Level world) { // Spigot ItemStack itemstack = iinventory.getItem(i); diff --git a/patches/server/0018-Add-SIMD-utilities.patch b/patches/server/0017-Add-SIMD-utilities.patch similarity index 98% rename from patches/server/0018-Add-SIMD-utilities.patch rename to patches/server/0017-Add-SIMD-utilities.patch index a678d9c..129dec7 100644 --- a/patches/server/0018-Add-SIMD-utilities.patch +++ b/patches/server/0017-Add-SIMD-utilities.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add SIMD utilities Patch from Pufferfish diff --git a/build.gradle.kts b/build.gradle.kts -index 164678d8c7f0a0a66adc957a86849fa927b7cb73..a151ca3a0803a5e653674e51e8d41a2f38b1f3df 100644 +index 99f31c4f5bf3064e483d5f387778c05742197e49..d73a4d547ad7768513773535d8cf15619c8079b0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -68,6 +68,12 @@ dependencies { diff --git a/patches/server/0019-Toggle-shared-random-for-players.patch b/patches/server/0018-Toggle-shared-random-for-players.patch similarity index 91% rename from patches/server/0019-Toggle-shared-random-for-players.patch rename to patches/server/0018-Toggle-shared-random-for-players.patch index c5f573f..172adbc 100644 --- a/patches/server/0019-Toggle-shared-random-for-players.patch +++ b/patches/server/0018-Toggle-shared-random-for-players.patch @@ -20,10 +20,10 @@ index 778de435ca3c13ccc2f2d86030e3529436a2d945..cac747a46cccf8b115917a72340e9b81 } } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ee15661227754149164893d6acf678d13b2e1b27..0c50b516d0ff1c2812a877b57148f01861f8027f 100644 +index fa35d2c1c8de225acd68e08f15976c92f7ab82aa..455f9aeac15123201d2677cdc8ba159d36229e91 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -566,6 +566,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -567,6 +567,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { this.bb = Entity.INITIAL_AABB; this.stuckSpeedMultiplier = Vec3.ZERO; this.nextStep = 1.0F; diff --git a/patches/server/0020-Kick-player-instead-of-crashing.patch b/patches/server/0019-Kick-player-instead-of-crashing.patch similarity index 100% rename from patches/server/0020-Kick-player-instead-of-crashing.patch rename to patches/server/0019-Kick-player-instead-of-crashing.patch diff --git a/patches/server/0021-Toggle-fix-TripWire-state-inconsistency.patch b/patches/server/0020-Toggle-fix-TripWire-state-inconsistency.patch similarity index 100% rename from patches/server/0021-Toggle-fix-TripWire-state-inconsistency.patch rename to patches/server/0020-Toggle-fix-TripWire-state-inconsistency.patch diff --git a/patches/server/0022-Entity-ticking-throttling-removal-to-prevent-lag.patch b/patches/server/0021-Entity-ticking-throttling-removal-to-prevent-lag.patch similarity index 98% rename from patches/server/0022-Entity-ticking-throttling-removal-to-prevent-lag.patch rename to patches/server/0021-Entity-ticking-throttling-removal-to-prevent-lag.patch index e37ab62..ac0d099 100644 --- a/patches/server/0022-Entity-ticking-throttling-removal-to-prevent-lag.patch +++ b/patches/server/0021-Entity-ticking-throttling-removal-to-prevent-lag.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity ticking throttling & removal to prevent lag. diff --git a/build.gradle.kts b/build.gradle.kts -index a151ca3a0803a5e653674e51e8d41a2f38b1f3df..30da22816eecfce179d365fa4de2b979438a302a 100644 +index d73a4d547ad7768513773535d8cf15619c8079b0..f29c4621b3ab04aec026c9062c979a659d620738 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,6 +23,7 @@ dependencies { @@ -353,7 +353,7 @@ index 1818c5ae88c331fb900470436f72049165c9e9f4..7115a481bc8805333aa36af334132f98 timings.tickEntities.stopTiming(); // Spigot gameprofilerfiller.pop(); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 1f194f5324ab5efc5ae11d248dd09f875624559c..641d27bdc711f5d1cdf39637f8ad032d46575216 100644 +index a090c16d53fcb220687a18aa37ca82663f4660c7..adad8d0cfec6c1b2be2c11ce847f64a92d39e1ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -179,6 +179,11 @@ public class Main { diff --git a/patches/server/0023-Toggle-safe-teleportation.patch b/patches/server/0022-Toggle-safe-teleportation.patch similarity index 95% rename from patches/server/0023-Toggle-safe-teleportation.patch rename to patches/server/0022-Toggle-safe-teleportation.patch index 7d2f575..1c495a3 100644 --- a/patches/server/0023-Toggle-safe-teleportation.patch +++ b/patches/server/0022-Toggle-safe-teleportation.patch @@ -22,10 +22,10 @@ index 816db23fa64aab69e3034484c00645ebd0479978..7c6c74f95c2534624a928ccf6b0a4b9d } } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 300b4e97b7ad2408766762940bd7328a8e0649ac..31c741bb6aa70f0456f72710cf277a8ce9ddff3f 100644 +index 455f9aeac15123201d2677cdc8ba159d36229e91..4f8abe7cc8a687e7b55108a9b78b12a1f3deecd3 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3942,6 +3942,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3944,6 +3944,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { protected boolean tryEndPortal() { io.papermc.paper.util.TickThread.ensureTickThread(this, "Cannot portal entity async"); diff --git a/patches/server/0024-Toggle-sand-duplication.patch b/patches/server/0023-Toggle-sand-duplication.patch similarity index 100% rename from patches/server/0024-Toggle-sand-duplication.patch rename to patches/server/0023-Toggle-sand-duplication.patch diff --git a/patches/server/0025-Vanilla-end-portal-teleportation.patch b/patches/server/0024-Vanilla-end-portal-teleportation.patch similarity index 91% rename from patches/server/0025-Vanilla-end-portal-teleportation.patch rename to patches/server/0024-Vanilla-end-portal-teleportation.patch index ddf98f7..dc71d6e 100644 --- a/patches/server/0025-Vanilla-end-portal-teleportation.patch +++ b/patches/server/0024-Vanilla-end-portal-teleportation.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Vanilla end portal teleportation diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 31c741bb6aa70f0456f72710cf277a8ce9ddff3f..114ab0bf54538e39050a1da7cb7703d16033d24d 100644 +index 4f8abe7cc8a687e7b55108a9b78b12a1f3deecd3..7c57675adc33d7c5525cdf8ebfd696a0e756c9a7 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -4028,12 +4028,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4030,12 +4030,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { targetPos, 16, // load 16 blocks to be safe from block physics ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGH, (chunks) -> { @@ -28,7 +28,7 @@ index 31c741bb6aa70f0456f72710cf277a8ce9ddff3f..114ab0bf54538e39050a1da7cb7703d1 ); } ); -@@ -4220,6 +4225,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4222,6 +4227,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { if (!this.canPortalAsync(takePassengers)) { return false; } @@ -39,7 +39,7 @@ index 31c741bb6aa70f0456f72710cf277a8ce9ddff3f..114ab0bf54538e39050a1da7cb7703d1 Vec3 initialPosition = this.position(); ChunkPos initialPositionChunk = new ChunkPos( -@@ -4278,7 +4287,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -4280,7 +4289,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // place passengerTree.root.placeInAsync( originWorld, destination, Entity.TELEPORT_FLAG_LOAD_CHUNK | (takePassengers ? Entity.TELEPORT_FLAG_TELEPORT_PASSENGERS : 0L), diff --git a/patches/server/0026-Swap-distanceToSqr-and-target-test.patch b/patches/server/0025-Swap-distanceToSqr-and-target-test.patch similarity index 100% rename from patches/server/0026-Swap-distanceToSqr-and-target-test.patch rename to patches/server/0025-Swap-distanceToSqr-and-target-test.patch diff --git a/patches/server/0027-Use-Math.floor-instead-of-fastfloor.patch b/patches/server/0026-Use-Math.floor-instead-of-fastfloor.patch similarity index 89% rename from patches/server/0027-Use-Math.floor-instead-of-fastfloor.patch rename to patches/server/0026-Use-Math.floor-instead-of-fastfloor.patch index b39e3e2..8f30551 100644 --- a/patches/server/0027-Use-Math.floor-instead-of-fastfloor.patch +++ b/patches/server/0026-Use-Math.floor-instead-of-fastfloor.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Use Math.floor instead of fastfloor diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java -index ff6716210d13db4472c67a56003b24c7b0af8224..abb3e86882453062884be20f18f39c6e3c84dccd 100644 +index cadb91c7f5ef80aac8513f246fdf481947fa0a17..c1a2d67cb62af94c8bb4dff97f4fcb47542562dd 100644 --- a/src/main/java/io/papermc/paper/util/MCUtil.java +++ b/src/main/java/io/papermc/paper/util/MCUtil.java -@@ -165,13 +165,19 @@ public final class MCUtil { +@@ -168,13 +168,19 @@ public final class MCUtil { } public static int fastFloor(double x) { diff --git a/patches/server/0028-Allow-user-to-enable-moving-into-unloaded-chunks.patch b/patches/server/0027-Allow-user-to-enable-moving-into-unloaded-chunks.patch similarity index 90% rename from patches/server/0028-Allow-user-to-enable-moving-into-unloaded-chunks.patch rename to patches/server/0027-Allow-user-to-enable-moving-into-unloaded-chunks.patch index a4a3761..33bfa51 100644 --- a/patches/server/0028-Allow-user-to-enable-moving-into-unloaded-chunks.patch +++ b/patches/server/0027-Allow-user-to-enable-moving-into-unloaded-chunks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow user to enable moving into unloaded chunks diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index a00201eca053ef69b8d903fdb9538444baf85465..bb9f088e3b7b90ab38d794433fc5d30d39e12c76 100644 +index 571c18117d7f85eddff31d535c09b46e0e9e4341..afaaa7fc06b4c0c1a355fdd3280003cfed40429e 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -415,14 +415,14 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -463,14 +463,14 @@ public class WorldConfiguration extends ConfigurationPart { public class Chunks extends Post { @Override public void postProcess() { diff --git a/patches/server/0029-Don-t-pathfind-outside-region.patch b/patches/server/0028-Don-t-pathfind-outside-region.patch similarity index 100% rename from patches/server/0029-Don-t-pathfind-outside-region.patch rename to patches/server/0028-Don-t-pathfind-outside-region.patch diff --git a/patches/server/0030-Don-t-spam-recipe-changes-on-update.patch b/patches/server/0029-Don-t-spam-recipe-changes-on-update.patch similarity index 100% rename from patches/server/0030-Don-t-spam-recipe-changes-on-update.patch rename to patches/server/0029-Don-t-spam-recipe-changes-on-update.patch diff --git a/patches/server/0031-Option-to-disable-vanish-api.patch b/patches/server/0030-Option-to-disable-vanish-api.patch similarity index 74% rename from patches/server/0031-Option-to-disable-vanish-api.patch rename to patches/server/0030-Option-to-disable-vanish-api.patch index 01c3261..aeba943 100644 --- a/patches/server/0031-Option-to-disable-vanish-api.patch +++ b/patches/server/0030-Option-to-disable-vanish-api.patch @@ -20,17 +20,17 @@ index cac747a46cccf8b115917a72340e9b81e7a437c9..a3c15f1009dad095b9411242e2d0347a public static String serverModName = "Kaiiju"; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index f50507ab85282d261985ce9b186581f5a7a50f79..4fb7ee801173c3f4621d7f09fcefe7c24da5f001 100644 +index 2b9ec3e7ddb5f5d18553bf82717405552f441f45..96ee7b65f292ac86ffa8c5d371e283eba9bd1133 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -1350,7 +1350,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider - boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player); +@@ -1362,7 +1362,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider + // Folia end - region threading // CraftBukkit start - respect vanish API -- if (!io.papermc.paper.util.TickThread.isTickThreadFor(player) || !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Folia - region threading +- if (flag && !io.papermc.paper.util.TickThread.isTickThreadFor(player) || !player.getBukkitEntity().canSee(this.entity.getBukkitEntity())) { // Folia - region threading + // Kaiiju start - don't respect vanish API >:D + boolean canSee = true; -+ if (!dev.kaiijumc.kaiiju.KaiijuConfig.disableVanishApi) canSee = player.getBukkitEntity().canSee(this.entity.getBukkitEntity()); ++ if (flag && !dev.kaiijumc.kaiiju.KaiijuConfig.disableVanishApi) canSee = player.getBukkitEntity().canSee(this.entity.getBukkitEntity()); + if (!io.papermc.paper.util.TickThread.isTickThreadFor(player) || !canSee) { // Folia - region threading + // Kaiiju end flag = false; diff --git a/patches/server/0032-Option-to-disable-player-stats.patch b/patches/server/0031-Option-to-disable-player-stats.patch similarity index 91% rename from patches/server/0032-Option-to-disable-player-stats.patch rename to patches/server/0031-Option-to-disable-player-stats.patch index 3e76d64..4bf2b57 100644 --- a/patches/server/0032-Option-to-disable-player-stats.patch +++ b/patches/server/0031-Option-to-disable-player-stats.patch @@ -21,10 +21,10 @@ index a3c15f1009dad095b9411242e2d0347a6141984b..8c872b2ad341f0105275209201fda037 public static String serverModName = "Kaiiju"; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index c0ad878cd29e2f72b7899d9539031b15ccbf6193..53f5bf8e6660f25290d4e64aca9c2911921b9fed 100644 +index 7cb6a0b99c8e51f7f767b704071473c5d8bded7d..e0e7e0a2f60aff5bc8c625988860036722707da8 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2138,6 +2138,7 @@ public class ServerPlayer extends Player { +@@ -2143,6 +2143,7 @@ public class ServerPlayer extends Player { @Override public void awardStat(Stat stat, int amount) { diff --git a/patches/server/0033-Option-to-disable-achievements.patch b/patches/server/0032-Option-to-disable-achievements.patch similarity index 95% rename from patches/server/0033-Option-to-disable-achievements.patch rename to patches/server/0032-Option-to-disable-achievements.patch index 4cab3a2..6558a61 100644 --- a/patches/server/0033-Option-to-disable-achievements.patch +++ b/patches/server/0032-Option-to-disable-achievements.patch @@ -24,7 +24,7 @@ index 9f0095f2196133a8bcffd5306aa9ac0b99b2f8d7..31d66bb2fcf4bb7262df2d8006e307fe public boolean fixVoidTrading = true; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 53f5bf8e6660f25290d4e64aca9c2911921b9fed..3c1871a879a14d38e56b0c31a73b2f42597d0816 100644 +index e0e7e0a2f60aff5bc8c625988860036722707da8..6f1878a8a0c904322286079f500592a268a269e9 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -792,7 +792,7 @@ public class ServerPlayer extends Player { @@ -120,7 +120,7 @@ index 53f5bf8e6660f25290d4e64aca9c2911921b9fed..3c1871a879a14d38e56b0c31a73b2f42 }); if (!this.serverLevel().canSleepThroughNights()) { -@@ -2158,7 +2158,7 @@ public class ServerPlayer extends Player { +@@ -2163,7 +2163,7 @@ public class ServerPlayer extends Player { @Override public void triggerRecipeCrafted(Recipe recipe, List ingredients) { @@ -129,7 +129,7 @@ index 53f5bf8e6660f25290d4e64aca9c2911921b9fed..3c1871a879a14d38e56b0c31a73b2f42 } @Override -@@ -2287,14 +2287,14 @@ public class ServerPlayer extends Player { +@@ -2292,14 +2292,14 @@ public class ServerPlayer extends Player { this.levitationStartPos = this.position(); } @@ -146,7 +146,7 @@ index 53f5bf8e6660f25290d4e64aca9c2911921b9fed..3c1871a879a14d38e56b0c31a73b2f42 } @Override -@@ -2305,7 +2305,7 @@ public class ServerPlayer extends Player { +@@ -2310,7 +2310,7 @@ public class ServerPlayer extends Player { this.levitationStartPos = null; } @@ -155,7 +155,7 @@ index 53f5bf8e6660f25290d4e64aca9c2911921b9fed..3c1871a879a14d38e56b0c31a73b2f42 } @Override -@@ -2865,7 +2865,7 @@ public class ServerPlayer extends Player { +@@ -2870,7 +2870,7 @@ public class ServerPlayer extends Player { @Override protected void updateUsingItem(ItemStack stack) { @@ -164,7 +164,7 @@ index 53f5bf8e6660f25290d4e64aca9c2911921b9fed..3c1871a879a14d38e56b0c31a73b2f42 super.updateUsingItem(stack); } -@@ -2894,7 +2894,7 @@ public class ServerPlayer extends Player { +@@ -2899,7 +2899,7 @@ public class ServerPlayer extends Player { Entity entity = item.getOwner(); if (entity != null) { diff --git a/patches/server/0034-Option-to-disable-arm-swing-event.patch b/patches/server/0033-Option-to-disable-arm-swing-event.patch similarity index 90% rename from patches/server/0034-Option-to-disable-arm-swing-event.patch rename to patches/server/0033-Option-to-disable-arm-swing-event.patch index 3f8c0d3..6522c54 100644 --- a/patches/server/0034-Option-to-disable-arm-swing-event.patch +++ b/patches/server/0033-Option-to-disable-arm-swing-event.patch @@ -22,10 +22,10 @@ index 8c872b2ad341f0105275209201fda03706535161..9b118a6e22264c88c0460016822b1920 public static String serverModName = "Kaiiju"; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 544c38d6ea9abaa49e3eaa457cab73d6ed032986..b3d6f70b1b60607b35b9e3abe61c853ee5374a20 100644 +index 564b2e668d50f05863080288d20bd54077588db9..78ac2b47335961b15a8dd8851d17b79c249bc275 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2693,6 +2693,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2705,6 +2705,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); if (this.player.isImmobile()) return; // CraftBukkit this.player.resetLastActionTime(); @@ -33,7 +33,7 @@ index 544c38d6ea9abaa49e3eaa457cab73d6ed032986..b3d6f70b1b60607b35b9e3abe61c853e // CraftBukkit start - Raytrace to look for 'rogue armswings' float f1 = this.player.getXRot(); float f2 = this.player.getYRot(); -@@ -2725,6 +2726,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2737,6 +2738,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (event.isCancelled()) return; // CraftBukkit end diff --git a/patches/server/0035-Option-to-disable-creatures-spawn-events.patch b/patches/server/0034-Option-to-disable-creatures-spawn-events.patch similarity index 100% rename from patches/server/0035-Option-to-disable-creatures-spawn-events.patch rename to patches/server/0034-Option-to-disable-creatures-spawn-events.patch diff --git a/patches/server/0036-Option-to-disable-dolphin-swim-to-treasure.patch b/patches/server/0035-Option-to-disable-dolphin-swim-to-treasure.patch similarity index 96% rename from patches/server/0036-Option-to-disable-dolphin-swim-to-treasure.patch rename to patches/server/0035-Option-to-disable-dolphin-swim-to-treasure.patch index a988522..0347a25 100644 --- a/patches/server/0036-Option-to-disable-dolphin-swim-to-treasure.patch +++ b/patches/server/0035-Option-to-disable-dolphin-swim-to-treasure.patch @@ -25,7 +25,7 @@ index c9830912019079369268bfbf2c95de18ad598f52..e2fb7d7a7b3126d386b46442c115085d public boolean fixVoidTrading = true; diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java -index 4ec6dc8ddcb940091956fdf014f43832db287d8d..770c3c26702d4136df6b8f891f4949f364b62a1b 100644 +index 8448c5d778998390cf2b683f36e4e18ca7ffdc34..8438ae5194bba7cad22af5e350c5a288529cbcdb 100644 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java @@ -164,7 +164,7 @@ public class Dolphin extends WaterAnimal { diff --git a/patches/server/0037-Unsupported-configuration.patch b/patches/server/0036-Unsupported-configuration.patch similarity index 100% rename from patches/server/0037-Unsupported-configuration.patch rename to patches/server/0036-Unsupported-configuration.patch diff --git a/patches/server/0038-Option-to-disable-ensure-tick-thread-checks.patch b/patches/server/0037-Option-to-disable-ensure-tick-thread-checks.patch similarity index 100% rename from patches/server/0038-Option-to-disable-ensure-tick-thread-checks.patch rename to patches/server/0037-Option-to-disable-ensure-tick-thread-checks.patch diff --git a/patches/server/0039-Don-t-kick-player-on-bad-packet.patch b/patches/server/0038-Don-t-kick-player-on-bad-packet.patch similarity index 100% rename from patches/server/0039-Don-t-kick-player-on-bad-packet.patch rename to patches/server/0038-Don-t-kick-player-on-bad-packet.patch diff --git a/patches/server/0040-Skip-event-if-no-listeners.patch b/patches/server/0039-Skip-event-if-no-listeners.patch similarity index 100% rename from patches/server/0040-Skip-event-if-no-listeners.patch rename to patches/server/0039-Skip-event-if-no-listeners.patch diff --git a/patches/server/0041-Teleport-async-if-we-cannot-move-entity-off-main.patch b/patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch similarity index 95% rename from patches/server/0041-Teleport-async-if-we-cannot-move-entity-off-main.patch rename to patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch index bc89194..dacb20d 100644 --- a/patches/server/0041-Teleport-async-if-we-cannot-move-entity-off-main.patch +++ b/patches/server/0040-Teleport-async-if-we-cannot-move-entity-off-main.patch @@ -26,10 +26,10 @@ index e2fb7d7a7b3126d386b46442c115085d1974ac4e..44f5540a6a5733cf6f10f6b04fc9611a } } diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 114ab0bf54538e39050a1da7cb7703d16033d24d..d45a327451eca246804291463e107f02c3eabfa0 100644 +index 7c57675adc33d7c5525cdf8ebfd696a0e756c9a7..69abd1a59a5d2855c6dd264c0e8e483eccba0132 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -1125,7 +1125,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -1127,7 +1127,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } } @@ -50,7 +50,7 @@ index 114ab0bf54538e39050a1da7cb7703d16033d24d..d45a327451eca246804291463e107f02 } this.level().getProfiler().pop(); -@@ -3867,13 +3880,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -3869,13 +3882,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { // check for same region if (destination == this.level()) { Vec3 currPos = this.position(); diff --git a/patches/server/0042-Add-back-worldborder-command.patch b/patches/server/0041-Add-back-worldborder-command.patch similarity index 100% rename from patches/server/0042-Add-back-worldborder-command.patch rename to patches/server/0041-Add-back-worldborder-command.patch diff --git a/patches/server/0043-Add-back-data-command.patch b/patches/server/0042-Add-back-data-command.patch similarity index 100% rename from patches/server/0043-Add-back-data-command.patch rename to patches/server/0042-Add-back-data-command.patch diff --git a/patches/server/0044-Async-path-processing.patch b/patches/server/0043-Async-path-processing.patch similarity index 99% rename from patches/server/0044-Async-path-processing.patch rename to patches/server/0043-Async-path-processing.patch index c61c907..6eb6ed2 100644 --- a/patches/server/0044-Async-path-processing.patch +++ b/patches/server/0043-Async-path-processing.patch @@ -525,10 +525,10 @@ index a21edc7df32a59a6cb1af3865d2ce35f72cf8afc..e9d4722f65c6fe6fd867d5af399c6bb8 if (this.target != null && (!io.papermc.paper.util.TickThread.isTickThreadFor(this.target) || this.target.isRemoved())) { this.target = null; 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 d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..ef5ec638bcd88df6eb93746868e863dbe0d11677 100644 +index 8f8b29f80d1573981ccffd207dd6e0941e71a352..501cb2a9fed1eaa2be529e9118827032cd7e0302 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 -@@ -67,6 +67,40 @@ public class AcquirePoi { +@@ -68,6 +68,40 @@ public class AcquirePoi { io.papermc.paper.util.PoiAccess.findNearestPoiPositions(poiManager, poiPredicate, predicate2, entity.blockPosition(), 48, 48*48, PoiManager.Occupancy.HAS_SPACE, false, 5, poiposes); Set, BlockPos>> set = new java.util.HashSet<>(poiposes); // Paper end - optimise POI access @@ -569,7 +569,7 @@ index d4c91e0a0c64fcb7f1145de3f30134cb1f1f8ee6..ef5ec638bcd88df6eb93746868e863db Path path = findPathToPois(entity, set); if (path != null && path.canReach()) { BlockPos blockPos = path.getTarget(); -@@ -88,6 +122,7 @@ public class AcquirePoi { +@@ -89,6 +123,7 @@ public class AcquirePoi { }); } } diff --git a/patches/server/0046-Global-event-synchronization.patch b/patches/server/0044-Global-event-synchronization.patch similarity index 100% rename from patches/server/0046-Global-event-synchronization.patch rename to patches/server/0044-Global-event-synchronization.patch