Port collision optimisation patch from Moonrise

Drop random ticking optimisation for now

patches/server/Anti-Xray.patch

@@ -1181,7 +1181,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private org.spigotmc.TickLimiter entityLimiter;
 @@ -0,0 +0,0 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      }
-     // Paper end - rewrite chunk system
+     // Paper end - optimise collisions
  
 -    protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator) { // Paper - create paper world config
 +    protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - create paper world config & Anti-Xray
@@ -1189,9 +1189,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
          this.generator = gen;
 @@ -0,0 +0,0 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
-         this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
+         this.minSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMinSection(this);
-         this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
+         this.maxSection = ca.spottedleaf.moonrise.common.util.WorldUtil.getMaxSection(this);
-         this.entityLookup = new ca.spottedleaf.moonrise.patches.chunk_system.level.entity.dfl.DefaultEntityLookup(this); // Paper - rewrite chunk system
+         // Paper end - optimise collisions
 +        this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
      }
  
@@ -1247,7 +1247,7 @@ diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-@@ -0,0 +0,0 @@ public class LevelChunkSection {
+@@ -0,0 +0,0 @@ public class LevelChunkSection implements ca.spottedleaf.moonrise.patches.collis
          this.recalcBlockCounts();
      }
  
@@ -1263,7 +1263,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public BlockState getBlockState(int x, int y, int z) {
-@@ -0,0 +0,0 @@ public class LevelChunkSection {
+@@ -0,0 +0,0 @@ public class LevelChunkSection implements ca.spottedleaf.moonrise.patches.collis
          this.biomes = datapaletteblock;
      }
  
@@ -1289,7 +1289,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private final PaletteResize<T> dummyPaletteResize = (newSize, added) -> 0;
      public final IdMap<T> registry;
 +    private final T @org.jetbrains.annotations.Nullable [] presetValues; // Paper - Anti-Xray - Add preset values
-     private volatile PalettedContainer.Data<T> data;
+     public volatile PalettedContainer.Data<T> data; // Paper - optimise collisions - public
      private final PalettedContainer.Strategy strategy;
      // private final ThreadingDetector threadingDetector = new ThreadingDetector("PalettedContainer"); // Paper - unused
 @@ -0,0 +0,0 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer

patches/server/Fix-entity-tracker-desync-when-new-players-are-added.patch

@@ -75,8 +75,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end - fix desync when a player is added to the tracker
 +
      public void sendChanges() {
-         List<Entity> list = this.entity.getPassengers();
+         // Paper start - optimise collisions
- 
+         if (((ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity)this.entity).moonrise$isHardColliding()) {
 @@ -0,0 +0,0 @@ public class ServerEntity {
              }
          }

patches/server/Optimise-random-block-ticking.patch

@@ -1,456 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Spottedleaf <Spottedleaf@users.noreply.github.com>
-Date: Sun, 20 Jun 2021 16:19:26 -0700
-Subject: [PATCH] Optimise random block ticking
-
-Massive performance improvement for random block ticking.
-The performance increase comes from the fact that the vast
-majority of attempted block ticks (~95% in my testing) fail
-because the randomly selected block is not tickable.
-
-Now only tickable blocks are targeted, however this means that
-the maximum number of block ticks occurs per chunk. However,
-not all chunks are going to be targeted. The percent chance
-of a chunk being targeted is based on how many tickable blocks
-are in the chunk.
-This means that while block ticks are spread out less, the
-total number of blocks ticked per world tick remains the same.
-Therefore, the chance of a random tickable block being ticked
-remains the same.
-
-diff --git a/src/main/java/io/papermc/paper/util/math/ThreadUnsafeRandom.java b/src/main/java/io/papermc/paper/util/math/ThreadUnsafeRandom.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/math/ThreadUnsafeRandom.java
-@@ -0,0 +0,0 @@
-+package io.papermc.paper.util.math;
-+
-+import net.minecraft.util.RandomSource;
-+import net.minecraft.world.level.levelgen.LegacyRandomSource;
-+import net.minecraft.world.level.levelgen.PositionalRandomFactory;
-+import org.checkerframework.checker.nullness.qual.NonNull;
-+import org.checkerframework.framework.qual.DefaultQualifier;
-+
-+@DefaultQualifier(NonNull.class)
-+public final class ThreadUnsafeRandom extends LegacyRandomSource {
-+
-+    // See javadoc and internal comments for java.util.Random where these values come from, how they are used, and the author for them.
-+    private static final long multiplier = 0x5DEECE66DL;
-+    private static final long addend = 0xBL;
-+    private static final long mask = (1L << 48) - 1;
-+
-+    private static long initialScramble(long seed) {
-+        return (seed ^ multiplier) & mask;
-+    }
-+
-+    private long seed;
-+
-+    public ThreadUnsafeRandom(long seed) {
-+        super(seed);
-+    }
-+
-+    @Override
-+    public RandomSource fork() {
-+        return new ThreadUnsafeRandom(this.nextLong());
-+    }
-+
-+    @Override
-+    public PositionalRandomFactory forkPositional() {
-+        throw new UnsupportedOperationException();
-+    }
-+
-+    @Override
-+    public void setSeed(long seed) {
-+        // note: called by Random constructor
-+        this.seed = initialScramble(seed);
-+    }
-+
-+    @Override
-+    public int next(int bits) {
-+        // avoid the expensive CAS logic used by superclass
-+        return (int) (((this.seed = this.seed * multiplier + addend) & mask) >>> (48 - bits));
-+    }
-+
-+    // Taken from
-+    // https://lemire.me/blog/2016/06/27/a-fast-alternative-to-the-modulo-reduction/
-+    // https://github.com/lemire/Code-used-on-Daniel-Lemire-s-blog/blob/master/2016/06/25/fastrange.c
-+    // Original license is public domain
-+    public static int fastRandomBounded(final long randomInteger, final long limit) {
-+        // randomInteger must be [0, pow(2, 32))
-+        // limit must be [0, pow(2, 32))
-+        return (int)((randomInteger * limit) >>> 32);
-+    }
-+
-+    @Override
-+    public int nextInt(int bound) {
-+        // yes this breaks random's spec
-+        // however there's nothing that uses this class that relies on it
-+        return fastRandomBounded(this.next(32) & 0xFFFFFFFFL, bound);
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
-             entityplayer.stopSleepInBed(false, false);
-         });
-     }
-+    // Paper start - optimise random block ticking
-+    private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos();
-+    private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(this.random.nextLong());
-+    // Paper end
- 
-     public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
-         ChunkPos chunkcoordintpair = chunk.getPos();
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
-         ProfilerFiller gameprofilerfiller = this.getProfiler();
- 
-         gameprofilerfiller.push("thunder");
-+        final BlockPos.MutableBlockPos blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change
-+
-         if (!this.paperConfig().environment.disableThunder && flag && this.isThundering() && this.spigotConfig.thunderChance > 0 && this.random.nextInt(this.spigotConfig.thunderChance) == 0) { // Spigot // Paper - Option to disable thunder
--            BlockPos blockposition = this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15));
-+            blockposition.set(this.findLightningTargetAround(this.getBlockRandomPos(j, 0, k, 15))); // Paper
- 
-             if (this.isRainingAt(blockposition)) {
-                 DifficultyInstance difficultydamagescaler = this.getCurrentDifficultyAt(blockposition);
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
-         if (!this.paperConfig().environment.disableIceAndSnow) { // Paper - Option to disable ice and snow
-         for (int l = 0; l < randomTickSpeed; ++l) {
-             if (this.random.nextInt(48) == 0) {
--                this.tickPrecipitation(this.getBlockRandomPos(j, 0, k, 15));
-+                // Paper start
-+                this.getRandomBlockPosition(j, 0, k, 15, blockposition);
-+                this.tickPrecipitation(blockposition, chunk);
-+                // Paper end
-             }
-         }
-         } // Paper - Option to disable ice and snow
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
-         gameprofilerfiller.popPush("tickBlocks");
-         timings.chunkTicksBlocks.startTiming(); // Paper
-         if (randomTickSpeed > 0) {
--            LevelChunkSection[] achunksection = chunk.getSections();
--
--            for (int i1 = 0; i1 < achunksection.length; ++i1) {
--                LevelChunkSection chunksection = achunksection[i1];
--
--                if (chunksection.isRandomlyTicking()) {
--                    int j1 = chunk.getSectionYFromSectionIndex(i1);
--                    int k1 = SectionPos.sectionToBlockCoord(j1);
--
--                    for (int l1 = 0; l1 < randomTickSpeed; ++l1) {
--                        BlockPos blockposition1 = this.getBlockRandomPos(j, k1, k, 15);
--
--                        gameprofilerfiller.push("randomTick");
--                        BlockState iblockdata = chunksection.getBlockState(blockposition1.getX() - j, blockposition1.getY() - k1, blockposition1.getZ() - k);
--
--                        if (iblockdata.isRandomlyTicking()) {
--                            iblockdata.randomTick(this, blockposition1, this.random);
--                        }
-+            // Paper start - optimize random block ticking
-+            LevelChunkSection[] sections = chunk.getSections();
-+            final int minSection = io.papermc.paper.util.WorldUtil.getMinSection(this);
-+            for (int sectionIndex = 0; sectionIndex < sections.length; sectionIndex++) {
-+                LevelChunkSection section = sections[sectionIndex];
-+                if (section == null || section.tickingList.size() == 0) continue;
-+
-+                int yPos = (sectionIndex + minSection) << 4;
-+                for (int a = 0; a < randomTickSpeed; ++a) {
-+                    int tickingBlocks = section.tickingList.size();
-+                    int index = this.randomTickRandom.nextInt(16 * 16 * 16);
-+                    if (index >= tickingBlocks) {
-+                        continue;
-+                    }
- 
--                        FluidState fluid = iblockdata.getFluidState();
-+                    long raw = section.tickingList.getRaw(index);
-+                    int location = com.destroystokyo.paper.util.maplist.IBlockDataList.getLocationFromRaw(raw);
-+                    int randomX = location & 15;
-+                    int randomY = ((location >>> (4 + 4)) & 255) | yPos;
-+                    int randomZ = (location >>> 4) & 15;
- 
--                        if (fluid.isRandomlyTicking()) {
--                            fluid.randomTick(this, blockposition1, this.random);
--                        }
-+                    BlockPos blockposition2 = blockposition.set(j + randomX, randomY, k + randomZ);
-+                    BlockState iblockdata = com.destroystokyo.paper.util.maplist.IBlockDataList.getBlockDataFromRaw(raw);
- 
--                        gameprofilerfiller.pop();
--                    }
-+                    iblockdata.randomTick(this, blockposition2, this.randomTickRandom);
-                 }
-+                // We drop the fluid tick since LAVA is ALREADY TICKED by the above method (See LiquidBlock).
-+                // TODO CHECK ON UPDATE (ping the Canadian)
-             }
-         }
-+        // Paper end - optimise random block ticking
- 
-         timings.chunkTicksBlocks.stopTiming(); // Paper
-         gameprofilerfiller.pop();
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
- 
-     @VisibleForTesting
-     public void tickPrecipitation(BlockPos pos) {
--        BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
--        BlockPos blockposition2 = blockposition1.below();
-+    // Paper start - optimise chunk ticking
-+        tickPrecipitation(pos.mutable(), this.getChunkAt(pos));
-+    }
-+    public void tickPrecipitation(BlockPos.MutableBlockPos blockposition1, final LevelChunk chunk) {
-+        int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition1.getX() & 15, blockposition1.getZ() & 15) + 1;
-+        int downY = normalY - 1;
-+        blockposition1.setY(normalY);
-+        // Paper end - optimise chunk ticking
-         Biome biomebase = (Biome) this.getBiome(blockposition1).value();
- 
--        if (biomebase.shouldFreeze(this, blockposition2)) {
--            org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition2, Blocks.ICE.defaultBlockState(), null); // CraftBukkit
-+        blockposition1.setY(downY);
-+        if (biomebase.shouldFreeze(this, blockposition1)) {
-+            org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(this, blockposition1, Blocks.ICE.defaultBlockState(), null); // CraftBukkit
-         }
- 
-         if (this.isRaining()) {
-             int i = this.getGameRules().getInt(GameRules.RULE_SNOW_ACCUMULATION_HEIGHT);
- 
-+            blockposition1.setY(normalY); // Paper - optimise chunk ticking
-             if (i > 0 && biomebase.shouldSnow(this, blockposition1)) {
-                 BlockState iblockdata = this.getBlockState(blockposition1);
- 
-@@ -0,0 +0,0 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
-                 }
-             }
- 
--            Biome.Precipitation biomebase_precipitation = biomebase.getPrecipitationAt(blockposition2);
-+            blockposition1.setY(downY); // Paper - optimise chunk ticking
-+            Biome.Precipitation biomebase_precipitation = biomebase.getPrecipitationAt(blockposition1); // Paper - optimise chunk ticking
- 
-             if (biomebase_precipitation != Biome.Precipitation.NONE) {
--                BlockState iblockdata2 = this.getBlockState(blockposition2);
-+                BlockState iblockdata2 = this.getBlockState(blockposition1); // Paper - optimise chunk ticking
- 
--                iblockdata2.getBlock().handlePrecipitation(iblockdata2, this, blockposition2, biomebase_precipitation);
-+                iblockdata2.getBlock().handlePrecipitation(iblockdata2, this, blockposition1, biomebase_precipitation); // Paper - optimise chunk ticking
-             }
-         }
- 
-diff --git a/src/main/java/net/minecraft/util/BitStorage.java b/src/main/java/net/minecraft/util/BitStorage.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/util/BitStorage.java
-+++ b/src/main/java/net/minecraft/util/BitStorage.java
-@@ -0,0 +0,0 @@ public interface BitStorage {
-     void unpack(int[] out);
- 
-     BitStorage copy();
-+
-+    // Paper start
-+    void forEach(DataBitConsumer consumer);
-+
-+    @FunctionalInterface
-+    interface DataBitConsumer {
-+
-+        void accept(int location, int data);
-+
-+    }
-+    // Paper end
- }
-diff --git a/src/main/java/net/minecraft/util/SimpleBitStorage.java b/src/main/java/net/minecraft/util/SimpleBitStorage.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/util/SimpleBitStorage.java
-+++ b/src/main/java/net/minecraft/util/SimpleBitStorage.java
-@@ -0,0 +0,0 @@ public class SimpleBitStorage implements BitStorage {
-         return this.bits;
-     }
- 
-+    // Paper start
-+    @Override
-+    public final void forEach(DataBitConsumer consumer) {
-+        int i = 0;
-+        long[] along = this.data;
-+        int j = along.length;
-+
-+        for (int k = 0; k < j; ++k) {
-+            long l = along[k];
-+
-+            for (int i1 = 0; i1 < this.valuesPerLong; ++i1) {
-+                consumer.accept(i, (int) (l & this.mask));
-+                l >>= this.bits;
-+                ++i;
-+                if (i >= this.size) {
-+                    return;
-+                }
-+            }
-+        }
-+    }
-+    // Paper end
-+
-     @Override
-     public void getAll(IntConsumer action) {
-         int i = 0;
-diff --git a/src/main/java/net/minecraft/util/ZeroBitStorage.java b/src/main/java/net/minecraft/util/ZeroBitStorage.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/util/ZeroBitStorage.java
-+++ b/src/main/java/net/minecraft/util/ZeroBitStorage.java
-@@ -0,0 +0,0 @@ public class ZeroBitStorage implements BitStorage {
-         return 0;
-     }
- 
-+    // Paper start
-+    @Override
-+    public void forEach(DataBitConsumer consumer) {
-+        for(int i = 0; i < this.size; ++i) {
-+            consumer.accept(i, 0);
-+        }
-+    }
-+    // Paper end
-+
-     @Override
-     public void getAll(IntConsumer action) {
-         for (int i = 0; i < this.size; i++) {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-@@ -0,0 +0,0 @@ public class Turtle extends Animal {
-     }
- 
-     public void setHomePos(BlockPos pos) {
--        this.entityData.set(Turtle.HOME_POS, pos);
-+        this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
-     }
- 
-     public BlockPos getHomePos() {
-diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/level/Level.java
-+++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -0,0 +0,0 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
-     public abstract RecipeManager getRecipeManager();
- 
-     public BlockPos getBlockRandomPos(int x, int y, int z, int l) {
-+        // Paper start - allow use of mutable pos
-+        BlockPos.MutableBlockPos ret = new BlockPos.MutableBlockPos();
-+        this.getRandomBlockPosition(x, y, z, l, ret);
-+        return ret.immutable();
-+    }
-+    public final BlockPos.MutableBlockPos getRandomBlockPosition(int x, int y, int z, int l, BlockPos.MutableBlockPos out) {
-+        // Paper end
-         this.randValue = this.randValue * 3 + 1013904223;
-         int i1 = this.randValue >> 2;
- 
--        return new BlockPos(x + (i1 & 15), y + (i1 >> 16 & l), z + (i1 >> 8 & 15));
-+        out.set(x + (i1 & 15), y + (i1 >> 16 & l), z + (i1 >> 8 & 15)); // Paper - change to setValues call
-+        return out; // Paper
-     }
- 
-     public boolean noSave() {
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-@@ -0,0 +0,0 @@ public class LevelChunkSection {
-     public final PalettedContainer<BlockState> states;
-     // CraftBukkit start - read/write
-     private PalettedContainer<Holder<Biome>> biomes;
-+    public final com.destroystokyo.paper.util.maplist.IBlockDataList tickingList = new com.destroystokyo.paper.util.maplist.IBlockDataList(); // Paper
- 
-     public LevelChunkSection(PalettedContainer<BlockState> datapaletteblock, PalettedContainer<Holder<Biome>> palettedcontainerro) {
-         // CraftBukkit end
-@@ -0,0 +0,0 @@ public class LevelChunkSection {
-             --this.nonEmptyBlockCount;
-             if (iblockdata1.isRandomlyTicking()) {
-                 --this.tickingBlockCount;
-+                // Paper start
-+                this.tickingList.remove(x, y, z);
-+                // Paper end
-             }
-         }
- 
-@@ -0,0 +0,0 @@ public class LevelChunkSection {
-             ++this.nonEmptyBlockCount;
-             if (state.isRandomlyTicking()) {
-                 ++this.tickingBlockCount;
-+                // Paper start
-+                this.tickingList.add(x, y, z, state);
-+                // Paper end
-             }
-         }
- 
-@@ -0,0 +0,0 @@ public class LevelChunkSection {
-     }
- 
-     public void recalcBlockCounts() {
--        class a implements PalettedContainer.CountConsumer<BlockState> {
--
--            public int nonEmptyBlockCount;
--            public int tickingBlockCount;
--            public int tickingFluidCount;
--
--            a(final LevelChunkSection chunksection) {}
--
--            public void accept(BlockState iblockdata, int i) {
-+        // Paper start - unfuck this
-+        this.tickingList.clear();
-+        this.nonEmptyBlockCount = 0;
-+        this.tickingBlockCount = 0;
-+        this.tickingFluidCount = 0;
-+        // Don't run this on clearly empty sections
-+        if (this.maybeHas((BlockState state) -> !state.isAir() || !state.getFluidState().isEmpty())) {
-+            this.states.forEachLocation((BlockState iblockdata, int i) -> {
-                 FluidState fluid = iblockdata.getFluidState();
- 
-                 if (!iblockdata.isAir()) {
--                    this.nonEmptyBlockCount += i;
-+                    this.nonEmptyBlockCount = (short) (this.nonEmptyBlockCount + 1);
-                     if (iblockdata.isRandomlyTicking()) {
--                        this.tickingBlockCount += i;
-+                        this.tickingBlockCount = (short)(this.tickingBlockCount + 1);
-+                        this.tickingList.add(i, iblockdata);
-                     }
-                 }
- 
-                 if (!fluid.isEmpty()) {
--                    this.nonEmptyBlockCount += i;
-+                    this.nonEmptyBlockCount = (short) (this.nonEmptyBlockCount + 1);
-                     if (fluid.isRandomlyTicking()) {
--                        this.tickingFluidCount += i;
-+                        this.tickingFluidCount = (short) (this.tickingFluidCount + 1);
-                     }
-                 }
- 
--            }
-+            });
-         }
--
--        a a0 = new a(this);
--
--        this.states.count(a0);
--        this.nonEmptyBlockCount = (short) a0.nonEmptyBlockCount;
--        this.tickingBlockCount = (short) a0.tickingBlockCount;
--        this.tickingFluidCount = (short) a0.tickingFluidCount;
-+        // Paper end - unfuck this
-     }
- 
-     public PalettedContainer<BlockState> getStates() {
-diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-@@ -0,0 +0,0 @@ public class PalettedContainer<T> implements PaletteResize<T>, PalettedContainer
-         }
-     }
- 
-+    // Paper start
-+    public void forEachLocation(PalettedContainer.CountConsumer<T> consumer) {
-+        this.data.storage.forEach((int location, int data) -> {
-+            consumer.accept(this.data.palette.valueFor(data), location);
-+        });
-+    }
-+    // Paper end
-+
-     @FunctionalInterface
-     public interface CountConsumer<T> {
-         void accept(T object, int count);