Fix some compile errors

Spigot-Server-Patches/Add-Heightmap-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a038945b36..54a03fb102 100644
+index 1bec5beab4..9f4cf3f1b3 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/Add-World-Util-Methods.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c4103680d..9433d04f4 100644
+index c4103680d4..9433d04f43 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
@@ -18,7 +18,7 @@ index c4103680d..9433d04f4 100644
          return this.a(blockposition, i, this.world.getWorldProvider().g());
      }
 diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
-index bac6c9d65..0930552b1 100644
+index bac6c9d65b..0930552b1f 100644
 --- a/src/main/java/net/minecraft/server/IWorldReader.java
 +++ b/src/main/java/net/minecraft/server/IWorldReader.java
 @@ -0,0 +0,0 @@ public interface IWorldReader extends IIBlockAccess {
@@ -45,7 +45,7 @@ index bac6c9d65..0930552b1 100644
      @Nullable
      IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 01f510588..cdc5d7009 100644
+index 01f5105884..556d7af07a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -71,36 +71,37 @@ index 01f510588..cdc5d7009 100644
 +    // test if meets light level, return faster
 +    // logic copied from below
 +    public boolean isLightLevel(BlockPosition blockposition, int level) {
-+        if (isValidLocation(blockposition)) {
++        return this.getLightLevel(blockposition) >= level; // TODO
-+            if (this.getType(blockposition).c(this, blockposition)) {
++//        if (isValidLocation(blockposition)) {
-+                int sky = getSkylightSubtracted();
++//            if (this.getType(blockposition).c(this, blockposition)) { // use neighbour brightness (where did this go)
-+                if (this.getLightLevel(blockposition.up(), sky) >= level) {
++//                int sky = getSkylightSubtracted();
-+                    return true;
++//                if (this.getLightLevel(blockposition.up(), sky) >= level) {
-+                }
++//                    return true;
-+                if (this.getLightLevel(blockposition.east(), sky) >= level) {
++//                }
-+                    return true;
++//                if (this.getLightLevel(blockposition.east(), sky) >= level) {
-+                }
++//                    return true;
-+                if (this.getLightLevel(blockposition.west(), sky) >= level) {
++//                }
-+                    return true;
++//                if (this.getLightLevel(blockposition.west(), sky) >= level) {
-+                }
++//                    return true;
-+                if (this.getLightLevel(blockposition.south(), sky) >= level) {
++//                }
-+                    return true;
++//                if (this.getLightLevel(blockposition.south(), sky) >= level) {
-+                }
++//                    return true;
-+                if (this.getLightLevel(blockposition.north(), sky) >= level) {
++//                }
-+                    return true;
++//                if (this.getLightLevel(blockposition.north(), sky) >= level) {
-+                }
++//                    return true;
-+                return false;
++//                }
-+            } else {
++//                return false;
-+                if (blockposition.getY() >= 256) {
++//            } else {
-+                    blockposition = new BlockPosition(blockposition.getX(), 255, blockposition.getZ());
++//                if (blockposition.getY() >= 256) {
-+                }
++//                    blockposition = new BlockPosition(blockposition.getX(), 255, blockposition.getZ());
-+
++//                }
-+                Chunk chunk = this.getChunkAtWorldCoords(blockposition);
++//
-+                return chunk.getLightSubtracted(blockposition, this.getSkylightSubtracted()) >= level;
++//                Chunk chunk = this.getChunkAtWorldCoords(blockposition);
-+            }
++//                return chunk.getLightSubtracted(blockposition, this.getSkylightSubtracted()) >= level;
-+        } else {
++//            }
-+            return true;
++//        } else {
-+        }
++//            return true;
++//        }
 +    }
 +    //  reduces need to do isLoaded before getType
 +    public IBlockData getTypeIfLoadedAndInBounds(BlockPosition blockposition) {
@@ -118,7 +119,7 @@ index 01f510588..cdc5d7009 100644
 +        // CraftBukkit end
 +        Chunk chunk = this.getChunkIfLoaded(blockposition);
 +        if (chunk != null) {
-+            return isValidLocation(blockposition) ? chunk.getBlockData(blockposition) : Blocks.AIR.getBlockData();
++            return isValidLocation(blockposition) ? chunk.getType(blockposition) : Blocks.AIR.getBlockData();
 +        }
 +        return null;
 +    }
@@ -141,4 +142,16 @@ index 01f510588..cdc5d7009 100644
      public Chunk getChunkAtWorldCoords(BlockPosition blockposition) {
          return this.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
      }
+diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
+index 94d1c2be11..77b805f3ae 100644
+--- a/src/main/java/net/minecraft/server/WorldBorder.java
++++ b/src/main/java/net/minecraft/server/WorldBorder.java
+@@ -0,0 +0,0 @@ public class WorldBorder {
+ 
+     public WorldBorder() {}
+ 
++    public final boolean isInBounds(BlockPosition blockposition) { return this.a(blockposition); } // Paper - OBFHELPER
+     public boolean a(BlockPosition blockposition) {
+         return (double) (blockposition.getX() + 1) > this.c() && (double) blockposition.getX() < this.e() && (double) (blockposition.getZ() + 1) > this.d() && (double) blockposition.getZ() < this.f();
+     }
 --

Spigot-Server-Patches/Add-ray-tracing-methods-to-LivingEntity.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2ed2960c5..064703afe 100644
+index 8c3be17f7d..f86e7c9d4d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -13,10 +13,10 @@ index 2ed2960c5..064703afe 100644
      }
      // Paper start
 +    public MovingObjectPosition getRayTrace(int maxDistance) {
-+        return getRayTrace(maxDistance, FluidCollisionOption.NEVER);
++        return getRayTrace(maxDistance, RayTrace.FluidCollisionOption.NONE);
 +    }
 +
-+    public MovingObjectPosition getRayTrace(int maxDistance, FluidCollisionOption fluidCollisionOption) {
++    public MovingObjectPosition getRayTrace(int maxDistance, RayTrace.FluidCollisionOption fluidCollisionOption) {
 +        if (maxDistance < 1 || maxDistance > 120) {
 +            throw new IllegalArgumentException("maxDistance must be between 1-120");
 +        }
@@ -24,15 +24,16 @@ index 2ed2960c5..064703afe 100644
 +        Vec3D start = new Vec3D(locX, locY + getHeadHeight(), locZ);
 +        org.bukkit.util.Vector dir = getBukkitEntity().getLocation().getDirection().multiply(maxDistance);
 +        Vec3D end = new Vec3D(start.x + dir.getX(), start.y + dir.getY(), start.z + dir.getZ());
++        RayTrace raytrace = new RayTrace(start, end, RayTrace.BlockCollisionOption.OUTLINE, fluidCollisionOption, this); // TODO review these options
 +
-+        return world.rayTrace(start, end, fluidCollisionOption);
++        return world.rayTrace(raytrace);
 +    }
 +
      public int shieldBlockingDelay = world.paperConfig.shieldBlockingDelay;
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 29b23e30f..863802187 100644
+index 29b23e30fa..8638021879 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -0,0 +0,0 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

Spigot-Server-Patches/Add-sun-related-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index f1621a9e9..a8318c88a 100644
+index f1621a9e9d..a8318c88af 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -0,0 +0,0 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index f1621a9e9..a8318c88a 100644
          if (this.world.J() && !this.world.isClientSide) {
              float f = this.aE();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index cfab578df..c917c39b9 100644
+index bebf5a6e19..136727c280 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -29,7 +29,7 @@ index cfab578df..c917c39b9 100644
          return this.d < 4;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a6f6046c6..5e672ae2e 100644
+index a6f6046c6e..5e672ae2e4 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 implements World {
@@ -46,7 +46,7 @@ index a6f6046c6..5e672ae2e 100644
          return createExplosion(x, y, z, power, false, true);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 53c2d154e..40a429942 100644
+index 53c2d154ed..40a429942e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -0,0 +0,0 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {

Spigot-Server-Patches/Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch

@@ -10,7 +10,7 @@ to the object directly on the Entity/TileEntity object we can directly grab.
 Use that local value instead to reduce lookups in many hot places.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3737fca817..6bd181565f 100644
+index dd74f38038..2f79f9e947 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/BlockDestroyEvent.patch

@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 17401ea28a..de0ed95083 100644
+index 326165468c..9c26b8d676 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -23,7 +23,7 @@ index 17401ea28a..de0ed95083 100644
 +            // it doesn't imply destruction of a block that plays a sound effect / drops an item.
 +            boolean playEffect = true;
 +            if (com.destroystokyo.paper.event.block.BlockDestroyEvent.getHandlerList().getRegisteredListeners().length > 0) {
-+                com.destroystokyo.paper.event.block.BlockDestroyEvent event = new com.destroystokyo.paper.event.block.BlockDestroyEvent(MCUtil.toBukkitBlock(this, blockposition), fluid.i().createCraftBlockData(), flag);
++                com.destroystokyo.paper.event.block.BlockDestroyEvent event = new com.destroystokyo.paper.event.block.BlockDestroyEvent(MCUtil.toBukkitBlock(this, blockposition), fluid.getBlockData().createCraftBlockData(), flag);
 +                if (!event.callEvent()) {
 +                    return false;
 +                }

Spigot-Server-Patches/Bound-Treasure-Maps-to-World-Border.patch

@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 464e1e101..7b2eace75 100644
+index 464e1e101a..7b2eace75c 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -0,0 +0,0 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -23,7 +23,7 @@ index 464e1e101..7b2eace75 100644
  
                                  if (structurestart != null && structurestart.e()) {
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 51739e254..2b5c09c62 100644
+index 77b805f3ae..1e622a0434 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -0,0 +0,0 @@ public class WorldBorder {

Spigot-Server-Patches/Call-PaperServerListPingEvent-for-legacy-pings.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 new file mode 100644
-index 000000000..74c012fd4
+index 0000000000..74c012fd40
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 @@ -0,0 +0,0 @@
@@ -84,7 +84,7 @@ index 000000000..74c012fd4
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 9bc1cce3f..e086b4140 100644
+index 06aefcb638..d0bb5496e4 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -0,0 +0,0 @@
@@ -135,7 +135,7 @@ index 9bc1cce3f..e086b4140 100644
              default:
 @@ -0,0 +0,0 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter {
  
-         a.debug("Ping: (1.6) from {}", ctx.channel().remoteAddress());
+         LOGGER.debug("Ping: (1.6) from {}", ctx.channel().remoteAddress());
  
 -        String response = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d",
 -                Byte.MAX_VALUE, server.getVersion(), server.getMotd(), server.getPlayerCount(), server.getMaxPlayers());

Spigot-Server-Patches/Do-not-load-chunks-for-light-checks.patch

@@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7d6893cee..31e477430 100644
+index d8723c82d8..8bd86a5403 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 31e477430..845cabd29 100644
+index 8bd86a5403..284c29e307 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/Fix-MC-117075-TE-Unload-Lag-Spike.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1286703bf..c9fc001f2 100644
+index 4b10048303..41908fa2a9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/Improve-death-events.patch

@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 20db76abd..a148cd437 100644
+index 20db76abd7..a148cd437c 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -0,0 +0,0 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index 20db76abd..a148cd437 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 784520342..ef7f0213b 100644
+index 784520342e..ef7f0213b6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -47,7 +47,7 @@ index 784520342..ef7f0213b 100644
  
      protected void i(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 7031dd0e4..f6dc96434 100644
+index 7031dd0e4c..f6dc96434b 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -0,0 +0,0 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index 7031dd0e4..f6dc96434 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 064703afe..bd8385cd5 100644
+index f86e7c9d4d..2ca490eedc 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -204,6 +204,19 @@ index 064703afe..bd8385cd5 100644
  
      protected void cE() {}
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
+         return SoundEffects.ENTITY_GENERIC_HURT;
+     }
+ 
++    public final SoundEffect getDeathSoundEffect() { return this.getSoundDeath(); } // Paper - OBFHELPER
+     @Nullable
+     protected SoundEffect getSoundDeath() {
+         return SoundEffects.ENTITY_GENERIC_DEATH;
+@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
+ 
+     }
+ 
++    public final float getDeathSoundVolume() { return this.getSoundVolume(); } // Paper - OBFHELPER
+     protected float getSoundVolume() {
          return 1.0F;
      }
  
@@ -212,7 +225,7 @@ index 064703afe..bd8385cd5 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 634c30d93..332515128 100644
+index 634c30d93e..3325151284 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -263,7 +276,7 @@ index 634c30d93..332515128 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 73cb64e09..9f317ff2e 100644
+index 73cb64e09d..9f317ff2e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -0,0 +0,0 @@ public enum CraftSound {
@@ -290,7 +303,7 @@ index 73cb64e09..9f317ff2e 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d505af188..5f752784d 100644
+index d505af1883..5f752784d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -311,7 +324,7 @@ index d505af188..5f752784d 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 50444ed94..46c05c398 100644
+index 50444ed94d..55642b6bd6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -0,0 +0,0 @@ public class CraftEventFactory {
@@ -356,11 +369,11 @@ index 50444ed94..46c05c398 100644
 +    private static void populateFields(EntityLiving victim, EntityDeathEvent event) {
 +        event.setReviveHealth(event.getEntity().getAttribute(org.bukkit.attribute.Attribute.GENERIC_MAX_HEALTH).getValue());
 +        event.setShouldPlayDeathSound(!victim.silentDeath && !victim.isSilent());
-+        SoundEffect soundEffect = victim.getDeathSoundEffect();
++        net.minecraft.server.SoundEffect soundEffect = victim.getDeathSoundEffect();
 +        event.setDeathSound(soundEffect != null ? org.bukkit.craftbukkit.CraftSound.getSoundByEffect(soundEffect) : null);
-+        event.setDeathSoundCategory(org.bukkit.SoundCategory.valueOf(victim.getDeathSoundCategory().name()));
++        event.setDeathSoundCategory(org.bukkit.SoundCategory.valueOf(victim.getSoundCategory().name()));
 +        event.setDeathSoundVolume(victim.getDeathSoundVolume());
-+        event.setDeathSoundPitch(victim.getDeathSoundPitch());
++        event.setDeathSoundPitch(victim.getSoundPitch());
 +    }
 +
 +    // Play death sound manually
@@ -370,8 +383,8 @@ index 50444ed94..46c05c398 100644
 +            double x = event.getEntity().getLocation().getX();
 +            double y = event.getEntity().getLocation().getY();
 +            double z = event.getEntity().getLocation().getZ();
-+            SoundEffect soundEffect = org.bukkit.craftbukkit.CraftSound.getSoundEffect(event.getDeathSound());
++            net.minecraft.server.SoundEffect soundEffect = org.bukkit.craftbukkit.CraftSound.getSoundEffect(event.getDeathSound());
-+            SoundCategory soundCategory = SoundCategory.valueOf(event.getDeathSoundCategory().name());
++            net.minecraft.server.SoundCategory soundCategory = net.minecraft.server.SoundCategory.valueOf(event.getDeathSoundCategory().name());
 +            victim.world.sendSoundEffect(source, x, y, z, soundEffect, soundCategory, event.getDeathSoundVolume(), event.getDeathSoundPitch());
 +        }
 +    }

Spigot-Server-Patches/MC-Dev-fixes.patch

@@ -63,6 +63,31 @@ index b4c8722f04..59d86fc66e 100644
              String s1 = ((INamable) t0).getName();
  
              if (this.b.containsKey(s1)) {
+diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
+index c973ab6076..30701fd7f3 100644
+--- a/src/main/java/net/minecraft/server/ChunkSection.java
++++ b/src/main/java/net/minecraft/server/ChunkSection.java
+@@ -0,0 +0,0 @@ public class ChunkSection {
+     }
+ 
+     public boolean a(IBlockData iblockdata) {
+-        return this.blockIds.a((Object) iblockdata);
++        return this.blockIds.a(iblockdata); // Paper - decompile fix
+     }
+ }
+diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
+index 45370ad5d9..b566e77869 100644
+--- a/src/main/java/net/minecraft/server/EntityVindicator.java
++++ b/src/main/java/net/minecraft/server/EntityVindicator.java
+@@ -0,0 +0,0 @@ public class EntityVindicator extends EntityIllagerAbstract {
+         this.goalSelector.a(2, new EntityIllagerAbstract.b(this));
+         this.goalSelector.a(3, new EntityRaider.a(this, 10.0F));
+         this.goalSelector.a(4, new EntityVindicator.c(this));
+-        this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[] { EntityRaider.class})).a());
++        this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[] { EntityRaider.class})).a(new Class[0])); // Paper - decompile fix
+         this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
+         this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
+         this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true));
 diff --git a/src/main/java/net/minecraft/server/GameRules.java b/src/main/java/net/minecraft/server/GameRules.java
 index d8d2267084..3de9d264db 100644
 --- a/src/main/java/net/minecraft/server/GameRules.java
@@ -98,6 +123,48 @@ index 8753bea614..809ca0983a 100644
  
                  do {
                      if (d12 > 1.0D && d13 > 1.0D && d14 > 1.0D) {
+diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
+index e8ae4b5e44..0f4aa698aa 100644
+--- a/src/main/java/net/minecraft/server/IBlockData.java
++++ b/src/main/java/net/minecraft/server/IBlockData.java
+@@ -0,0 +0,0 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
+ 
+     public static <T> Dynamic<T> a(DynamicOps<T> dynamicops, IBlockData iblockdata) {
+         ImmutableMap<IBlockState<?>, Comparable<?>> immutablemap = iblockdata.getStateMap();
+-        Object object;
++        T object; // Paper - decompile fix
+ 
+         if (immutablemap.isEmpty()) {
+             object = dynamicops.createMap(ImmutableMap.of(dynamicops.createString("Name"), dynamicops.createString(IRegistry.BLOCK.getKey(iblockdata.getBlock()).toString())));
+         } else {
+-            object = dynamicops.createMap(ImmutableMap.of(dynamicops.createString("Name"), dynamicops.createString(IRegistry.BLOCK.getKey(iblockdata.getBlock()).toString()), dynamicops.createString("Properties"), dynamicops.createMap((Map) immutablemap.entrySet().stream().map((entry) -> {
++            object = dynamicops.createMap(ImmutableMap.of(dynamicops.createString("Name"), dynamicops.createString(IRegistry.BLOCK.getKey(iblockdata.getBlock()).toString()), dynamicops.createString("Properties"), dynamicops.createMap(immutablemap.entrySet().stream().map((entry) -> { // Paper - decompile fix
+                 return Pair.of(dynamicops.createString(((IBlockState) entry.getKey()).a()), dynamicops.createString(IBlockDataHolder.b((IBlockState) entry.getKey(), (Comparable) entry.getValue())));
+             }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)))));
+         }
+@@ -0,0 +0,0 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
+             if (!iblockdata.o()) {
+                 this.f = null;
+             } else {
+-                this.f = new VoxelShape[IBlockData.a.a.length];
++                this.f = new VoxelShape[a.length]; // Paper - decompile fix
+                 voxelshape = block.h(iblockdata, BlockAccessAir.INSTANCE, BlockPosition.ZERO);
+-                EnumDirection[] aenumdirection = IBlockData.a.a;
++                EnumDirection[] aenumdirection = a; // Paper - decompile fix
+                 int i = aenumdirection.length;
+ 
+                 for (int j = 0; j < i; ++j) {
+@@ -0,0 +0,0 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
+             }
+ 
+             voxelshape = block.b(iblockdata, BlockAccessAir.INSTANCE, BlockPosition.ZERO, VoxelShapeCollision.a());
++            final VoxelShape final_voxelshape = voxelshape; // Paper - decompile fix
+             this.g = Arrays.stream(EnumDirection.EnumAxis.values()).anyMatch((enumdirection_enumaxis) -> {
+-                return voxelshape.b(enumdirection_enumaxis) < 0.0D || voxelshape.c(enumdirection_enumaxis) > 1.0D;
++                return final_voxelshape.b(enumdirection_enumaxis) < 0.0D || final_voxelshape.c(enumdirection_enumaxis) > 1.0D; // Paper - decompile fix
+             });
+         }
+     }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
 index bf7e0d17ef..ee22bb0387 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java

Spigot-Server-Patches/MC-Utils.patch

@@ -285,7 +285,7 @@ index e975265a28..aa6a58dd88 100644
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
 new file mode 100644
-index 0000000000..c97e116aaf
+index 0000000000..3448b5588e
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -0,0 +0,0 @@
@@ -384,7 +384,7 @@ index 0000000000..c97e116aaf
 +     * @return
 +     */
 +    public static void ensureMain(String reason, Runnable run) {
-+        if (AsyncCatcher.enabled && Thread.currentThread() != MinecraftServer.getServer().primaryThread) {
++        if (AsyncCatcher.enabled && Thread.currentThread() != MinecraftServer.getServer().serverThread) {
 +            if (reason != null) {
 +                new IllegalStateException("Asynchronous " + reason + "!").printStackTrace();
 +            }
@@ -409,7 +409,7 @@ index 0000000000..c97e116aaf
 +     * @return
 +     */
 +    public static <T> T ensureMain(String reason, Supplier<T> run) {
-+        if (AsyncCatcher.enabled && Thread.currentThread() != MinecraftServer.getServer().primaryThread) {
++        if (AsyncCatcher.enabled && Thread.currentThread() != MinecraftServer.getServer().serverThread) {
 +            if (reason != null) {
 +                new IllegalStateException("Asynchronous " + reason + "! Blocking thread until it returns ").printStackTrace();
 +            }
@@ -555,7 +555,7 @@ index 0000000000..c97e116aaf
 +    @Nullable
 +    public static TileEntityHopper getHopper(World world, BlockPosition pos) {
 +        Chunk chunk = world.getChunkIfLoaded(pos.getX() >> 4, pos.getZ() >> 4);
-+        if (chunk != null && chunk.getBlockData(pos.getX(), pos.getY(), pos.getZ()).getBlock() == Blocks.HOPPER) {
++        if (chunk != null && chunk.getType(new BlockPosition(pos.getX(), pos.getY(), pos.getZ())).getBlock() == Blocks.HOPPER) {
 +            TileEntity tileEntity = chunk.getTileEntityImmediately(pos);
 +            if (tileEntity instanceof TileEntityHopper) {
 +                return (TileEntityHopper) tileEntity;
@@ -573,15 +573,15 @@ index 0000000000..c97e116aaf
 +        return getNMSWorld(entity.getWorld());
 +    }
 +
-+    public static FluidCollisionOption getNMSFluidCollisionOption(TargetBlockInfo.FluidMode fluidMode) {
++    public static RayTrace.FluidCollisionOption getNMSFluidCollisionOption(TargetBlockInfo.FluidMode fluidMode) {
 +        if (fluidMode == TargetBlockInfo.FluidMode.NEVER) {
-+            return FluidCollisionOption.NEVER;
++            return RayTrace.FluidCollisionOption.NONE;
 +        }
 +        if (fluidMode == TargetBlockInfo.FluidMode.SOURCE_ONLY) {
-+            return FluidCollisionOption.SOURCE_ONLY;
++            return RayTrace.FluidCollisionOption.SOURCE_ONLY;
 +        }
 +        if (fluidMode == TargetBlockInfo.FluidMode.ALWAYS) {
-+            return FluidCollisionOption.ALWAYS;
++            return RayTrace.FluidCollisionOption.ANY;
 +        }
 +        return null;
 +    }

Spigot-Server-Patches/Make-legacy-ping-handler-more-reliable.patch

@@ -28,7 +28,7 @@ respond to the request.
 [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13
 
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index c8c5df7f9..9bc1cce3f 100644
+index c8c5df7f95..06aefcb638 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -0,0 +0,0 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter {
@@ -138,7 +138,7 @@ index c8c5df7f9..9bc1cce3f 100644
 +        buf.release();
 +        this.buf = null;
 +
-+        a.debug("Ping: (1.6) from {}", ctx.channel().remoteAddress());
++        LOGGER.debug("Ping: (1.6) from {}", ctx.channel().remoteAddress());
 +
 +        String response = String.format("\u00a71\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d",
 +                Byte.MAX_VALUE, server.getVersion(), server.getMotd(), server.getPlayerCount(), server.getMaxPlayers());

Spigot-Server-Patches/Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
 Saves on some object allocation and processing when no plugin listens to this
 
 diff --git a/src/main/java/net/minecraft/server/BlockPlant.java b/src/main/java/net/minecraft/server/BlockPlant.java
-index 9bf42bb5e..0526af776 100644
+index 9bf42bb5ef..0526af776d 100644
 --- a/src/main/java/net/minecraft/server/BlockPlant.java
 +++ b/src/main/java/net/minecraft/server/BlockPlant.java
 @@ -0,0 +0,0 @@ public class BlockPlant extends Block {
@@ -19,7 +19,7 @@ index 9bf42bb5e..0526af776 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTallPlant.java b/src/main/java/net/minecraft/server/BlockTallPlant.java
-index 469a3be05..f2c429f22 100644
+index 469a3be057..f2c429f22e 100644
 --- a/src/main/java/net/minecraft/server/BlockTallPlant.java
 +++ b/src/main/java/net/minecraft/server/BlockTallPlant.java
 @@ -0,0 +0,0 @@ public class BlockTallPlant extends BlockPlant {
@@ -32,7 +32,7 @@ index 469a3be05..f2c429f22 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4e97e74a2..c5359ae24 100644
+index 4e97e74a20..c5359ae248 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -44,7 +44,7 @@ index 4e97e74a2..c5359ae24 100644
              if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
                  this.methodProfiler.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 78d1a5c71..7d6893cee 100644
+index 3d47fc899e..d8723c82d8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -66,7 +66,7 @@ index 78d1a5c71..7d6893cee 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9a4a55846..3bd624569 100644
+index 399a766b3b..7923808ff1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World {

Spigot-Server-Patches/Optimize-Captured-TileEntity-Lookup.patch

@@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index de0ed95083..a038945b36 100644
+index 9c26b8d676..1bec5beab4 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/Optimize-CraftBlockData-Creation.patch

@@ -6,39 +6,8 @@ Subject: [PATCH] Optimize CraftBlockData Creation
 Avoids a hashmap lookup by cacheing a reference to the CraftBlockData
 and cloning it when one is needed.
 
-diff --git a/src/main/java/net/minecraft/server/BlockData.java b/src/main/java/net/minecraft/server/BlockData.java
-new file mode 100644
-index 000000000..1b226a77e
---- /dev/null
-+++ b/src/main/java/net/minecraft/server/BlockData.java
-@@ -0,0 +0,0 @@
-+package net.minecraft.server;
-+
-+import com.google.common.collect.ImmutableMap;
-+import org.bukkit.craftbukkit.block.data.CraftBlockData;
-+
-+public class BlockData extends BlockDataAbstract<Block, IBlockData> implements IBlockData {
-+
-+    public BlockData(Block block, ImmutableMap<IBlockState<?>, Comparable<?>> immutablemap) {
-+        super(block, immutablemap);
-+    }
-+
-+    public Block getBlock() {
-+        return (Block) this.e_;
-+    }
-+
-+    // Paper start - impl cached craft block data, lazy load to fix issue with loading at the wrong time
-+    private CraftBlockData cachedCraftBlockData;
-+
-+    @Override
-+    public CraftBlockData createCraftBlockData() {
-+        if(cachedCraftBlockData == null) cachedCraftBlockData = CraftBlockData.createData(this);
-+        return (CraftBlockData) cachedCraftBlockData.clone();
-+    }
-+    // Paper end
-+}
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index e8ae4b5e4..5413fe5b1 100644
+index 0f4aa698aa..c66cabe82f 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -0,0 +0,0 @@ import com.google.common.collect.ImmutableMap;
@@ -57,7 +26,6 @@ index e8ae4b5e4..5413fe5b1 100644
 +    // Paper start - impl cached craft block data, lazy load to fix issue with loading at the wrong time
 +    private CraftBlockData cachedCraftBlockData;
 +
-+    @Override
 +    public CraftBlockData createCraftBlockData() {
 +        if(cachedCraftBlockData == null) cachedCraftBlockData = CraftBlockData.createData(this);
 +        return (CraftBlockData) cachedCraftBlockData.clone();
@@ -68,7 +36,7 @@ index e8ae4b5e4..5413fe5b1 100644
          return this.getBlock().l(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index c1666a9ba..3c29abd52 100644
+index c1666a9baf..3c29abd525 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -0,0 +0,0 @@ public class CraftBlockData implements BlockData {

Spigot-Server-Patches/Optimize-redstone-algorithm.patch

@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ad793ffa3..ef882b897 100644
+index ad793ffa38..ef882b897f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index ad793ffa3..ef882b897 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 000000000..21d9d6d7e
+index 0000000000..21d9d6d7ed
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 @@ -0,0 +0,0 @@
@@ -954,7 +954,7 @@ index 000000000..21d9d6d7e
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index da903f74b..f8dfc91f2 100644
+index da903f74b6..f8dfc91f28 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 @@ -0,0 +0,0 @@
@@ -1122,7 +1122,7 @@ index da903f74b..f8dfc91f2 100644
                  c(iblockdata, world, blockposition);
                  world.a(blockposition, false);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c917c39b9..17401ea28 100644
+index 136727c280..326165468c 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/Option-to-prevent-armor-stands-from-doing-entity-loo.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 83e54cb90..f06bb3ae1 100644
+index 83e54cb904..f06bb3ae19 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 83e54cb90..f06bb3ae1 100644
      private void maxEntityCollision() {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f9f0a94e9..79ded224c 100644
+index f8c382cb69..3f9ad25cbb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/Prevent-Mob-AI-Rules-from-Loading-Chunks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index ce9318c57..541d97344 100644
+index ce9318c575..541d97344e 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 @@ -0,0 +0,0 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@@ -53,7 +53,7 @@ index ce9318c57..541d97344 100644
          return block == this.g && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir();
      }
 diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
-index 8340d6d25..78eb1b39c 100644
+index 8340d6d25b..78eb1b39cf 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 @@ -0,0 +0,0 @@ public class RandomPositionGenerator {
@@ -74,7 +74,7 @@ index 8340d6d25..78eb1b39c 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 79ded224c..cfab578df 100644
+index 3f9ad25cbb..bebf5a6e19 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/Prevent-Pathfinding-out-of-World-Border.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 2a391be28..0586597e7 100644
+index 2a391be28a..0586597e73 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -0,0 +0,0 @@ public abstract class NavigationAbstract {
@@ -17,17 +17,4 @@ index 2a391be28..0586597e7 100644
          if (!this.a()) {
              return null;
          } else if (this.c != null && !this.c.b() && blockposition.equals(this.q)) {
-diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 94d1c2be1..51739e254 100644
---- a/src/main/java/net/minecraft/server/WorldBorder.java
-+++ b/src/main/java/net/minecraft/server/WorldBorder.java
-@@ -0,0 +0,0 @@ public class WorldBorder {
- 
-     public WorldBorder() {}
- 
--    public boolean a(BlockPosition blockposition) {
-+    public final boolean isInBounds(BlockPosition blockposition) { return this.a(blockposition); } public boolean a(BlockPosition blockposition) { // Paper - OBFHELPER
-         return (double) (blockposition.getX() + 1) > this.c() && (double) blockposition.getX() < this.e() && (double) (blockposition.getZ() + 1) > this.d() && (double) blockposition.getZ() < this.f();
-     }
- 
 --

Spigot-Server-Patches/Remove-unused-World-Tile-Entity-List.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 845cabd29..5637c3872 100644
+index 284c29e307..539dfa26a2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/Send-attack-SoundEffects-only-to-players-who-can-see.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 0f8100a05..a30d88af8 100644
+index 0f8100a05e..a30d88af81 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index 0f8100a05..a30d88af8 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c9fc001f2..4d86e7849 100644
+index 41908fa2a9..0389ecadff 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

Spigot-Server-Patches/Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index 099d7218c..108c8c05e 100644
+index 099d7218c9..108c8c05e7 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -75,7 +75,7 @@ index 099d7218c..108c8c05e 100644
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 new file mode 100644
-index 000000000..688b4715e
+index 0000000000..cd6e259239
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -0,0 +0,0 @@
@@ -115,13 +115,13 @@ index 000000000..688b4715e
 +
 +    @Override
 +    protected void shutdown() {
-+        this.server.safeShutdown();
++        this.server.safeShutdown(false);
 +    }
 +
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 000000000..685deaa0e
+index 0000000000..685deaa0e5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +0,0 @@
@@ -143,7 +143,7 @@ index 000000000..685deaa0e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 19e2df309..3d0cb874d 100644
+index 19e2df3098..3d0cb874d7 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -0,0 +0,0 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -185,7 +185,7 @@ index 19e2df309..3d0cb874d 100644
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2d5e340ee..dc6d7b3a2 100644
+index 2d5e340eea..dc6d7b3a27 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -0,0 +0,0 @@ import org.apache.commons.lang3.Validate;
@@ -244,7 +244,7 @@ index 2d5e340ee..dc6d7b3a2 100644
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 46a3f0751..52b2f4874 100644
+index 46a3f07512..52b2f48749 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
@@ -258,7 +258,7 @@ index 46a3f0751..52b2f4874 100644
  
          this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b2aee24e5..2bdbc939e 100644
+index b2aee24e51..2bdbc939e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -0,0 +0,0 @@ import java.util.function.Consumer;
@@ -284,7 +284,7 @@ index b2aee24e5..2bdbc939e 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5203e781e..e3d163ac4 100644
+index 5203e781e3..e3d163ac4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -0,0 +0,0 @@ import java.util.logging.Logger;
@@ -326,7 +326,7 @@ index 5203e781e..e3d163ac4 100644
                  if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index fdf2f075e..000000000
+index fdf2f075e2..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -0,0 +0,0 @@
@@ -403,7 +403,7 @@ index fdf2f075e..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 48d4dc7e2..24f4a16a6 100644
+index 48d4dc7e2c..24f4a16a69 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -0,0 +0,0 @@ import java.util.Collections;
@@ -485,7 +485,7 @@ index 48d4dc7e2..24f4a16a6 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 70f8d4299..449e99d1b 100644
+index 70f8d42992..449e99d1b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -0,0 +0,0 @@ public class ServerShutdownThread extends Thread {
@@ -499,7 +499,7 @@ index 70f8d4299..449e99d1b 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index f239cd623..000000000
+index f239cd6236..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -0,0 +0,0 @@
@@ -560,7 +560,7 @@ index f239cd623..000000000
 -    }
 -}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 490a9acc7..08b6bb7f9 100644
+index 490a9acc70..08b6bb7f97 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -0,0 +0,0 @@

Spigot-Server-Patches/force-entity-dismount-during-teleportation.patch

@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0871e185e..f945a2df4 100644
+index 0871e185e4..f945a2df48 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -72,7 +72,7 @@ index 0871e185e..f945a2df4 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f17c1c54b..e811a2917 100644
+index f17c1c54bf..e811a29175 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -0,0 +0,0 @@ public abstract class EntityHuman extends EntityLiving {
@@ -91,7 +91,7 @@ index f17c1c54b..e811a2917 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bd8385cd5..868b44a4b 100644
+index 2ca490eedc..637141d760 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -112,7 +112,7 @@ index bd8385cd5..868b44a4b 100644
              this.B(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index c71e4dfbe..71ad35f71 100644
+index c71e4dfbea..71ad35f710 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/use-CB-BlockState-implementations-for-captured-block.patch

@@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4d86e7849..3737fca81 100644
+index 0389ecadff..dd74f38038 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose