More more more work

build-data/paper.at

@@ -259,3 +259,6 @@ public net.minecraft.world.level.block.state.BlockBehaviour hasCollision
 
 # add per world spawn limits
 public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES
+
+# Optimize isValidLocation
+public net.minecraft.world.level.chunk.LevelChunkSection states

patches/server/Add-PlayerInitialSpawnEvent.patch

@@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          Location loc = ev.getSpawnLocation();
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
  
-         player.setLevel(worldserver1);
+         player.spawnIn(worldserver1);
          player.gameMode.setLevel((ServerLevel) player.level);
 -        player.absMoveTo(loc.getX(), loc.getY(), loc.getZ(), loc.getYaw(), loc.getPitch());
 +        // Paper start - set raw so we aren't fully joined to the world (not added to chunk or world)

patches/server/Add-configurable-portal-search-radius.patch

@@ -26,9 +26,9 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
-                 double d4 = DimensionType.getTeleportationScale(this.level.dimensionType(), destination.dimensionType());
-                 BlockPos blockposition = new BlockPos(Mth.clamp(this.getX() * d4, d0, d2), this.getY(), Mth.clamp(this.getZ() * d4, d1, d3));
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+                 double d0 = DimensionType.getTeleportationScale(this.level.dimensionType(), destination.dimensionType());
+                 BlockPos blockposition = worldborder.clampToBounds(this.getX() * d0, this.getY(), this.getZ() * d0);
                  // CraftBukkit start
 -                CraftPortalEvent event = this.callPortalEvent(this, destination, blockposition, PlayerTeleportEvent.TeleportCause.NETHER_PORTAL, flag2 ? 16 : 128, 16);
 +                // Paper start
@@ -47,10 +47,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
 @@ -0,0 +0,0 @@ public class PortalForcer {
  
-     public Optional<BlockUtil.FoundRectangle> findPortalAround(BlockPos destPos, boolean destIsNether) {
+     public Optional<BlockUtil.FoundRectangle> findPortalAround(BlockPos blockposition, boolean destIsNether, WorldBorder worldborder) {
          // CraftBukkit start
--        return this.findPortal(destPos, destIsNether ? 16 : 128); // Search Radius
-+        return this.findPortal(destPos, destIsNether ? level.paperConfig.portalCreateRadius : level.paperConfig.portalSearchRadius); // Search Radius // Paper - search Radius
+-        return this.findPortalAround(blockposition, worldborder, destIsNether ? 16 : 128); // Search Radius
++        return this.findPortalAround(blockposition, worldborder, destIsNether ? level.paperConfig.portalCreateRadius : level.paperConfig.portalSearchRadius); // Search Radius // Paper - search Radius
      }
  
-     public Optional<BlockUtil.FoundRectangle> findPortal(BlockPos blockposition, int i) {
+     public Optional<BlockUtil.FoundRectangle> findPortalAround(BlockPos blockposition, WorldBorder worldborder, int i) {

patches/server/Add-exception-reporting-event.patch

@@ -143,7 +143,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
      }
 @@ -0,0 +0,0 @@ public final class NaturalSpawner {
-                                     entity = biomesettingsmobs_c.type.create((Level) world.getLevel());
+                                     entity = biomesettingsmobs_c.type.create(world.getLevel());
                                  } catch (Exception exception) {
                                      NaturalSpawner.LOGGER.warn("Failed to create mob", exception);
 +                                    com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(exception); // Paper
@@ -160,9 +160,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import com.google.common.collect.ImmutableList;
 +import com.destroystokyo.paper.exception.ServerInternalException;
  import com.google.common.collect.Maps;
- import com.google.common.collect.Sets;
  import com.google.common.collect.UnmodifiableIterator;
-@@ -0,0 +0,0 @@ public class LevelChunk implements ChunkAccess {
+ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+@@ -0,0 +0,0 @@ public class LevelChunk extends ChunkAccess {
              this.removeBlockEntity(blockEntity.getBlockPos());
              // Paper end
          } else {
@@ -182,7 +182,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              // CraftBukkit end
          }
      }
-@@ -0,0 +0,0 @@ public class LevelChunk implements ChunkAccess {
+@@ -0,0 +0,0 @@ public class LevelChunk extends ChunkAccess {
                          // Paper start - Prevent tile entity and entity crashes
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);

patches/server/Chunk-Save-Reattempt.patch

@@ -22,18 +22,10 @@ diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileSto
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java
-@@ -0,0 +0,0 @@ import java.io.IOException;
- import javax.annotation.Nullable;
- import net.minecraft.nbt.CompoundTag;
- import net.minecraft.nbt.NbtIo;
-+import net.minecraft.server.MinecraftServer;
- import net.minecraft.util.ExceptionCollector;
- import net.minecraft.world.level.ChunkPos;
- 
 @@ -0,0 +0,0 @@ public class RegionFileStorage implements AutoCloseable {
  
      protected void write(ChunkPos pos, @Nullable CompoundTag nbt) throws IOException {
-         RegionFile regionfile = this.getFile(pos, false); // CraftBukkit
+         RegionFile regionfile = this.getRegionFile(pos, false); // CraftBukkit
 +        int attempts = 0; Exception laste = null; while (attempts++ < 5) { try { // Paper
  
          if (nbt == null) {
@@ -51,7 +43,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +        if (laste != null) {
 +            com.destroystokyo.paper.exception.ServerInternalException.reportInternalException(laste);
-+            MinecraftServer.LOGGER.error("Failed to save chunk", laste);
++            net.minecraft.server.MinecraftServer.LOGGER.error("Failed to save chunk", laste);
 +        }
 +        // Paper end
      }

patches/server/Configurable-Chunk-Inhabited-Time.patch

@@ -33,12 +33,17 @@ diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -0,0 +0,0 @@ public class LevelChunk implements ChunkAccess {
- 
-     @Override
-     public long getInhabitedTime() {
--        return this.inhabitedTime;
-+        return this.level.paperConfig.fixedInhabitedTime < 0 ? this.inhabitedTime : this.level.paperConfig.fixedInhabitedTime; // Paper
+@@ -0,0 +0,0 @@ public class LevelChunk extends ChunkAccess {
+         return new ChunkAccess.TicksToSave(this.blockTicks, this.fluidTicks);
      }
  
++    // Paper start
++    @Override
++    public long getInhabitedTime() {
++        return this.level.paperConfig.fixedInhabitedTime < 0 ? super.getInhabitedTime() : this.level.paperConfig.fixedInhabitedTime;
++    }
++    // Paper end
++
      @Override
+     public GameEventDispatcher getEventDispatcher(int ySectionCoord) {
+         return (GameEventDispatcher) this.gameEventDispatcherSections.computeIfAbsent(ySectionCoord, (j) -> {

patches/server/Configurable-inter-world-teleportation-safety.patch

@@ -37,8 +37,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          if (fromWorld == toWorld) {
              entity.connection.teleport(to);
          } else {
--            server.getHandle().moveToWorld(entity, toWorld, true, to, true);
-+            server.getHandle().moveToWorld(entity, toWorld, true, to, !toWorld.paperConfig.disableTeleportationSuffocationCheck); // Paper
+-            server.getHandle().respawn(entity, toWorld, true, to, true);
++            server.getHandle().respawn(entity, toWorld, true, to, !toWorld.paperConfig.disableTeleportationSuffocationCheck); // Paper
          }
          return true;
      }

patches/server/Configurable-mob-spawner-tick-rate.patch

@@ -23,13 +23,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
 @@ -0,0 +0,0 @@ public abstract class BaseSpawner {
-     public int requiredPlayerRange;
-     public int spawnRange;
-     private final Random random;
+     public int requiredPlayerRange = 16;
+     public int spawnRange = 4;
+     private final Random random = new Random();
 +    private int tickDelay = 0; // Paper
  
-     public BaseSpawner() {
-         this.spawnPotentials = BaseSpawner.EMPTY_POTENTIALS;
+     public BaseSpawner() {}
+ 
 @@ -0,0 +0,0 @@ public abstract class BaseSpawner {
      }
  

patches/server/Configurable-spawn-chances-for-skeleton-horses.patch

@@ -33,4 +33,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * paperConfig.skeleHorseSpawnChance && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
  
                  if (flag1) {
-                     SkeletonHorse entityhorseskeleton = (SkeletonHorse) EntityType.SKELETON_HORSE.create((Level) this);
+                     SkeletonHorse entityhorseskeleton = (SkeletonHorse) EntityType.SKELETON_HORSE.create(this);

patches/server/Configurable-top-of-nether-void-damage.patch

@@ -32,7 +32,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      }
  
      public void checkOutOfWorld() {

patches/server/Disable-Scoreboards-for-non-players-by-default.patch

@@ -28,7 +28,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
  
      @Nullable
      public Team getTeam() {

patches/server/Entity-Origin-API.patch

@@ -28,7 +28,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
      public org.bukkit.projectiles.ProjectileSource projectileSource; // For projectiles only
      public boolean forceExplosionKnockback; // SPIGOT-949
      public boolean persistentInvisibility = false;
@@ -56,7 +56,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      // Spigot start
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
                  this.bukkitEntity.storeBukkitValues(nbt);
              }
              // CraftBukkit end
@@ -72,7 +72,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              return nbt;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
              }
              // CraftBukkit end
  
@@ -111,7 +111,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper end
      }
  
-     public Level getLevel() {
+     public void setHurtsEntities(float fallHurtAmount, int fallHurtMax) {
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java

patches/server/Handle-Item-Meta-Inconsistencies.patch

@@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import java.util.Comparator;
  import java.util.Locale;
  import java.util.Map.Entry;
- import java.util.Objects;
+ import java.util.Optional;
 @@ -0,0 +0,0 @@ public final class ItemStack {
          return this.getItem().getTooltipImage(this);
      }
@@ -56,16 +56,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
 @@ -0,0 +0,0 @@ public final class ItemStack {
              // CraftBukkit start - make defensive copy as this data may be coming from the save thread
-             this.tag = (CompoundTag) nbttagcompound.getCompound("tag").copy();
+             this.tag = nbttagcompound.getCompound("tag").copy();
              // CraftBukkit end
 +            this.processEnchantOrder(this.tag); // Paper
              this.getItem().verifyTagAfterLoad(this.tag);
          }
  
-@@ -0,0 +0,0 @@ public final class ItemStack {
-     // Paper end
-     public void setTag(@Nullable CompoundTag tag) {
-         this.tag = tag;
 +        processEnchantOrder(this.tag); // Paper
          if (this.getItem().canBeDepleted()) {
              this.setDamageValue(this.getDamageValue());
@@ -214,9 +210,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  import com.google.common.collect.Lists;
  import com.google.common.collect.Multimap;
  import com.google.common.collect.SetMultimap;
-@@ -0,0 +0,0 @@ import java.lang.reflect.InvocationTargetException;
- import java.util.ArrayList;
+@@ -0,0 +0,0 @@ import java.util.ArrayList;
  import java.util.Arrays;
+ import java.util.Base64;
  import java.util.Collection;
 +import java.util.Comparator; // Paper
  import java.util.EnumSet;
@@ -243,8 +239,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
  
      private CompoundTag internalTag;
--    private final Map<String, Tag> unhandledTags = new HashMap<String, Tag>();
-+    private final Map<String, Tag> unhandledTags = new TreeMap<>(); // Paper
+-    final Map<String, Tag> unhandledTags = new HashMap<String, Tag>(); // Visible for testing only
++    final Map<String, Tag> unhandledTags = new TreeMap<String, Tag>(); // Visible for testing only // Paper
      private CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(CraftMetaItem.DATA_TYPE_REGISTRY);
  
      private int version = CraftMagicNumbers.INSTANCE.getDataVersion(); // Internal use only

patches/server/Implement-PlayerLocaleChangeEvent.patch

@@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if (this.locale == null || !this.locale.equals(packet.language)) { // Paper - check for null
              PlayerLocaleChangeEvent event = new PlayerLocaleChangeEvent(this.getBukkitEntity(), packet.language);
              this.server.server.getPluginManager().callEvent(event);
-+            new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.locale, packet.language).callEvent(); // Paper
++            this.server.server.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerLocaleChangeEvent(this.getBukkitEntity(), this.locale, packet.language)); // Paper
          }
          this.locale = packet.language;
          // Paper start

patches/server/Optimize-isValidLocation-getType-and-getBlockData-fo.patch

@@ -17,8 +17,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/core/Vec3i.java
 +++ b/src/main/java/net/minecraft/core/Vec3i.java
 @@ -0,0 +0,0 @@ public class Vec3i implements Comparable<Vec3i> {
-     private int y;
-     private int z;
+         return CODEC.flatXmap(checkOffsetAxes(maxAbsValue), checkOffsetAxes(maxAbsValue));
+     }
  
 +    // Paper start
 +    public boolean isValidLocation(net.minecraft.world.level.LevelHeightAccessor levelHeightAccessor) {
@@ -49,20 +49,20 @@ diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/sr
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-@@ -0,0 +0,0 @@ public interface ChunkAccess extends BlockGetter, FeatureAccess {
+@@ -0,0 +0,0 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom
          return GameEventDispatcher.NOOP;
      }
  
-+    BlockState getType(final int x, final int y, final int z); // Paper
++    public abstract BlockState getType(final int x, final int y, final int z); // Paper
      @Nullable
-     BlockState setBlockState(BlockPos pos, BlockState state, boolean moved);
+     public abstract BlockState setBlockState(BlockPos pos, BlockState state, boolean moved);
  
 diff --git a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/EmptyLevelChunk.java
 @@ -0,0 +0,0 @@ public class EmptyLevelChunk extends LevelChunk {
-         super(world, pos, new EmptyLevelChunk.EmptyChunkBiomeContainer(world));
+         super(world, pos);
      }
  
 +    // Paper start
@@ -93,8 +93,8 @@ diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -0,0 +0,0 @@ public class LevelChunk implements ChunkAccess {
-         return this.sections;
+@@ -0,0 +0,0 @@ public class LevelChunk extends ChunkAccess {
+         });
      }
  
 +    // Paper start - Optimize getBlockData to reduce instructions
@@ -131,44 +131,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 @@ -0,0 +0,0 @@ public class LevelChunkSection {
      public static final int SECTION_SIZE = 4096;
-     public static final Palette<BlockState> GLOBAL_BLOCKSTATE_PALETTE = new GlobalPalette<>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState());
+     public static final int BIOME_CONTAINER_BITS = 2;
      private final int bottomBlockY;
 -    private short nonEmptyBlockCount;
 +    short nonEmptyBlockCount; // Paper - package-private
      private short tickingBlockCount;
      private short tickingFluidCount;
--    private final PalettedContainer<BlockState> states;
-+    final PalettedContainer<BlockState> states; // Paper - package-private
- 
-     public LevelChunkSection(int yOffset) {
-         this(yOffset, (short)0, (short)0, (short)0);
-@@ -0,0 +0,0 @@ public class LevelChunkSection {
-     }
- 
-     public BlockState getBlockState(int x, int y, int z) {
--        return this.states.get(x, y, z);
-+        return this.states.get(y << 8 | z << 4 | x); // Paper - inline
-     }
- 
-     public FluidState getFluidState(int x, int y, int z) {
-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> {
-     }
- 
-     public T get(int x, int y, int z) {
--        return this.get(getIndex(x, y, z));
-+        return this.get(y << 8 | z << 4 | x); // Paper - inline
-     }
- 
-     protected T get(int index) {
+     public final PalettedContainer<BlockState> states;
 diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java
-@@ -0,0 +0,0 @@ public class ProtoChunk implements ChunkAccess {
+@@ -0,0 +0,0 @@ public class ProtoChunk extends ChunkAccess {
  
      @Override
      public BlockState getBlockState(BlockPos pos) {
@@ -181,10 +155,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        if (this.isOutsideBuildHeight(y)) {
              return Blocks.VOID_AIR.defaultBlockState();
          } else {
--            LevelChunkSection levelChunkSection = this.getSections()[this.getSectionIndex(i)];
--            return LevelChunkSection.isEmpty(levelChunkSection) ? Blocks.AIR.defaultBlockState() : levelChunkSection.getBlockState(pos.getX() & 15, i & 15, pos.getZ() & 15);
-+            LevelChunkSection chunksection = this.getSections()[this.getSectionIndex(y)];
-+            return chunksection == LevelChunk.EMPTY_SECTION || chunksection.isEmpty() ? Blocks.AIR.defaultBlockState() : chunksection.getBlockState(x & 15, y & 15, z & 15);
+-            LevelChunkSection levelChunkSection = this.getSection(this.getSectionIndex(i));
+-            return levelChunkSection.hasOnlyAir() ? Blocks.AIR.defaultBlockState() : levelChunkSection.getBlockState(pos.getX() & 15, i & 15, pos.getZ() & 15);
++            LevelChunkSection levelChunkSection = this.getSections()[this.getSectionIndex(y)];
++            return levelChunkSection.hasOnlyAir() ? Blocks.AIR.defaultBlockState() : levelChunkSection.getBlockState(x & 15, y & 15, z & 15);
          }
      }
 +    // Paper end

patches/server/Per-Player-View-Distance-API-placeholders.patch

@@ -19,6 +19,42 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private static final Logger LOGGER = LogManager.getLogger();
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+     public int getSimulationDistance() {
+         return world.spigotConfig.simulationDistance;
+     }
++
++    @Override
++    public void setViewDistance(int viewDistance) {
++        throw new UnsupportedOperationException(); //TODO
++    }
++
++    @Override
++    public int getNoTickViewDistance() {
++        throw new UnsupportedOperationException(); //TODO
++    }
++
++    @Override
++    public void setNoTickViewDistance(int viewDistance) {
++        throw new UnsupportedOperationException(); //TODO
++    }
++
++    @Override
++    public int getSendViewDistance() {
++        throw new UnsupportedOperationException(); //TODO
++    }
++
++    @Override
++    public void setSendViewDistance(int viewDistance) {
++        throw new UnsupportedOperationException(); //TODO
++    }
+     // Spigot end
+ 
+     // Spigot start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -36,6 +72,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @Override
 +    public void setViewDistance(int viewDistance) {
 +        throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
++    }
++
++    @Override
++    public int getNoTickViewDistance() {
++        throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
++    }
++
++    @Override
++    public void setNoTickViewDistance(int viewDistance) {
++        throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
++    }
++
++    @Override
++    public int getSendViewDistance() {
++        throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
++    }
++
++    @Override
++    public void setSendViewDistance(int viewDistance) {
++        throw new NotImplementedException("Per-Player View Distance APIs need further understanding to properly implement (There are per world view distances though!)"); // TODO
 +    }
      // Paper end
  

patches/server/Prevent-tile-entity-and-entity-crashes.patch

@@ -29,7 +29,7 @@ diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.ja
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
-@@ -0,0 +0,0 @@ public abstract class BlockEntity implements net.minecraft.server.KeyedObject {
+@@ -0,0 +0,0 @@ public abstract class BlockEntity implements io.papermc.paper.util.KeyedObject {
              return minecraftkey + " // " + this.getClass().getCanonicalName();
          });
          if (this.level != null) {
@@ -47,7 +47,7 @@ diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -0,0 +0,0 @@ public class LevelChunk implements ChunkAccess {
+@@ -0,0 +0,0 @@ public class LevelChunk extends ChunkAccess {
  
                          gameprofilerfiller.pop();
                      } catch (Throwable throwable) {

patches/server/Use-a-Shared-Random-for-Entities.patch

@@ -9,7 +9,7 @@ diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          return tag.contains("Bukkit.updateLevel") && tag.getInt("Bukkit.updateLevel") >= level;
      }
  
@@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private CraftEntity bukkitEntity;
  
      public CraftEntity getBukkitEntity() {
-@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
          this.bb = Entity.INITIAL_AABB;
          this.stuckSpeedMultiplier = Vec3.ZERO;
          this.nextStep = 1.0F;