More more work

patches/server/Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -13,8 +13,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      protected void tickDespawn() {
          ++this.life;
--        if (this.life >= ((this instanceof ThrownTrident) ? level.spigotConfig.tridentDespawnRate : level.spigotConfig.arrowDespawnRate)) { // Spigot
-+        if (this.life >= (pickup == Pickup.CREATIVE_ONLY ? level.paperConfig().entities.spawning.creativeArrowDespawnRate.value() : (pickup == Pickup.DISALLOWED ? level.paperConfig().entities.spawning.nonPlayerArrowDespawnRate.value() : ((this instanceof ThrownTrident) ? level.spigotConfig.tridentDespawnRate : level.spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - TODO: Extract this to init?
+-        if (this.life >= ((this instanceof ThrownTrident) ? this.level().spigotConfig.tridentDespawnRate : this.level().spigotConfig.arrowDespawnRate)) { // Spigot
++        if (this.life >= (pickup == Pickup.CREATIVE_ONLY ? this.level().paperConfig().entities.spawning.creativeArrowDespawnRate.value() : (pickup == Pickup.DISALLOWED ? this.level().paperConfig().entities.spawning.nonPlayerArrowDespawnRate.value() : ((this instanceof ThrownTrident) ? this.level().spigotConfig.tridentDespawnRate : this.level().spigotConfig.arrowDespawnRate)))) { // Spigot // Paper - TODO: Extract this to init?
              this.discard();
          }
  

patches/server/Custom-replacement-for-eaten-items.patch

@@ -18,20 +18,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                          org.bukkit.inventory.EquipmentSlot hand = org.bukkit.craftbukkit.CraftEquipmentSlot.getHand(enumhand);
 -                        PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand);
 +                        event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem, hand); // Paper
-                         level.getCraftServer().getPluginManager().callEvent(event);
+                         this.level().getCraftServer().getPluginManager().callEvent(event);
  
                          if (event.isCancelled()) {
 @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable {
                      } else {
-                         itemstack = this.useItem.finishUsingItem(this.level, this);
+                         itemstack = this.useItem.finishUsingItem(this.level(), this);
                      }
-+
-+                // Paper start - save the default replacement item and change it if necessary
-+                final ItemStack defaultReplacement = itemstack;
-+                if (event != null && event.getReplacement() != null) {
-+                    itemstack = CraftItemStack.asNMSCopy(event.getReplacement());
-+                }
-+                // Paper end
++                    // Paper start - save the default replacement item and change it if necessary
++                    final ItemStack defaultReplacement = itemstack;
++                    if (event != null && event.getReplacement() != null) {
++                        itemstack = CraftItemStack.asNMSCopy(event.getReplacement());
++                    }
++                    // Paper end
                      // CraftBukkit end
  
                      if (itemstack != this.useItem) {
@@ -39,11 +38,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      }
  
                      this.stopUsingItem();
-+                // Paper start - if the replacement is anything but the default, update the client inventory
-+                if (this instanceof ServerPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) {
-+                    ((ServerPlayer) this).getBukkitEntity().updateInventory();
-+                }
-+                // Paper end
++                    // Paper start - if the replacement is anything but the default, update the client inventory
++                    if (this instanceof ServerPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) {
++                        ((ServerPlayer) this).getBukkitEntity().updateInventory();
++                    }
++                    // Paper end
                  }
  
              }

patches/server/Do-not-load-chunks-for-Pathfinding.patch

@@ -23,8 +23,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                              return BlockPathTypes.DANGER_OTHER;
                          }
 @@ -0,0 +0,0 @@ public class WalkNodeEvaluator extends NodeEvaluator {
-                         if (world.getFluidState(pos).is(FluidTags.WATER)) {
-                             return BlockPathTypes.WATER_BORDER;
+                         if (blockState.is(Blocks.WITHER_ROSE) || blockState.is(Blocks.POINTED_DRIPSTONE)) {
+                             return BlockPathTypes.DAMAGE_CAUTIOUS;
                          }
 +                        } // Paper
                      }
@@ -38,5 +38,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        BlockState blockState = world.getBlockStateIfLoaded(pos); // Paper
 +        if (blockState == null) return BlockPathTypes.BLOCKED; // Paper
          Block block = blockState.getBlock();
-         Material material = blockState.getMaterial();
          if (blockState.isAir()) {
+             return BlockPathTypes.OPEN;

patches/server/EntityPathfindEvent.patch

@@ -42,12 +42,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class GroundPathNavigation extends PathNavigation {
          }
  
-         if (!this.level.getBlockState(target).getMaterial().isSolid()) {
+         if (!this.level.getBlockState(target).isSolid()) {
 -            return super.createPath(target, distance);
 +            return super.createPath(target, entity, distance); // Paper
          } else {
              BlockPos blockPos2;
-             for(blockPos2 = target.above(); blockPos2.getY() < this.level.getMaxBuildHeight() && this.level.getBlockState(blockPos2).getMaterial().isSolid(); blockPos2 = blockPos2.above()) {
+             for(blockPos2 = target.above(); blockPos2.getY() < this.level.getMaxBuildHeight() && this.level.getBlockState(blockPos2).isSolid(); blockPos2 = blockPos2.above()) {
              }
  
 -            return super.createPath(blockPos2, distance);

patches/server/EntityRegainHealthEvent-isFastRegen-API.patch

@@ -26,7 +26,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            EntityRegainHealthEvent event = new EntityRegainHealthEvent(this.getBukkitEntity(), f, regainReason, isFastRegen); // Paper
              // Suppress during worldgen
              if (this.valid) {
-                 this.level.getCraftServer().getPluginManager().callEvent(event);
+                 this.level().getCraftServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/food/FoodData.java b/src/main/java/net/minecraft/world/food/FoodData.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/food/FoodData.java

patches/server/Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch

@@ -129,9 +129,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- 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 static final int SECTION_HEIGHT = 16;
      public static final int SECTION_SIZE = 4096;
      public static final int BIOME_CONTAINER_BITS = 2;
-     private final int bottomBlockY;
 -    private short nonEmptyBlockCount;
 +    short nonEmptyBlockCount; // Paper - package-private
      private short tickingBlockCount;

patches/server/Sanitise-RegionFileCache-and-make-configurable.patch

@@ -15,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- 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 @@ public class RegionFileStorage implements AutoCloseable {
-             // Paper end
+         if (regionfile != null) {
              return regionfile;
          } else {
 -            if (this.regionCache.size() >= 256) {

patches/server/handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -20,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +        this.setAbsorptionAmount(absorptionAmount);
 +        // Paper end
-         if (nbt.contains("Attributes", 9) && this.level != null && !this.level.isClientSide) {
+         if (nbt.contains("Attributes", 9) && this.level() != null && !this.level().isClientSide) {
              this.getAttributes().load(nbt.getList("Attributes", 10));
          }
 @@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable {