[ci skip] Enable unpick (#13241)

Author: jpenilla

paper-server/build.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
 
 dependencies {
-    mache("io.papermc:mache:1.21.10+build.7")
+    mache("io.papermc:mache:1.21.10+build.8")
     paperclip("io.papermc:paperclip:3.0.3")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -354,7 +354,7 @@ index 0000000000000000000000000000000000000000..ae2bb9a73106febfe5f0d090abd4252b
 +    }
 +}
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 5e305c9a64e856de70ed787901c01d09e68aa979..ce6f83c83b0235d59b4cadd248ff218985978ab5 100644
+index c4274cbefc8622a2ef841bcd93f8b4d1ab99c963..7e635c5fe5ada10f2cf84830826639da59c4ea4e 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -815,6 +815,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -365,7 +365,7 @@ index 5e305c9a64e856de70ed787901c01d09e68aa979..ce6f83c83b0235d59b4cadd248ff2189
              this.entityTickList
                  .forEach(
                      entity -> {
-@@ -1309,12 +1310,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1313,12 +1314,15 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          entity.totalEntityAge++; // Paper - age-like counter for all entities
          profilerFiller.push(() -> BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()).toString());
          profilerFiller.incrementCounter("tickNonPassenger");
@@ -382,7 +382,7 @@ index 5e305c9a64e856de70ed787901c01d09e68aa979..ce6f83c83b0235d59b4cadd248ff2189
          }
          // Paper start - log detailed entity tick information
          } finally {
-@@ -1325,7 +1329,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1329,7 +1333,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          // Paper end - log detailed entity tick information
      }
 
@@ -391,7 +391,7 @@ index 5e305c9a64e856de70ed787901c01d09e68aa979..ce6f83c83b0235d59b4cadd248ff2189
          if (passengerEntity.isRemoved() || passengerEntity.getVehicle() != ridingEntity) {
              passengerEntity.stopRiding();
          } else if (passengerEntity instanceof Player || this.entityTickList.contains(passengerEntity)) {
-@@ -1335,12 +1339,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1339,12 +1343,21 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
              ProfilerFiller profilerFiller = Profiler.get();
              profilerFiller.push(() -> BuiltInRegistries.ENTITY_TYPE.getKey(passengerEntity.getType()).toString());
              profilerFiller.incrementCounter("tickPassenger");
@@ -464,7 +464,7 @@ index 35e852c4bb5e632ac4e1dc8c9e89f7a366ba7c09..f500e724034b330b590825c07b7dd615
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 1ca1a5b897a9a9375ccc9ca02e7ae77ee7ecddea..fea14f27503369185c867d269c5b8b416ce76eda 100644
+index d5a38c3464539b05453ead3dfd77f4cf4b672617..7ab250350027543adc3926632b0d68a2254c6ad3 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -367,6 +367,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
@@ -523,10 +523,10 @@ index 1ca1a5b897a9a9375ccc9ca02e7ae77ee7ecddea..fea14f27503369185c867d269c5b8b41
              movement = this.maybeBackOffFromEdge(movement, type);
              Vec3 vec3 = this.collide(movement);
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 3de638d16192262f1b172a1f15101daf6a72aaf4..d9c7b7cc01fe4a7d6554e93c939e657994054249 100644
+index 712983c9f55f4a5c120cda8b95ec16ce815fa205..025ef0b83e5d481c8b2ef25206cafd30897caabd 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -3252,6 +3252,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -3255,6 +3255,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
          return false;
      }
 
@@ -542,7 +542,7 @@ index 3de638d16192262f1b172a1f15101daf6a72aaf4..d9c7b7cc01fe4a7d6554e93c939e6579
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
-index 0dd28fec43869ed9926ad5ee4e27be3e796fdbdf..9abea565e4fbef0ffedaec5feeff98f45da4912c 100644
+index 93f56d5d8b4af495c16bf0d953098cde574674d9..f2a321d94ddc9247a3820d42f4a04290ea3ce6f6 100644
 --- a/net/minecraft/world/entity/Mob.java
 +++ b/net/minecraft/world/entity/Mob.java
 @@ -217,6 +217,19 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab
@@ -675,10 +675,10 @@ index c02c27a8cc931b2e5fdb29b7b615e5a292d13bf2..6be576368695c902a0d6da74b1d77d30
      public void tick() {
          if (this.getItem().isEmpty()) {
 diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
-index 3c06efe4b92652562bfcadfdb963c9f380e06de0..d20285db01506dca5b7d54996d2ef5685a1b6519 100644
+index 135d44fe54d45d3e3f4310f603d0f406f3729b6b..d10a407bef7da29a24582e48d8ee599c981384c5 100644
 --- a/net/minecraft/world/entity/npc/Villager.java
 +++ b/net/minecraft/world/entity/npc/Villager.java
-@@ -268,11 +268,35 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -269,11 +269,35 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
          return this.assignProfessionWhenSpawned;
      }
 
@@ -715,16 +715,16 @@ index 3c06efe4b92652562bfcadfdb963c9f380e06de0..d20285db01506dca5b7d54996d2ef568
          profilerFiller.pop();
          if (this.assignProfessionWhenSpawned) {
              this.assignProfessionWhenSpawned = false;
-@@ -296,7 +320,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -297,7 +321,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
              this.lastTradedPlayer = null;
          }
 
 -        if (!this.isNoAi() && this.random.nextInt(100) == 0) {
 +        if (!inactive && !this.isNoAi() && this.random.nextInt(100) == 0) { // Paper - EAR 2
              Raid raidAt = level.getRaidAt(this.blockPosition());
              if (raidAt != null && raidAt.isActive() && !raidAt.isOver()) {
-                 level.broadcastEntityEvent(this, (byte)42);
-@@ -307,6 +331,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+                 level.broadcastEntityEvent(this, EntityEvent.VILLAGER_SWEAT);
+@@ -308,6 +332,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
              this.stopTrading();
          }
 
@@ -754,10 +754,10 @@ index df8e4830f5be29c64ef5e6350a77ad7527e5d612..bbe2773bf789a42cc5cd9f847bdb5c4b
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
-index e9d98083bfc439aa25e679678c2734d3486602fc..af9cf917f20a34479e01b63e686c65b2c783cea1 100644
+index e7c1e11cc6709e34ec2c59d545cfba23c35b829d..145ed3c5f5823c7505767b6d7f4f4d16cc863948 100644
 --- a/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
 +++ b/net/minecraft/world/entity/projectile/FireworkRocketEntity.java
-@@ -107,6 +107,21 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
+@@ -108,6 +108,21 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier {
          return super.shouldRender(x, y, z) && !this.isAttachedToEntity();
      }
 
@@ -818,10 +818,10 @@ index d5cb27dd5bff34890ee431d4b301a0be0167dd37..681dab5e26f8fb359f101f22ac85aac3
 +
  }
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index 14c00ea043524dd1625175982ab2d88512de6f1f..a5a1d84992f3f54bc324a89b7cbff96db85bc701 100644
+index 39947ac2fae9a088d1fbc5c72d6ac520bfb97cf3..439abba4f371343dfd8e5ede7c20050ca049fcd2 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
-@@ -149,6 +149,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -150,6 +150,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
      @Nullable
      public List<net.minecraft.world.entity.item.ItemEntity> captureDrops;
      public final it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<SpawnCategory> ticksPerSpawnCategory = new it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<>();
@@ -835,7 +835,7 @@ index 14c00ea043524dd1625175982ab2d88512de6f1f..a5a1d84992f3f54bc324a89b7cbff96d
      public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot
      // Paper start - add paper world config
 diff --git a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
-index 3b3f9978ed2ef02e37d5e862a7dfbb4a417278ab..e2867d16641ca4c3af98106ee8a90920123d2848 100644
+index 182b803ed17d6bd580f55a6b2ec08001edc533fd..59a002711531f8337a86d85b6e8b11b5fad8ced7 100644
 --- a/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 +++ b/net/minecraft/world/level/block/piston/PistonMovingBlockEntity.java
 @@ -152,6 +152,10 @@ public class PistonMovingBlockEntity extends BlockEntity {

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

@@ -978,7 +978,7 @@ index 0000000000000000000000000000000000000000..ff747a1ecdf3c888bca0d69de4f85dcd
 +    }
 +}
 diff --git a/net/minecraft/world/level/block/RedStoneWireBlock.java b/net/minecraft/world/level/block/RedStoneWireBlock.java
-index c09de58aa5b71b4086a8907c19687f3410f4788c..02de3ec96fa8a3898692eab1dc09334bfa739fa1 100644
+index bd8d8431766fd3fa98e51f4122259ba03fc39272..07d2b9b7ebea9827ef7a535c090b311a3c27d5c6 100644
 --- a/net/minecraft/world/level/block/RedStoneWireBlock.java
 +++ b/net/minecraft/world/level/block/RedStoneWireBlock.java
 @@ -265,6 +265,60 @@ public class RedStoneWireBlock extends Block {
@@ -1070,10 +1070,10 @@ index c09de58aa5b71b4086a8907c19687f3410f4788c..02de3ec96fa8a3898692eab1dc09334b
                      dropResources(state, level, pos);
                      level.removeBlock(pos, false);
 diff --git a/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.java b/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.java
-index 3f6f3ca5a5e412e57fad635f52cd152520d6dca2..abcc144a086a45bf4cfa4d1a33e2ae10952e0da2 100644
+index 8c4d7047ae5b74262d4fb6c46975822953c23938..4edf6e96cd47ab75aedd4baefcf49cd3fae00d7a 100644
 --- a/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.java
 +++ b/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.java
-@@ -44,7 +44,7 @@ public class DefaultRedstoneWireEvaluator extends RedstoneWireEvaluator {
+@@ -45,7 +45,7 @@ public class DefaultRedstoneWireEvaluator extends RedstoneWireEvaluator {
          }
      }
 

paper-server/patches/features/0015-Eigencraft-redstone-implementation.patch

@@ -2326,7 +2326,7 @@ index 0000000000000000000000000000000000000000..298076a0db4e6ee6e4775ac43bf749d9
 +    }
 +}
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index ce6f83c83b0235d59b4cadd248ff218985978ab5..71de8d8920eb33d15a18653dcef370c8e1a43712 100644
+index 7e635c5fe5ada10f2cf84830826639da59c4ea4e..76d063a5bcbfdb6339f0aa1a75c2eb4fdf14c4d4 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -221,6 +221,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -2337,7 +2337,7 @@ index ce6f83c83b0235d59b4cadd248ff218985978ab5..71de8d8920eb33d15a18653dcef370c8
 
      @Override
      public @Nullable LevelChunk getChunkIfLoaded(int x, int z) {
-@@ -2660,6 +2661,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -2664,6 +2665,13 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          return this.debugSynchronizers;
      }
 
@@ -2352,10 +2352,10 @@ index ce6f83c83b0235d59b4cadd248ff218985978ab5..71de8d8920eb33d15a18653dcef370c8
          @Override
          public void onCreated(Entity entity) {
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index a5a1d84992f3f54bc324a89b7cbff96db85bc701..e10ebaa3848d1b99f5a1dbed9a71705a9ba6a27d 100644
+index 439abba4f371343dfd8e5ede7c20050ca049fcd2..96fa7390a4bcfa7bdf2cf5346f2de895ac085203 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
-@@ -2077,6 +2077,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
+@@ -2078,6 +2078,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
          return this.palettedContainerFactory;
      }
 
@@ -2374,7 +2374,7 @@ index a5a1d84992f3f54bc324a89b7cbff96db85bc701..e10ebaa3848d1b99f5a1dbed9a71705a
          NONE("none"),
          BLOCK("block"),
 diff --git a/net/minecraft/world/level/block/RedStoneWireBlock.java b/net/minecraft/world/level/block/RedStoneWireBlock.java
-index 02de3ec96fa8a3898692eab1dc09334bfa739fa1..eff16b8931cba66a7159a313abb2b98cb292a77d 100644
+index 07d2b9b7ebea9827ef7a535c090b311a3c27d5c6..a07d9237d227fe6d419d8a9bc44fc623b244ad3e 100644
 --- a/net/minecraft/world/level/block/RedStoneWireBlock.java
 +++ b/net/minecraft/world/level/block/RedStoneWireBlock.java
 @@ -265,7 +265,7 @@ public class RedStoneWireBlock extends Block {

paper-server/patches/features/0016-Add-Alternate-Current-redstone-implementation.patch

@@ -50,10 +50,10 @@ index a31ef450a0c8f2929065a3c10e47c14bf5eb30f2..d5f3083354d70c4da3c39e2f909ce4c7
          ProfilerFiller profilerFiller = Profiler.get();
          this.server.spark.executeMainThreadTasks(); // Paper - spark
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 71de8d8920eb33d15a18653dcef370c8e1a43712..20b8cbb84805e4259438766a773d65fb37581662 100644
+index 76d063a5bcbfdb6339f0aa1a75c2eb4fdf14c4d4..bf27fe05ee17b2483bb9bfe5a1b52c8d686e3737 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -1378,6 +1378,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1382,6 +1382,26 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
          return !(entity instanceof Player player && (this.server.isUnderSpawnProtection(this, pos, player) || !this.getWorldBorder().isWithinBounds(pos)));
      }
 
@@ -81,10 +81,10 @@ index 71de8d8920eb33d15a18653dcef370c8e1a43712..20b8cbb84805e4259438766a773d65fb
          // Paper start - add close param
          this.save(progress, flush, skipSave, false);
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 66c25f323b9a19e25fcaea782dc72f477fd32629..f91b1781be44626598cb83df24de33ee6468aba4 100644
+index 92551d5228854e24a9b8824c6e79955a2514fd02..691df6f92af8cbb7b5b2dd863678258e78e1884b 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -203,6 +203,7 @@ import org.slf4j.Logger;
+@@ -204,6 +204,7 @@ import org.slf4j.Logger;
 
  public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patches.chunk_system.player.ChunkSystemServerPlayer { // Paper - rewrite chunk system
      private static final Logger LOGGER = LogUtils.getLogger();
@@ -93,18 +93,18 @@ index 66c25f323b9a19e25fcaea782dc72f477fd32629..f91b1781be44626598cb83df24de33ee
      private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
      private static final int FLY_STAT_RECORDING_SPEED = 25;
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 8a7d31f1ad8e947fa9d198cf7cd1355b4feb3731..18c5a51f05df536e5778f19b212fb63e09121fce 100644
+index 51e8abb15392772ad53ea1da80127d4e61a21e00..410be367549a345677c94e9f8d7db0b7fffbf073 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
-@@ -405,6 +405,7 @@ public abstract class PlayerList {
+@@ -406,6 +406,7 @@ public abstract class PlayerList {
 
      protected void save(ServerPlayer player) {
          if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
 +        player.lastSave = MinecraftServer.currentTick; // Paper - Incremental chunk and player saving
          this.playerIo.save(player);
          ServerStatsCounter serverStatsCounter = player.getStats(); // CraftBukkit
          if (serverStatsCounter != null) {
-@@ -937,9 +938,23 @@ public abstract class PlayerList {
+@@ -939,9 +940,23 @@ public abstract class PlayerList {
      }
 
      public void saveAll() {

paper-server/patches/features/0021-Incremental-chunk-and-player-saving.patch

@@ -892,7 +892,7 @@ index 6e9325f0800a35637fdec5edb8a514ea03741762..066faa704338c573472381e1ebd063e0
                  BlockPos target = path.getTarget();
                  Optional<Holder<PoiType>> type = poiManager.getType(target);
 diff --git a/net/minecraft/world/entity/ai/village/poi/PoiManager.java b/net/minecraft/world/entity/ai/village/poi/PoiManager.java
-index 6e5b4592829006d0439c9d4d6e47a43d524e8e10..b47961b11e3a7fa1a8fb9d085eca3b7b621b5b61 100644
+index f67fbc8b6f5f0374f41180ec36de355c7a538aca..179e6d26f85ca7c4812e855dd671d8e92067292b 100644
 --- a/net/minecraft/world/entity/ai/village/poi/PoiManager.java
 +++ b/net/minecraft/world/entity/ai/village/poi/PoiManager.java
 @@ -257,36 +257,47 @@ public class PoiManager extends SectionStorage<PoiSection, PoiSection.Packed> im
@@ -980,7 +980,7 @@ index 6e5b4592829006d0439c9d4d6e47a43d524e8e10..b47961b11e3a7fa1a8fb9d085eca3b7b
 
      public boolean release(BlockPos pos) {
 diff --git a/net/minecraft/world/entity/ai/village/poi/PoiSection.java b/net/minecraft/world/entity/ai/village/poi/PoiSection.java
-index a391aa269e935ca003c6f0ba447ea7eb29834a7e..e1f2badc67f42a0eba444ad8c9f5bfbb55e92298 100644
+index bba84a390e46a1288cc3cb36ba01941e47a1fec2..df5799fd48b509dc3ba02a21ad39a5add9b114e2 100644
 --- a/net/minecraft/world/entity/ai/village/poi/PoiSection.java
 +++ b/net/minecraft/world/entity/ai/village/poi/PoiSection.java
 @@ -28,7 +28,7 @@ import org.slf4j.Logger;
@@ -993,7 +993,7 @@ index a391aa269e935ca003c6f0ba447ea7eb29834a7e..e1f2badc67f42a0eba444ad8c9f5bfbb
      private boolean isValid;
 
 diff --git a/net/minecraft/world/level/chunk/storage/SectionStorage.java b/net/minecraft/world/level/chunk/storage/SectionStorage.java
-index 2e1a021893444605f85b9a9473cb09ecb7e69c17..c084fd564256d822e1467f752b4951fcb99bf427 100644
+index afac559b3c38c4a175070ed823dc8f2c34f4a004..1fc7d8518f7c8d69c2520dbc044a3c202d008756 100644
 --- a/net/minecraft/world/level/chunk/storage/SectionStorage.java
 +++ b/net/minecraft/world/level/chunk/storage/SectionStorage.java
 @@ -131,11 +131,11 @@ public class SectionStorage<R, P> implements AutoCloseable, ca.spottedleaf.moonr
@@ -1011,10 +1011,10 @@ index 2e1a021893444605f85b9a9473cb09ecb7e69c17..c084fd564256d822e1467f752b4951fc
              return Optional.empty();
          } else {
 diff --git a/net/minecraft/world/level/portal/PortalForcer.java b/net/minecraft/world/level/portal/PortalForcer.java
-index aa31439af40e13006eff0036cef2905ac59390b3..b84d658bb06ab7b51cfc18d7405238554f65d2a5 100644
+index 0556076d42cff262e8148078410fe6cfa4d8b14b..39418746d5818ce136e79aa1b57b1e6e44e17c37 100644
 --- a/net/minecraft/world/level/portal/PortalForcer.java
 +++ b/net/minecraft/world/level/portal/PortalForcer.java
-@@ -48,13 +48,38 @@ public class PortalForcer {
+@@ -49,13 +49,38 @@ public class PortalForcer {
          PoiManager poiManager = this.level.getPoiManager();
          // int i = isNether ? 16 : 128;
          // CraftBukkit end