fix some feature patches

Author: Machine-Maker

paper-server/patches/features/0003-Entity-Activation-Range-2.0.patch

@@ -476,7 +476,7 @@ index bf44f6b9c8710e0c9a85d44f6217501abc98a7b1..bfd904e468bbf2cc1a5b3353d3a69ad5
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 2002a211ada76f32fc2c66b51acbef1690278d0a..a8eaccde3ec9ed912cbc6df0b29e9f8136a46578 100644
+index ae9f61beeef828bccbf22160b9f8eaa7be2f87f3..cf6fa8a91e03cd79da20b072f72b29d1ddbb784d 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -388,6 +388,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -554,10 +554,10 @@ index 02ba7b842c77cdf843e3599b34fe1efef9a47d75..a9133d3918edb232df109ac5c3cd9951
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
-index b50c13d2788216a85c952c3353581e403ec71b99..c86bf615421c7aef525b52389232c355e68efb7a 100644
+index 2d25333ac207bff79863ff52e04e9aa9ea5c1279..c9b7f678dd0184ba852f511e5bb1c506959cf7e4 100644
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
-@@ -206,6 +206,19 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
+@@ -204,6 +204,19 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
          return this.lookControl;
      }
 
@@ -830,7 +830,7 @@ index 6162415095b030b4cc47364c56fa66236b3b0535..a56d9cdeb6589a053ffaaf2cd599a98a
 +
  }
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index 1ad1f9f790c07c50f7518837c4116bc70f99b8a6..040f4043ac795b8586dc0bff920faae049060074 100644
+index 6db8e70a4d35540c9ef4b66457c359f4ea33a312..58057620891e9f68330770e434594621bde3883f 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
 @@ -153,6 +153,12 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl

paper-server/patches/features/0004-Anti-Xray.patch

@@ -157,10 +157,10 @@ index e26239bc6185d81e2ce82579843a4017d7c10943..e7795a62e9e3ffdba21bf42f2f107b60
          this.levelStorageAccess = levelStorageAccess;
          this.uuid = org.bukkit.craftbukkit.util.WorldUUID.getOrCreate(levelStorageAccess.levelDirectory.path().toFile());
 diff --git a/net/minecraft/server/level/ServerPlayerGameMode.java b/net/minecraft/server/level/ServerPlayerGameMode.java
-index ba818a3a09b09050a4373bee75536029bf85102e..830eaede4ffbd70324f9d2293f0e73341c8534a2 100644
+index b5378d6d73b6dab56bf664024f3f82496e9a9487..b604cba2490a747661d6819251bc3b9a1d35c7d4 100644
 --- a/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/net/minecraft/server/level/ServerPlayerGameMode.java
-@@ -295,6 +295,7 @@ public class ServerPlayerGameMode {
+@@ -296,6 +296,7 @@ public class ServerPlayerGameMode {
                  org.bukkit.craftbukkit.event.CraftEventFactory.callBlockDamageAbortEvent(this.player, pos, this.player.getInventory().getSelectedItem()); // CraftBukkit
              }
          }
@@ -200,18 +200,18 @@ index 8b5a8929e7ca7d2e9534435308bdc7f7352791f9..69ee33bdd9ce8296b5601ee51e5f4940
          }
          // Paper end - Send empty chunk
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index 040f4043ac795b8586dc0bff920faae049060074..e0f6fd94e628973ba9b99fbdf1e1bfc2e68b8f6d 100644
+index 58057620891e9f68330770e434594621bde3883f..699a1f6266d474ae7f1d6f8b9faac2d5489d14ea 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
-@@ -168,6 +168,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
-     }
+@@ -169,6 +169,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
      // Paper end - add paper world config
 
+     public static @Nullable BlockPos lastPhysicsProblem; // Spigot
 +    public final io.papermc.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
-     public static BlockPos lastPhysicsProblem; // Spigot
      private int tileTickPosition;
      public final Map<ServerExplosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
-@@ -212,7 +213,8 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
+     public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Faster redstone torch rapid clock removal; Move from Map in BlockRedstoneTorch to here
+@@ -211,7 +212,8 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
          org.bukkit.generator.BiomeProvider biomeProvider, // CraftBukkit
          org.bukkit.World.Environment env, // CraftBukkit
          java.util.function.Function<org.spigotmc.SpigotWorldConfig, // Spigot - create per world config
@@ -221,15 +221,15 @@ index 040f4043ac795b8586dc0bff920faae049060074..e0f6fd94e628973ba9b99fbdf1e1bfc2
      ) {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) levelData).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
-@@ -291,6 +293,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
+@@ -288,6 +290,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
              public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {}
          });
          // CraftBukkit end
 +        this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new io.papermc.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : io.papermc.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
      }
 
      // Paper start - Cancel hit for vanished players
-@@ -496,6 +499,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
+@@ -493,6 +496,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
                  snapshot.setFlags(flags); // Paper - always set the flag of the most recent call to mitigate issues with multiple update at the same pos with different flags
              }
              BlockState blockState = chunkAt.setBlockState(pos, state, flags);
@@ -238,7 +238,7 @@ index 040f4043ac795b8586dc0bff920faae049060074..e0f6fd94e628973ba9b99fbdf1e1bfc2
              if (blockState == null) {
                  // CraftBukkit start - remove blockstate if failed (or the same)
 diff --git a/net/minecraft/world/level/chunk/ChunkAccess.java b/net/minecraft/world/level/chunk/ChunkAccess.java
-index d8d8d295e7fcd453b02d487ff6586167cb3019f8..d7d9bea40e2e7a18c447aed0798e91768b6acd63 100644
+index c378f9e226df80ab0d4ebd06ae54ce556d0d94e7..97231db28146df56c727c9765f36277634d59a64 100644
 --- a/net/minecraft/world/level/chunk/ChunkAccess.java
 +++ b/net/minecraft/world/level/chunk/ChunkAccess.java
 @@ -114,14 +114,14 @@ public abstract class ChunkAccess implements BiomeManager.NoiseBiomeSource, Ligh
@@ -260,7 +260,7 @@ index d8d8d295e7fcd453b02d487ff6586167cb3019f8..d7d9bea40e2e7a18c447aed0798e9176
          }
      }
 diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
-index e36a89f72fa09cc1a163fc35d7aeb5872f771032..493b0ed0f80521be8f38b31596d47f93712d8037 100644
+index 8fa871512ad52c345f15b1f5fb1baf54bb2ec93b..08e2442f6965cc6eaab67bdf9340a5152c08db2a 100644
 --- a/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -110,7 +110,7 @@ public class LevelChunk extends ChunkAccess {