diff --git a/Paper b/Paper index 83f377be8..83c89d7af 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 83f377be8bcde04df5a78d0bcbd62320542f9da3 +Subproject commit 83c89d7afc92d98286121deca9f923106abadcc8 diff --git a/current-paper b/current-paper index f1f397cd3..da0a3445a 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.4--02b36633a35eb9dd7b1b2384f67e094c020de14f +1.16.4--c3c709479fe76495ed3f5f8df48b259a703229c5 diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index a0bf3d5df..d47762910 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -400,7 +400,7 @@ This patch also prevents the saving/unloading of POI data when world saving is disabled. diff --git a/pom.xml b/pom.xml -index 80f165291..78c2a8bbc 100644 +index 80f1652913..78c2a8bbcc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -500,7 +500,7 @@ index 80f165291..78c2a8bbc 100644 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java -index 884b59d47..68ab5ccb2 100644 +index 884b59d478..68ab5ccb2f 100644 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java @@ -43,6 +43,9 @@ public final class MinecraftTimings { @@ -514,7 +514,7 @@ index 884b59d47..68ab5ccb2 100644 private MinecraftTimings() {} diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index e33e889c2..5dfa06588 100644 +index e33e889c29..5dfa065883 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -229,7 +229,8 @@ public class TimingsExport extends Thread { @@ -528,7 +528,7 @@ index e33e889c2..5dfa06588 100644 new TimingsExport(listeners, parent, history).start(); diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index d798de637..a4602ebaa 100644 +index d798de6373..a4602ebaa2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -225,8 +225,20 @@ public class PaperCommand extends Command { @@ -562,7 +562,7 @@ index d798de637..a4602ebaa 100644 } diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 49a38c660..255bbd6e4 100644 +index 49a38c6608..255bbd6e48 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -24,8 +24,8 @@ public class PaperVersionFetcher implements VersionFetcher { @@ -593,7 +593,7 @@ index 49a38c660..255bbd6e4 100644 switch (distance) { case -1: diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java -index e7624948e..77df68888 100644 +index e7624948ea..77df688880 100644 --- a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java @@ -186,6 +186,7 @@ public final class PaperTickList extends TickListServer { // extend to avo @@ -677,7 +677,7 @@ index e7624948e..77df68888 100644 int ret = 0; diff --git a/src/main/java/com/mojang/brigadier/CommandDispatcher.java b/src/main/java/com/mojang/brigadier/CommandDispatcher.java -index 103576715..e8fdbe7b8 100644 +index 103576715e..e8fdbe7b8d 100644 --- a/src/main/java/com/mojang/brigadier/CommandDispatcher.java +++ b/src/main/java/com/mojang/brigadier/CommandDispatcher.java @@ -590,10 +590,11 @@ public class CommandDispatcher { @@ -694,7 +694,7 @@ index 103576715..e8fdbe7b8 100644 } futures[i++] = future; diff --git a/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java b/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java -index cb993ca10..849686f7b 100644 +index cb993ca102..849686f7b2 100644 --- a/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java +++ b/src/main/java/com/mojang/brigadier/arguments/BoolArgumentType.java @@ -34,10 +34,10 @@ public class BoolArgumentType implements ArgumentType { @@ -711,7 +711,7 @@ index cb993ca10..849686f7b 100644 } return builder.buildFuture(); diff --git a/src/main/java/com/mojang/brigadier/suggestion/SuggestionsBuilder.java b/src/main/java/com/mojang/brigadier/suggestion/SuggestionsBuilder.java -index bc0024adb..0343f6663 100644 +index bc0024adb8..0343f6663c 100644 --- a/src/main/java/com/mojang/brigadier/suggestion/SuggestionsBuilder.java +++ b/src/main/java/com/mojang/brigadier/suggestion/SuggestionsBuilder.java @@ -14,9 +14,16 @@ public class SuggestionsBuilder { @@ -732,7 +732,7 @@ index bc0024adb..0343f6663 100644 this.start = start; this.remaining = input.substring(start); diff --git a/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java b/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java -index 772057879..e5db29d4c 100644 +index 7720578796..e5db29d4ca 100644 --- a/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/LiteralCommandNode.java @@ -20,11 +20,11 @@ import java.util.concurrent.CompletableFuture; @@ -760,7 +760,7 @@ index 772057879..e5db29d4c 100644 return Suggestions.empty(); diff --git a/src/main/java/com/tuinity/tuinity/chunk/ChunkEntitiesByClass.java b/src/main/java/com/tuinity/tuinity/chunk/ChunkEntitiesByClass.java new file mode 100644 -index 000000000..37428f4b9 +index 0000000000..37428f4b9a --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/ChunkEntitiesByClass.java @@ -0,0 +1,186 @@ @@ -952,7 +952,7 @@ index 000000000..37428f4b9 +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java b/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java new file mode 100644 -index 000000000..cae06962d +index 0000000000..cae06962d8 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java @@ -0,0 +1,491 @@ @@ -1450,7 +1450,7 @@ index 000000000..cae06962d \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/chunk/light/BlockStarLightEngine.java b/src/main/java/com/tuinity/tuinity/chunk/light/BlockStarLightEngine.java new file mode 100644 -index 000000000..e7df9dc4b +index 0000000000..e7df9dc4b8 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/light/BlockStarLightEngine.java @@ -0,0 +1,155 @@ @@ -1611,7 +1611,7 @@ index 000000000..e7df9dc4b +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/light/SWMRNibbleArray.java b/src/main/java/com/tuinity/tuinity/chunk/light/SWMRNibbleArray.java new file mode 100644 -index 000000000..6cae16cc3 +index 0000000000..6cae16cc32 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/light/SWMRNibbleArray.java @@ -0,0 +1,196 @@ @@ -1813,7 +1813,7 @@ index 000000000..6cae16cc3 +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/light/SkyStarLightEngine.java b/src/main/java/com/tuinity/tuinity/chunk/light/SkyStarLightEngine.java new file mode 100644 -index 000000000..e780ae852 +index 0000000000..e780ae852a --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/light/SkyStarLightEngine.java @@ -0,0 +1,357 @@ @@ -2176,7 +2176,7 @@ index 000000000..e780ae852 +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/light/StarLightEngine.java b/src/main/java/com/tuinity/tuinity/chunk/light/StarLightEngine.java new file mode 100644 -index 000000000..7fcbfa5c2 +index 0000000000..7fcbfa5c22 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/light/StarLightEngine.java @@ -0,0 +1,1014 @@ @@ -3196,7 +3196,7 @@ index 000000000..7fcbfa5c2 +} diff --git a/src/main/java/com/tuinity/tuinity/chunk/light/ThreadedStarLightEngine.java b/src/main/java/com/tuinity/tuinity/chunk/light/ThreadedStarLightEngine.java new file mode 100644 -index 000000000..767831d16 +index 0000000000..767831d169 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/chunk/light/ThreadedStarLightEngine.java @@ -0,0 +1,181 @@ @@ -3383,7 +3383,7 @@ index 000000000..767831d16 +} diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java new file mode 100644 -index 000000000..42ce3b802 +index 0000000000..42ce3b8021 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java @@ -0,0 +1,381 @@ @@ -3771,7 +3771,7 @@ index 000000000..42ce3b802 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/CachedLists.java b/src/main/java/com/tuinity/tuinity/util/CachedLists.java new file mode 100644 -index 000000000..21e50c75e +index 0000000000..21e50c75e0 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/CachedLists.java @@ -0,0 +1,74 @@ @@ -3851,7 +3851,7 @@ index 000000000..21e50c75e +} diff --git a/src/main/java/com/tuinity/tuinity/util/IntervalledCounter.java b/src/main/java/com/tuinity/tuinity/util/IntervalledCounter.java new file mode 100644 -index 000000000..d2c7d2c79 +index 0000000000..d2c7d2c792 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/IntervalledCounter.java @@ -0,0 +1,100 @@ @@ -3957,7 +3957,7 @@ index 000000000..d2c7d2c79 +} diff --git a/src/main/java/com/tuinity/tuinity/util/TickThread.java b/src/main/java/com/tuinity/tuinity/util/TickThread.java new file mode 100644 -index 000000000..08ed24325 +index 0000000000..08ed243259 --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/TickThread.java @@ -0,0 +1,41 @@ @@ -4005,7 +4005,7 @@ index 000000000..08ed24325 \ No newline at end of file diff --git a/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java new file mode 100644 -index 000000000..be408aebb +index 0000000000..be408aebbc --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java @@ -0,0 +1,335 @@ @@ -4346,7 +4346,7 @@ index 000000000..be408aebb +} diff --git a/src/main/java/com/tuinity/tuinity/util/misc/Delayed26WayDistancePropagator3D.java b/src/main/java/com/tuinity/tuinity/util/misc/Delayed26WayDistancePropagator3D.java new file mode 100644 -index 000000000..155d10994 +index 0000000000..155d10994f --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/misc/Delayed26WayDistancePropagator3D.java @@ -0,0 +1,295 @@ @@ -4647,7 +4647,7 @@ index 000000000..155d10994 +} diff --git a/src/main/java/com/tuinity/tuinity/util/misc/Delayed8WayDistancePropagator2D.java b/src/main/java/com/tuinity/tuinity/util/misc/Delayed8WayDistancePropagator2D.java new file mode 100644 -index 000000000..606417a8a +index 0000000000..606417a8ae --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/util/misc/Delayed8WayDistancePropagator2D.java @@ -0,0 +1,713 @@ @@ -5366,7 +5366,7 @@ index 000000000..606417a8a +} diff --git a/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java b/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java new file mode 100644 -index 000000000..002abb3cb +index 0000000000..002abb3cbf --- /dev/null +++ b/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java @@ -0,0 +1,165 @@ @@ -5536,7 +5536,7 @@ index 000000000..002abb3cb + } +} diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java -index ed9b2f9ad..9fbb77e70 100644 +index ed9b2f9adf..9fbb77e70d 100644 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java @@ -13,6 +13,149 @@ public class AxisAlignedBB { @@ -5714,7 +5714,7 @@ index ed9b2f9ad..9fbb77e70 100644 return d0 >= this.minX && d0 < this.maxX && d1 >= this.minY && d1 < this.maxY && d2 >= this.minZ && d2 < this.maxZ; } diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index 6b655b744..e811295b4 100644 +index 6b655b744d..e811295b4d 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -16,9 +16,9 @@ public class BaseBlockPosition implements Comparable { @@ -5750,7 +5750,7 @@ index 6b655b744..e811295b4 100644 } diff --git a/src/main/java/net/minecraft/server/Behavior.java b/src/main/java/net/minecraft/server/Behavior.java -index 65af97652..0b9d469a9 100644 +index 65af976527..0b9d469a92 100644 --- a/src/main/java/net/minecraft/server/Behavior.java +++ b/src/main/java/net/minecraft/server/Behavior.java @@ -7,7 +7,7 @@ import java.util.Map.Entry; @@ -5763,7 +5763,7 @@ index 65af97652..0b9d469a9 100644 private final int d; private final int e; diff --git a/src/main/java/net/minecraft/server/BehaviorFindPosition.java b/src/main/java/net/minecraft/server/BehaviorFindPosition.java -index 63a761ebe..8d445e9c0 100644 +index 63a761ebef..8d445e9c08 100644 --- a/src/main/java/net/minecraft/server/BehaviorFindPosition.java +++ b/src/main/java/net/minecraft/server/BehaviorFindPosition.java @@ -55,6 +55,227 @@ public class BehaviorFindPosition extends Behavior { @@ -6013,7 +6013,7 @@ index 63a761ebe..8d445e9c0 100644 worldserver.broadcastEntityEffect(entitycreature, obyte); }); diff --git a/src/main/java/net/minecraft/server/BehaviorGate.java b/src/main/java/net/minecraft/server/BehaviorGate.java -index 46e910581..fb967bc03 100644 +index 46e9105812..fb967bc03f 100644 --- a/src/main/java/net/minecraft/server/BehaviorGate.java +++ b/src/main/java/net/minecraft/server/BehaviorGate.java @@ -12,7 +12,7 @@ public class BehaviorGate extends Behavior { @@ -6128,7 +6128,7 @@ index 46e910581..fb967bc03 100644 }; diff --git a/src/main/java/net/minecraft/server/BehaviorLookInteract.java b/src/main/java/net/minecraft/server/BehaviorLookInteract.java -index a33303c31..ce57e6a4a 100644 +index a33303c318..ce57e6a4ac 100644 --- a/src/main/java/net/minecraft/server/BehaviorLookInteract.java +++ b/src/main/java/net/minecraft/server/BehaviorLookInteract.java @@ -7,7 +7,7 @@ import java.util.function.Predicate; @@ -6200,7 +6200,7 @@ index a33303c31..ce57e6a4a 100644 return this.b.equals(entityliving.getEntityType()) && this.d.test(entityliving); } diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java -index 1f334d632..4d1ac4e6b 100644 +index 1f334d6328..4d1ac4e6b6 100644 --- a/src/main/java/net/minecraft/server/BlockBase.java +++ b/src/main/java/net/minecraft/server/BlockBase.java @@ -295,21 +295,23 @@ public abstract class BlockBase { @@ -6375,7 +6375,7 @@ index 1f334d632..4d1ac4e6b 100644 protected final boolean c; private final boolean[] j; diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index 12a023044..9e5e6de52 100644 +index 12a0230448..9e5e6de52e 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -195,7 +195,7 @@ public class BlockChest extends BlockChestAbstract implements I @@ -6388,7 +6388,7 @@ index 12a023044..9e5e6de52 100644 if (tileentity instanceof IInventory) { InventoryUtils.dropInventory(world, blockposition, (IInventory) tileentity); diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 2d887af90..2291135ea 100644 +index 2d887af902..2291135eae 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -449,10 +449,10 @@ public class BlockPosition extends BaseBlockPosition { @@ -6485,7 +6485,7 @@ index 2d887af90..2291135ea 100644 @Override public BlockPosition immutableCopy() { diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index dcbae1c45..96bdb9580 100644 +index dcbae1c451..96bdb95800 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -91,6 +91,175 @@ public class Chunk implements IChunkAccess { @@ -6747,7 +6747,7 @@ index dcbae1c45..96bdb9580 100644 int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D); diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java -index 8eecdcde5..831aaffaa 100644 +index 8eecdcde51..831aaffaa1 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java +++ b/src/main/java/net/minecraft/server/ChunkCache.java @@ -1,5 +1,6 @@ @@ -6975,7 +6975,7 @@ index 8eecdcde5..831aaffaa 100644 this.e = world; this.a = blockposition.getX() >> 4; diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 3c7b225ed..f1c686810 100644 +index 3c7b225edb..f1c686810f 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -31,7 +31,7 @@ public abstract class ChunkMapDistance { @@ -7158,7 +7158,7 @@ index 3c7b225ed..f1c686810 100644 for (java.util.Iterator>>> iterator = this.tickets.long2ObjectEntrySet().fastIterator(); iterator.hasNext();) { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 6acb5f05a..84429f12d 100644 +index 6acb5f05a0..84429f12d0 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -22,6 +22,12 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; // Paper @@ -7575,7 +7575,7 @@ index 6acb5f05a..84429f12d 100644 try { boolean execChunkTask = com.destroystokyo.paper.io.chunk.ChunkTaskManager.pollChunkWaitQueue() || ChunkProviderServer.this.world.asyncChunkTaskManager.pollNextChunkTask(); // Paper diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 8e7da2c5f..64dd95292 100644 +index 8e7da2c5f3..64dd95292f 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -24,6 +24,14 @@ public class ChunkRegionLoader { @@ -7727,7 +7727,7 @@ index 8e7da2c5f..64dd95292 100644 BiomeStorage biomestorage = ichunkaccess.getBiomeIndex(); diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index e52df8096..ea943e44a 100644 +index e52df8096e..ea943e44ab 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -11,10 +11,45 @@ public class ChunkSection { @@ -7816,7 +7816,7 @@ index e52df8096..ea943e44a 100644 if (!iblockdata.isAir()) { diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java -index f6c9bdbf5..51ea295d6 100644 +index f6c9bdbf52..51ea295d66 100644 --- a/src/main/java/net/minecraft/server/ChunkStatus.java +++ b/src/main/java/net/minecraft/server/ChunkStatus.java @@ -109,7 +109,7 @@ public class ChunkStatus { @@ -7838,7 +7838,7 @@ index f6c9bdbf5..51ea295d6 100644 } diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index 26b48b5ff..353b61aa5 100644 +index 26b48b5ffa..353b61aa57 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -52,6 +52,7 @@ public class DataBits { @@ -7866,7 +7866,7 @@ index 26b48b5ff..353b61aa5 100644 //Validate.inclusiveBetween(0L, (long) (this.e - 1), (long) i); // Paper int j = this.b(i); diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index 95ef96286..73163b417 100644 +index 95ef962868..73163b417a 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -163,6 +163,7 @@ public class DataPaletteBlock implements DataPaletteExpandable { @@ -7878,7 +7878,7 @@ index 95ef96286..73163b417 100644 T t0 = this.h.a(this.a.a(i)); diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 5504facd2..fcba187bb 100644 +index 5504facd2e..fcba187bbd 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -169,6 +169,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -7890,7 +7890,7 @@ index 5504facd2..fcba187bb 100644 this.setPVP(dedicatedserverproperties.pvp); this.setAllowFlight(dedicatedserverproperties.allowFlight); diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index 550232cb3..229c3b0f0 100644 +index 550232cb38..229c3b0f0c 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -70,7 +70,7 @@ public class EULA { @@ -7903,7 +7903,7 @@ index 550232cb3..229c3b0f0 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0c952fea3..677188661 100644 +index 0c952fea30..677188661e 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -8315,7 +8315,7 @@ index 0c952fea3..677188661 100644 int j = MathHelper.floor(d1); int k = MathHelper.floor(d2); diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java -index 957a351c3..57166a543 100644 +index 957a351c3f..57166a543a 100644 --- a/src/main/java/net/minecraft/server/EntityCat.java +++ b/src/main/java/net/minecraft/server/EntityCat.java @@ -292,7 +292,7 @@ public class EntityCat extends EntityTameableAnimal { @@ -8328,7 +8328,7 @@ index 957a351c3..57166a543 100644 this.setPersistent(); } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 7ddf27673..23007c9cc 100644 +index 7ddf276732..23007c9ccb 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -707,7 +707,13 @@ public abstract class EntityInsentient extends EntityLiving { @@ -8347,7 +8347,7 @@ index 7ddf27673..23007c9cc 100644 if (entityhuman != null) { double d0 = entityhuman.h((Entity) this); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index fe0334b50..87cd6fb0c 100644 +index fe0334b505..87cd6fb0c0 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2847,7 +2847,11 @@ public abstract class EntityLiving extends Entity { @@ -8374,7 +8374,7 @@ index fe0334b50..87cd6fb0c 100644 } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 976c44c8e..27c368bf1 100644 +index 976c44c8ee..27c368bf19 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -525,6 +525,174 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -8553,7 +8553,7 @@ index 976c44c8e..27c368bf1 100644 this.playerConnection.sendPacket(new PacketPlayOutUpdateHealth(this.getBukkitEntity().getScaledHealth(), this.foodData.getFoodLevel(), this.foodData.getSaturationLevel())); // CraftBukkit this.lastHealthSent = this.getHealth(); diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 4efc40c01..f322dccd8 100644 +index 4efc40c01e..f322dccd83 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -74,6 +74,7 @@ public class EntityTrackerEntry { @@ -8565,7 +8565,7 @@ index 4efc40c01..f322dccd8 100644 if (!list.equals(this.p)) { diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java -index 36aafc3b7..c9963c198 100644 +index 36aafc3b71..c9963c1989 100644 --- a/src/main/java/net/minecraft/server/EnumDirection.java +++ b/src/main/java/net/minecraft/server/EnumDirection.java @@ -160,8 +160,8 @@ public enum EnumDirection implements INamable { @@ -8580,7 +8580,7 @@ index 36aafc3b7..c9963c198 100644 } diff --git a/src/main/java/net/minecraft/server/HeightMap.java b/src/main/java/net/minecraft/server/HeightMap.java -index 068b92c5c..a43c4ca3e 100644 +index 068b92c5c4..a43c4ca3ea 100644 --- a/src/main/java/net/minecraft/server/HeightMap.java +++ b/src/main/java/net/minecraft/server/HeightMap.java @@ -19,7 +19,25 @@ public class HeightMap { @@ -8664,7 +8664,7 @@ index 068b92c5c..a43c4ca3e 100644 this.i = heightmap_use; this.j = predicate; diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java -index c4a83448e..5c3eb4fc7 100644 +index c4a83448ed..5c3eb4fc7e 100644 --- a/src/main/java/net/minecraft/server/IBlockAccess.java +++ b/src/main/java/net/minecraft/server/IBlockAccess.java @@ -55,7 +55,7 @@ public interface IBlockAccess { @@ -8677,7 +8677,7 @@ index c4a83448e..5c3eb4fc7 100644 Vec3D vec3d1 = raytrace1.a(); VoxelShape voxelshape = raytrace1.a(iblockdata, this, blockposition); diff --git a/src/main/java/net/minecraft/server/IChunkAccess.java b/src/main/java/net/minecraft/server/IChunkAccess.java -index 180b6b58d..46f9ca664 100644 +index 180b6b58dc..46f9ca6647 100644 --- a/src/main/java/net/minecraft/server/IChunkAccess.java +++ b/src/main/java/net/minecraft/server/IChunkAccess.java @@ -24,6 +24,22 @@ public interface IChunkAccess extends IBlockAccess, IStructureAccess { @@ -8720,7 +8720,7 @@ index 180b6b58d..46f9ca664 100644 void b(boolean flag); diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java -index 582a5695b..5601088cd 100644 +index 582a5695ba..5601088cd5 100644 --- a/src/main/java/net/minecraft/server/IChunkLoader.java +++ b/src/main/java/net/minecraft/server/IChunkLoader.java @@ -21,7 +21,7 @@ public class IChunkLoader implements AutoCloseable { @@ -8733,7 +8733,7 @@ index 582a5695b..5601088cd 100644 // Paper - nuke IOWorker } diff --git a/src/main/java/net/minecraft/server/ICollisionAccess.java b/src/main/java/net/minecraft/server/ICollisionAccess.java -index 25e54a1fa..cce0ac8a3 100644 +index 25e54a1fad..cce0ac8a36 100644 --- a/src/main/java/net/minecraft/server/ICollisionAccess.java +++ b/src/main/java/net/minecraft/server/ICollisionAccess.java @@ -28,6 +28,11 @@ public interface ICollisionAccess extends IBlockAccess { @@ -8761,7 +8761,7 @@ index 25e54a1fa..cce0ac8a3 100644 return this.d(entity, axisalignedbb, predicate).allMatch(VoxelShape::isEmpty); } finally { if (entity != null) entity.collisionLoadChunks = false; } // Paper diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index 07dbdd560..40ca3364d 100644 +index 07dbdd5609..40ca3364d4 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -52,16 +52,26 @@ public interface IEntityAccess { @@ -8818,7 +8818,7 @@ index 07dbdd560..40ca3364d 100644 } diff --git a/src/main/java/net/minecraft/server/ILightAccess.java b/src/main/java/net/minecraft/server/ILightAccess.java -index be5384ee4..df28f7a6b 100644 +index be5384ee41..df28f7a6bf 100644 --- a/src/main/java/net/minecraft/server/ILightAccess.java +++ b/src/main/java/net/minecraft/server/ILightAccess.java @@ -4,9 +4,10 @@ import javax.annotation.Nullable; @@ -8835,7 +8835,7 @@ index be5384ee4..df28f7a6b 100644 IBlockAccess getWorld(); diff --git a/src/main/java/net/minecraft/server/LightEngineGraphSection.java b/src/main/java/net/minecraft/server/LightEngineGraphSection.java -index 13d067f48..04afd7f28 100644 +index 13d067f486..04afd7f285 100644 --- a/src/main/java/net/minecraft/server/LightEngineGraphSection.java +++ b/src/main/java/net/minecraft/server/LightEngineGraphSection.java @@ -74,8 +74,10 @@ public abstract class LightEngineGraphSection extends LightEngineGraph { @@ -8850,7 +8850,7 @@ index 13d067f48..04afd7f28 100644 this.a(Long.MAX_VALUE, i, j, flag); } diff --git a/src/main/java/net/minecraft/server/LightEngineStorage.java b/src/main/java/net/minecraft/server/LightEngineStorage.java -index b98e60772..e0bbfe142 100644 +index b98e60772b..e0bbfe1422 100644 --- a/src/main/java/net/minecraft/server/LightEngineStorage.java +++ b/src/main/java/net/minecraft/server/LightEngineStorage.java @@ -23,7 +23,8 @@ public abstract class LightEngineStorage> e @@ -8882,7 +8882,7 @@ index b98e60772..e0bbfe142 100644 while (objectiterator.hasNext()) { entry = (Entry) objectiterator.next(); diff --git a/src/main/java/net/minecraft/server/LightEngineThreaded.java b/src/main/java/net/minecraft/server/LightEngineThreaded.java -index 2f9c97dd4..d4902ed0d 100644 +index 2f9c97dd4e..d4902ed0d1 100644 --- a/src/main/java/net/minecraft/server/LightEngineThreaded.java +++ b/src/main/java/net/minecraft/server/LightEngineThreaded.java @@ -2,6 +2,11 @@ package net.minecraft.server; @@ -9319,7 +9319,7 @@ index 2f9c97dd4..d4902ed0d 100644 public void a(int i) { diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index c61cd50df..d98748325 100644 +index c61cd50df0..d987483255 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -234,7 +234,7 @@ public class LoginListener implements PacketLoginInListener { @@ -9332,7 +9332,7 @@ index c61cd50df..d98748325 100644 throw new IllegalStateException("Protocol error", cryptographyexception); } diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java -index ff74be145..e79e773f2 100644 +index ff74be1451..e79e773f22 100644 --- a/src/main/java/net/minecraft/server/MCUtil.java +++ b/src/main/java/net/minecraft/server/MCUtil.java @@ -38,6 +38,7 @@ import java.util.function.Consumer; @@ -9408,7 +9408,7 @@ index ff74be145..e79e773f2 100644 public static void mergeSortedSets(final java.util.function.Consumer consumer, final java.util.Comparator comparator, final java.util.SortedSet...sets) { final ObjectRBTreeSet all = new ObjectRBTreeSet<>(comparator); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d0ffe5790..fe4a7ed6f 100644 +index d0ffe5790e..fe4a7ed6fc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -155,6 +155,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { @@ -10356,7 +10356,7 @@ index a22f0ccce..6cc4a035c 100644 this.d &= ~(1 << k); if (nibblearray != null) { diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 5094a5d6f..72fdbf153 100644 +index 5094a5d6fb..72fdbf1534 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -19,7 +19,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -10501,7 +10501,7 @@ index 5094a5d6f..72fdbf153 100644 } } diff --git a/src/main/java/net/minecraft/server/PathType.java b/src/main/java/net/minecraft/server/PathType.java -index fb37f5b50..52a2d3db7 100644 +index fb37f5b500..52a2d3db7d 100644 --- a/src/main/java/net/minecraft/server/PathType.java +++ b/src/main/java/net/minecraft/server/PathType.java @@ -4,6 +4,8 @@ public enum PathType { @@ -10514,7 +10514,7 @@ index fb37f5b50..52a2d3db7 100644 private PathType(float f) { diff --git a/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java b/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java -index 475c0764b..9f48d476c 100644 +index 475c0764b9..9f48d476c0 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalMoveThroughVillage.java @@ -50,7 +50,7 @@ public class PathfinderGoalMoveThroughVillage extends PathfinderGoal { @@ -10536,7 +10536,7 @@ index 475c0764b..9f48d476c 100644 if (!optional.isPresent()) { return false; diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index 74e81e1e4..33804e689 100644 +index 74e81e1e4a..33804e6893 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -421,6 +421,12 @@ public class PathfinderNormal extends PathfinderAbstract { @@ -10617,7 +10617,7 @@ index 74e81e1e4..33804e689 100644 Material material = iblockdata.getMaterial(); diff --git a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java -index 253377c62..3ebe3d0dc 100644 +index 253377c623..3ebe3d0dc4 100644 --- a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java +++ b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java @@ -51,6 +51,7 @@ public class PathfinderTargetCondition { @@ -10629,10 +10629,10 @@ index 253377c62..3ebe3d0dc 100644 if (entityliving == entityliving1) { return false; diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java -index 11a67ca18..783b49973 100644 +index 11a67ca18f..35a569f61b 100644 --- a/src/main/java/net/minecraft/server/PlayerChunk.java +++ b/src/main/java/net/minecraft/server/PlayerChunk.java -@@ -56,12 +56,18 @@ public class PlayerChunk { +@@ -56,6 +56,12 @@ public class PlayerChunk { long key = net.minecraft.server.MCUtil.getCoordinateKey(this.location); this.playersInMobSpawnRange = this.chunkMap.playerMobSpawnMap.getObjectsInRange(key); this.playersInChunkTickRange = this.chunkMap.playerChunkTickRangeMap.getObjectsInRange(key); @@ -10645,13 +10645,6 @@ index 11a67ca18..783b49973 100644 } // Paper end - optimise isOutsideOfRange // Paper start - optimize chunk status progression without jumping through thread pool - public boolean canAdvanceStatus() { - ChunkStatus status = getChunkHolderStatus(); -- IChunkAccess chunk = getAvailableChunkNow(); -+ IChunkAccess chunk = getAvailableChunkNow(); - return chunk != null && (status == null || chunk.getChunkStatus().isAtLeastStatus(getNextStatus(status))); - } - // Paper end @@ -362,7 +368,7 @@ public class PlayerChunk { if (!blockposition.isValidLocation()) return; // Paper - SPIGOT-6086 for all invalid locations; avoid acquiring locks Chunk chunk = this.getSendingChunk(); // Paper - no-tick view distance @@ -10799,7 +10792,7 @@ index 11a67ca18..783b49973 100644 if (chunk != null) { playerchunkmap.callbackExecutor.execute(() -> { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 6c399bcea..d3bf356ea 100644 +index 6c399bcea0..d3bf356ea7 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -121,31 +121,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -11148,7 +11141,7 @@ index 6c399bcea..d3bf356ea 100644 } // Paper end - optimised tracker diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a736d676e..12ce5b106 100644 +index a736d676ef..12ce5b106d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -416,7 +416,9 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -11198,7 +11191,7 @@ index a736d676e..12ce5b106 100644 } else { // CraftBukkit start - fire PlayerMoveEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java -index 7ea293f38..e698dd226 100644 +index 7ea293f38d..e698dd2260 100644 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java @@ -13,10 +13,30 @@ public class PlayerConnectionUtils { @@ -11246,7 +11239,7 @@ index 7ea293f38..e698dd226 100644 }); throw CancelledPacketHandleException.INSTANCE; diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index 485b609bb..614cfacb1 100644 +index 485b609bb5..614cfacb1e 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -21,14 +21,29 @@ public class PlayerInteractManager { @@ -11381,7 +11374,7 @@ index 485b609bb..614cfacb1 100644 this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196 } diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java -index 5b0cd414c..e2500821d 100644 +index 5b0cd414ca..e2500821df 100644 --- a/src/main/java/net/minecraft/server/ProtoChunk.java +++ b/src/main/java/net/minecraft/server/ProtoChunk.java @@ -48,6 +48,31 @@ public class ProtoChunk implements IChunkAccess { @@ -11456,7 +11449,7 @@ index 5b0cd414c..e2500821d 100644 } diff --git a/src/main/java/net/minecraft/server/ProtoChunkExtension.java b/src/main/java/net/minecraft/server/ProtoChunkExtension.java -index 300cbb8b0..60c57a2b5 100644 +index 300cbb8b01..60c57a2b50 100644 --- a/src/main/java/net/minecraft/server/ProtoChunkExtension.java +++ b/src/main/java/net/minecraft/server/ProtoChunkExtension.java @@ -8,7 +8,29 @@ import javax.annotation.Nullable; @@ -11491,7 +11484,7 @@ index 300cbb8b0..60c57a2b5 100644 public ProtoChunkExtension(Chunk chunk) { super(chunk.getPos(), ChunkConverter.a, chunk.world); // Paper - Anti-Xray - Add parameter diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 1751fb693..1ffa213a8 100644 +index 1751fb6934..1ffa213a81 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -5,6 +5,7 @@ import java.io.BufferedInputStream; @@ -12117,7 +12110,7 @@ index 1751fb693..1ffa213a8 100644 ((java.nio.Buffer) this.g).position(0); this.dataFile.write(this.g, 0L); diff --git a/src/main/java/net/minecraft/server/RegionFileBitSet.java b/src/main/java/net/minecraft/server/RegionFileBitSet.java -index 1ebdf73cc..cfa3ecb03 100644 +index 1ebdf73cc9..cfa3ecb031 100644 --- a/src/main/java/net/minecraft/server/RegionFileBitSet.java +++ b/src/main/java/net/minecraft/server/RegionFileBitSet.java @@ -4,18 +4,42 @@ import java.util.BitSet; @@ -12165,7 +12158,7 @@ index 1ebdf73cc..cfa3ecb03 100644 int j = 0; diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index d64f7ad92..8b341c14e 100644 +index d64f7ad925..8b341c14e7 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -15,12 +15,43 @@ public class RegionFileCache implements AutoCloseable { // Paper - no final @@ -12257,7 +12250,7 @@ index d64f7ad92..8b341c14e 100644 } diff --git a/src/main/java/net/minecraft/server/RegionFileCompression.java b/src/main/java/net/minecraft/server/RegionFileCompression.java -index 3382d678e..3b7894256 100644 +index 3382d678e6..3b7894256d 100644 --- a/src/main/java/net/minecraft/server/RegionFileCompression.java +++ b/src/main/java/net/minecraft/server/RegionFileCompression.java @@ -13,7 +13,7 @@ import javax.annotation.Nullable; @@ -12297,7 +12290,7 @@ index 3382d678e..3b7894256 100644 return (InputStream) this.f.wrap(inputstream); } diff --git a/src/main/java/net/minecraft/server/RegionFileSection.java b/src/main/java/net/minecraft/server/RegionFileSection.java -index 04256a951..79a11d17a 100644 +index 04256a9510..79a11d17a2 100644 --- a/src/main/java/net/minecraft/server/RegionFileSection.java +++ b/src/main/java/net/minecraft/server/RegionFileSection.java @@ -25,8 +25,8 @@ public class RegionFileSection extends RegionFileCache implements AutoCloseab @@ -12373,7 +12366,7 @@ index 04256a951..79a11d17a 100644 if (!this.d.isEmpty()) { for (int i = 0; i < 16; ++i) { diff --git a/src/main/java/net/minecraft/server/SectionPosition.java b/src/main/java/net/minecraft/server/SectionPosition.java -index f95925f1c..0bb3ad0bf 100644 +index f95925f1c5..0bb3ad0bff 100644 --- a/src/main/java/net/minecraft/server/SectionPosition.java +++ b/src/main/java/net/minecraft/server/SectionPosition.java @@ -7,7 +7,7 @@ import java.util.stream.StreamSupport; @@ -12386,7 +12379,7 @@ index f95925f1c..0bb3ad0bf 100644 } diff --git a/src/main/java/net/minecraft/server/SensorNearestBed.java b/src/main/java/net/minecraft/server/SensorNearestBed.java -index ad3609f2b..d3d28f97f 100644 +index ad3609f2b8..d3d28f97f9 100644 --- a/src/main/java/net/minecraft/server/SensorNearestBed.java +++ b/src/main/java/net/minecraft/server/SensorNearestBed.java @@ -40,15 +40,15 @@ public class SensorNearestBed extends Sensor { @@ -12409,7 +12402,7 @@ index ad3609f2b..d3d28f97f 100644 } else if (this.b < 5) { this.a.long2LongEntrySet().removeIf((entry) -> { diff --git a/src/main/java/net/minecraft/server/SensorNearestItems.java b/src/main/java/net/minecraft/server/SensorNearestItems.java -index 2e747158d..1de170b9f 100644 +index 2e747158d4..1de170b9fe 100644 --- a/src/main/java/net/minecraft/server/SensorNearestItems.java +++ b/src/main/java/net/minecraft/server/SensorNearestItems.java @@ -18,20 +18,23 @@ public class SensorNearestItems extends Sensor { @@ -12449,7 +12442,7 @@ index 2e747158d..1de170b9f 100644 behaviorcontroller.setMemory(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM, optional); } diff --git a/src/main/java/net/minecraft/server/SensorNearestLivingEntities.java b/src/main/java/net/minecraft/server/SensorNearestLivingEntities.java -index f6568a54a..4005df5ef 100644 +index f6568a54ab..4005df5ef3 100644 --- a/src/main/java/net/minecraft/server/SensorNearestLivingEntities.java +++ b/src/main/java/net/minecraft/server/SensorNearestLivingEntities.java @@ -21,10 +21,17 @@ public class SensorNearestLivingEntities extends Sensor { @@ -12475,7 +12468,7 @@ index f6568a54a..4005df5ef 100644 @Override diff --git a/src/main/java/net/minecraft/server/SensorNearestPlayers.java b/src/main/java/net/minecraft/server/SensorNearestPlayers.java -index 904a6d5ac..c8e43a9f2 100644 +index 904a6d5ac6..c8e43a9f2a 100644 --- a/src/main/java/net/minecraft/server/SensorNearestPlayers.java +++ b/src/main/java/net/minecraft/server/SensorNearestPlayers.java @@ -19,22 +19,30 @@ public class SensorNearestPlayers extends Sensor { @@ -12525,7 +12518,7 @@ index 904a6d5ac..c8e43a9f2 100644 } } diff --git a/src/main/java/net/minecraft/server/SensorVillagerBabies.java b/src/main/java/net/minecraft/server/SensorVillagerBabies.java -index a367bbfde..794b33a13 100644 +index a367bbfde4..794b33a13b 100644 --- a/src/main/java/net/minecraft/server/SensorVillagerBabies.java +++ b/src/main/java/net/minecraft/server/SensorVillagerBabies.java @@ -17,11 +17,23 @@ public class SensorVillagerBabies extends Sensor { @@ -12555,7 +12548,7 @@ index a367bbfde..794b33a13 100644 private boolean b(EntityLiving entityliving) { diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index 5f4dacf9c..0668d383d 100644 +index 5f4dacf9c9..0668d383db 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -74,6 +74,11 @@ public class ServerConnection { @@ -12571,7 +12564,7 @@ index 5f4dacf9c..0668d383d 100644 protected void initChannel(Channel channel) throws Exception { try { diff --git a/src/main/java/net/minecraft/server/StructureManager.java b/src/main/java/net/minecraft/server/StructureManager.java -index f199368a6..2598ae371 100644 +index f199368a6d..2598ae3710 100644 --- a/src/main/java/net/minecraft/server/StructureManager.java +++ b/src/main/java/net/minecraft/server/StructureManager.java @@ -35,8 +35,13 @@ public class StructureManager { @@ -12604,7 +12597,7 @@ index f199368a6..2598ae371 100644 if (!flag) { return structurestart; diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java -index e41cb8613..c19ffb925 100644 +index e41cb8613e..c19ffb925a 100644 --- a/src/main/java/net/minecraft/server/Ticket.java +++ b/src/main/java/net/minecraft/server/Ticket.java @@ -5,17 +5,17 @@ import java.util.Objects; @@ -12641,7 +12634,7 @@ index e41cb8613..c19ffb925 100644 return j != 0L && i - this.d > j; } diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java -index 5c789b25f..3f942c632 100644 +index 5c789b25f1..3f942c6326 100644 --- a/src/main/java/net/minecraft/server/TicketType.java +++ b/src/main/java/net/minecraft/server/TicketType.java @@ -26,8 +26,21 @@ public class TicketType { @@ -12668,7 +12661,7 @@ index 5c789b25f..3f942c632 100644 return new TicketType<>(s, comparator, 0L); } diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index 2484293b1..1496c43fc 100644 +index 2484293b12..1496c43fc9 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -49,6 +49,11 @@ public class UserCache { @@ -12753,7 +12746,7 @@ index 2484293b1..1496c43fc 100644 private static JsonElement a(UserCache.UserCacheEntry usercache_usercacheentry, DateFormat dateformat) { diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java -index 7f05587d4..5af554870 100644 +index 7f05587d42..5af554870b 100644 --- a/src/main/java/net/minecraft/server/Vec3D.java +++ b/src/main/java/net/minecraft/server/Vec3D.java @@ -4,7 +4,7 @@ import java.util.EnumSet; @@ -12787,7 +12780,7 @@ index 7f05587d4..5af554870 100644 return this.x * this.x + this.y * this.y + this.z * this.z; } diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java -index b926cebd0..99778f80c 100644 +index b926cebd05..99778f80c0 100644 --- a/src/main/java/net/minecraft/server/VillagePlace.java +++ b/src/main/java/net/minecraft/server/VillagePlace.java @@ -4,6 +4,7 @@ import com.mojang.datafixers.DataFixer; @@ -13032,7 +13025,7 @@ index b926cebd0..99778f80c 100644 return this.d; } diff --git a/src/main/java/net/minecraft/server/VillagePlaceRecord.java b/src/main/java/net/minecraft/server/VillagePlaceRecord.java -index 0b40c2f4d..6eaf9fc9c 100644 +index 0b40c2f4da..6eaf9fc9cc 100644 --- a/src/main/java/net/minecraft/server/VillagePlaceRecord.java +++ b/src/main/java/net/minecraft/server/VillagePlaceRecord.java @@ -6,7 +6,7 @@ import java.util.Objects; @@ -13045,7 +13038,7 @@ index 0b40c2f4d..6eaf9fc9c 100644 private int c; private final Runnable d; diff --git a/src/main/java/net/minecraft/server/VillagePlaceSection.java b/src/main/java/net/minecraft/server/VillagePlaceSection.java -index 77c66bc99..f43bc1f7d 100644 +index 77c66bc995..f43bc1f7d6 100644 --- a/src/main/java/net/minecraft/server/VillagePlaceSection.java +++ b/src/main/java/net/minecraft/server/VillagePlaceSection.java @@ -23,12 +23,12 @@ public class VillagePlaceSection { @@ -13064,7 +13057,7 @@ index 77c66bc99..f43bc1f7d 100644 return villageplacesection.e; }), VillagePlaceRecord.a(runnable).listOf().fieldOf("Records").forGetter((villageplacesection) -> { diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java -index eb926b74e..e3b72922e 100644 +index eb926b74e1..e3b72922e2 100644 --- a/src/main/java/net/minecraft/server/VoxelShape.java +++ b/src/main/java/net/minecraft/server/VoxelShape.java @@ -8,11 +8,11 @@ import javax.annotation.Nullable; @@ -13108,7 +13101,7 @@ index eb926b74e..e3b72922e 100644 List list = Lists.newArrayList(); diff --git a/src/main/java/net/minecraft/server/VoxelShapeArray.java b/src/main/java/net/minecraft/server/VoxelShapeArray.java -index 3c29cb145..c14b7bd63 100644 +index 3c29cb1452..c14b7bd63e 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeArray.java +++ b/src/main/java/net/minecraft/server/VoxelShapeArray.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -13229,7 +13222,7 @@ index 3c29cb145..c14b7bd63 100644 + // Tuinity end - optimise multi-aabb shapes } diff --git a/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java b/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java -index e841611bb..259605daa 100644 +index e841611bb7..259605daab 100644 --- a/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java +++ b/src/main/java/net/minecraft/server/VoxelShapeSpliterator.java @@ -91,7 +91,7 @@ public class VoxelShapeSpliterator extends AbstractSpliterator { @@ -13242,7 +13235,7 @@ index e841611bb..259605daa 100644 } diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java -index e21c747b6..636bbbc42 100644 +index e21c747b6c..636bbbc424 100644 --- a/src/main/java/net/minecraft/server/VoxelShapes.java +++ b/src/main/java/net/minecraft/server/VoxelShapes.java @@ -17,18 +17,101 @@ public final class VoxelShapes { @@ -13435,7 +13428,7 @@ index e21c747b6..636bbbc42 100644 @VisibleForTesting diff --git a/src/main/java/net/minecraft/server/WeightedList.java b/src/main/java/net/minecraft/server/WeightedList.java -index 5d9d58411..f0fdfd689 100644 +index 5d9d58411f..f0fdfd6891 100644 --- a/src/main/java/net/minecraft/server/WeightedList.java +++ b/src/main/java/net/minecraft/server/WeightedList.java @@ -14,7 +14,7 @@ import java.util.stream.Stream; @@ -13457,7 +13450,7 @@ index 5d9d58411..f0fdfd689 100644 private double c; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9ed21f434..59abca0fd 100644 +index 9ed21f434c..59abca0fd2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -94,6 +94,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -13721,7 +13714,7 @@ index 9ed21f434..59abca0fd 100644 public abstract Entity getEntity(int i); diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index f01186988..0d10d317c 100644 +index f011869880..0d10d317cd 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -47,11 +47,59 @@ public class WorldBorder { @@ -13808,7 +13801,7 @@ index f01186988..0d10d317c 100644 return this.j.d(); } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5b0b6edfa..bb310c745 100644 +index 5b0b6edfa7..bb310c7451 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -55,12 +55,13 @@ import org.bukkit.event.server.MapInitializeEvent; @@ -14669,7 +14662,7 @@ index 5b0b6edfa..bb310c745 100644 this.tickingEntities = wasTicking; // Paper } diff --git a/src/main/java/net/minecraft/server/WorldUpgrader.java b/src/main/java/net/minecraft/server/WorldUpgrader.java -index 5ccdc0b87..888dae2d5 100644 +index 5ccdc0b87b..888dae2d5e 100644 --- a/src/main/java/net/minecraft/server/WorldUpgrader.java +++ b/src/main/java/net/minecraft/server/WorldUpgrader.java @@ -218,7 +218,7 @@ public class WorldUpgrader { @@ -14682,7 +14675,7 @@ index 5ccdc0b87..888dae2d5 100644 try { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4e1b4d7cd..9bf854b5a 100644 +index 4e1b4d7cde..9bf854b5a2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper @@ -14738,7 +14731,7 @@ index 4e1b4d7cd..9bf854b5a 100644 public void restart() { org.spigotmc.RestartCommand.restart(); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 299f57ca2..4de6252f0 100644 +index 3f84c006be..2028db6da4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -341,6 +341,14 @@ public class CraftWorld implements World { @@ -14780,7 +14773,7 @@ index 299f57ca2..4de6252f0 100644 } return true; -@@ -2536,7 +2538,7 @@ public class CraftWorld implements World { +@@ -2553,7 +2555,7 @@ public class CraftWorld implements World { } return this.world.getChunkProvider().getChunkAtAsynchronously(x, z, gen, urgent).thenComposeAsync((either) -> { net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null); @@ -14790,7 +14783,7 @@ index 299f57ca2..4de6252f0 100644 }, MinecraftServer.getServer()); } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 9118f0542..a9c96d45c 100644 +index 9118f05424..a9c96d45c6 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -138,6 +138,13 @@ public class Main { @@ -14817,7 +14810,7 @@ index 9118f0542..a9c96d45c 100644 //Thread.sleep(TimeUnit.SECONDS.toMillis(20)); // Paper End diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 4ec0e9220..1fe253bc7 100644 +index 4ec0e9220d..1fe253bc72 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -503,27 +503,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -14888,7 +14881,7 @@ index 4ec0e9220..1fe253bc7 100644 public boolean teleport(org.bukkit.entity.Entity destination) { return teleport(destination.getLocation()); diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java -index fd32d1450..c38e514b0 100644 +index fd32d1450a..c38e514b00 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncTask.java @@ -25,6 +25,10 @@ class CraftAsyncTask extends CraftTask { @@ -14911,7 +14904,7 @@ index fd32d1450..c38e514b0 100644 LinkedList getWorkers() { diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java -index 6fa2e271f..3a9491e94 100644 +index 6fa2e271f7..3a9491e949 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -113,9 +113,18 @@ public final class CraftScoreboardManager implements ScoreboardManager { @@ -14934,7 +14927,7 @@ index 6fa2e271f..3a9491e94 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java -index f72c13bed..7c0d90552 100644 +index f72c13beda..7c0d90552e 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java +++ b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java @@ -35,6 +35,13 @@ public class UnsafeList extends AbstractList implements List, RandomAcc @@ -14985,7 +14978,7 @@ index f72c13bed..7c0d90552 100644 public void clear() { // Create new array to reset memory usage to initial capacity diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 674096cab..001b1e519 100644 +index 674096cab1..001b1e5197 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { @@ -14998,7 +14991,7 @@ index 674096cab..001b1e519 100644 if (stream != null) { diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java -index 9f7d2ef93..51e9c54cd 100644 +index 9f7d2ef932..51e9c54cdd 100644 --- a/src/main/java/org/spigotmc/AsyncCatcher.java +++ b/src/main/java/org/spigotmc/AsyncCatcher.java @@ -10,8 +10,9 @@ public class AsyncCatcher @@ -15013,7 +15006,7 @@ index 9f7d2ef93..51e9c54cd 100644 } } diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 513c1041c..4d3109084 100644 +index 513c1041c3..4d31090848 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -61,6 +61,84 @@ public class WatchdogThread extends Thread