Update to Minecraft 1.18.2

By: md_5 <git@md-5.net>
2022-03-01 02:00:00 +11:00
parent bd40300a4f
commit 9ee989ea81
184 changed files with 1785 additions and 1785 deletions
--- a/paper-server/nms-patches/net/minecraft/server/level/ChunkMapDistance.patch
+++ b/paper-server/nms-patches/net/minecraft/server/level/ChunkMapDistance.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ChunkMapDistance.java
 +++ b/net/minecraft/server/level/ChunkMapDistance.java
-@@ -125,10 +125,25 @@
+@@ -126,10 +126,25 @@
         }
 
         if (!this.chunksToUpdateFutures.isEmpty()) {
@@ -29,7 +29,7 @@
             return true;
         } else {
             if (!this.ticketsToRelease.isEmpty()) {
-@@ -164,7 +179,7 @@
+@@ -165,7 +180,7 @@
         }
     }
 
@@ -38,7 +38,7 @@
         ArraySetSorted<Ticket<?>> arraysetsorted = this.getTickets(i);
         int j = getTicketLevelAt(arraysetsorted);
         Ticket<?> ticket1 = (Ticket) arraysetsorted.addOrGet(ticket);
-@@ -174,13 +189,15 @@
+@@ -175,13 +190,15 @@
             this.ticketTracker.update(i, ticket.getTicketLevel(), true);
         }
 
@@ -56,7 +56,7 @@
         }
 
         if (arraysetsorted.isEmpty()) {
-@@ -188,6 +205,7 @@
+@@ -189,6 +206,7 @@
         }
 
         this.ticketTracker.update(i, getTicketLevelAt(arraysetsorted), false);
@@ -64,7 +64,7 @@
     }
 
     public <T> void addTicket(TicketType<T> tickettype, ChunkCoordIntPair chunkcoordintpair, int i, T t0) {
-@@ -201,19 +219,33 @@
+@@ -202,19 +220,33 @@
     }
 
     public <T> void addRegionTicket(TicketType<T> tickettype, ChunkCoordIntPair chunkcoordintpair, int i, T t0) {
@@ -100,7 +100,7 @@
     }
 
     private ArraySetSorted<Ticket<?>> getTickets(long i) {
-@@ -252,6 +284,7 @@
+@@ -253,6 +285,7 @@
         ChunkCoordIntPair chunkcoordintpair = sectionposition.chunk();
         long i = chunkcoordintpair.toLong();
         ObjectSet<EntityPlayer> objectset = (ObjectSet) this.playersPerChunk.get(i);
@@ -108,8 +108,8 @@
 
         objectset.remove(entityplayer);
         if (objectset.isEmpty()) {
-@@ -347,6 +380,26 @@
-         return this.tickingTicketsTracker;
+@@ -382,6 +415,26 @@
+         return !this.tickets.isEmpty();
     }
 
 +    // CraftBukkit start
--- a/paper-server/nms-patches/net/minecraft/server/level/ChunkProviderServer.patch
+++ b/paper-server/nms-patches/net/minecraft/server/level/ChunkProviderServer.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ChunkProviderServer.java
 +++ b/net/minecraft/server/level/ChunkProviderServer.java
-@@ -86,6 +86,24 @@
+@@ -83,6 +83,24 @@
         this.clearCache();
     }
 
@@ -18,14 +18,14 @@
 +        if (chunk == null) {
 +            return null;
 +        }
-+        return chunk.getFullChunkUnchecked();
+        return chunk.getFullChunk();
 +    }
 +    // CraftBukkit end
 +
     @Override
     public LightEngineThreaded getLightEngine() {
         return this.lightEngine;
-@@ -130,7 +148,7 @@
+@@ -127,7 +145,7 @@
             for (int l = 0; l < 4; ++l) {
                 if (k == this.lastChunkPos[l] && chunkstatus == this.lastChunkStatus[l]) {
                     ichunkaccess = this.lastChunk[l];
@@ -34,7 +34,7 @@
                         return ichunkaccess;
                     }
                 }
-@@ -178,12 +196,12 @@
+@@ -175,12 +193,12 @@
             if (playerchunk == null) {
                 return null;
             } else {
@@ -49,7 +49,7 @@
 
                     if (ichunkaccess1 != null) {
                         this.storeInCache(k, ichunkaccess1, ChunkStatus.FULL);
-@@ -231,7 +249,15 @@
+@@ -228,7 +246,15 @@
         int l = 33 + ChunkStatus.getDistance(chunkstatus);
         PlayerChunk playerchunk = this.getVisibleChunkIfPresent(k);
 
@@ -66,7 +66,7 @@
             this.distanceManager.addTicket(TicketType.UNKNOWN, chunkcoordintpair, l, chunkcoordintpair);
             if (this.chunkAbsent(playerchunk, l)) {
                 GameProfilerFiller gameprofilerfiller = this.level.getProfiler();
-@@ -250,7 +276,7 @@
+@@ -247,7 +273,7 @@
     }
 
     private boolean chunkAbsent(@Nullable PlayerChunk playerchunk, int i) {
@@ -75,7 +75,7 @@
     }
 
     @Override
-@@ -317,7 +343,7 @@
+@@ -314,7 +340,7 @@
         } else if (!this.level.shouldTickBlocksAt(i)) {
             return false;
         } else {
@@ -84,7 +84,7 @@
 
             return either != null && either.left().isPresent();
         }
-@@ -330,11 +356,31 @@
+@@ -327,11 +353,31 @@
 
     @Override
     public void close() throws IOException {
@@ -115,7 +115,7 @@
 +    // CraftBukkit end
 +
     @Override
-     public void tick(BooleanSupplier booleansupplier) {
+     public void tick(BooleanSupplier booleansupplier, boolean flag) {
         this.level.getProfiler().push("purge");
@@ -363,7 +409,7 @@
 
@@ -135,7 +135,7 @@
 
             Collections.shuffle(list);
             Iterator iterator1 = list.iterator();
-@@ -579,18 +625,26 @@
+@@ -581,18 +627,26 @@
         }
 
         @Override
@@ -164,7 +164,7 @@
         final Chunk chunk;
         final PlayerChunk holder;
 
-@@ -606,5 +660,7 @@
+@@ -608,5 +662,7 @@
         public PlayerChunk holder() {
             return this.holder;
         }
--- a/paper-server/nms-patches/net/minecraft/server/level/EntityPlayer.patch
+++ b/paper-server/nms-patches/net/minecraft/server/level/EntityPlayer.patch
@@ -1,8 +1,8 @@
 --- a/net/minecraft/server/level/EntityPlayer.java
 +++ b/net/minecraft/server/level/EntityPlayer.java
@@ -140,6 +140,33 @@
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
+ import net.minecraft.world.scores.criteria.IScoreboardCriteria;
+ import org.slf4j.Logger;
 
 +// CraftBukkit start
 +import net.minecraft.nbt.NBTBase;
@@ -33,7 +33,7 @@
 +
 public class EntityPlayer extends EntityHuman {
 
-     private static final Logger LOGGER = LogManager.getLogger();
+     private static final Logger LOGGER = LogUtils.getLogger();
@@ -194,6 +221,20 @@
     public int latency;
     public boolean wonGame;
@@ -113,7 +113,7 @@
             int i = Math.max(0, this.server.getSpawnRadius(worldserver));
             int j = MathHelper.floor(worldserver.getWorldBorder().getDistanceToBorder((double) blockposition.getX(), (double) blockposition.getZ()));
 
-@@ -319,11 +404,20 @@
+@@ -319,17 +404,26 @@
         if (nbttagcompound.contains("recipeBook", 10)) {
             this.recipeBook.fromNbt(nbttagcompound.getCompound("recipeBook"), this.server.getRecipeManager());
         }
@@ -134,6 +134,13 @@
         if (nbttagcompound.contains("SpawnX", 99) && nbttagcompound.contains("SpawnY", 99) && nbttagcompound.contains("SpawnZ", 99)) {
             this.respawnPosition = new BlockPosition(nbttagcompound.getInt("SpawnX"), nbttagcompound.getInt("SpawnY"), nbttagcompound.getInt("SpawnZ"));
             this.respawnForced = nbttagcompound.getBoolean("SpawnForced");
+             this.respawnAngle = nbttagcompound.getFloat("SpawnAngle");
+             if (nbttagcompound.contains("SpawnDimension")) {
+-                DataResult dataresult = World.RESOURCE_KEY_CODEC.parse(DynamicOpsNBT.INSTANCE, nbttagcompound.get("SpawnDimension"));
+                DataResult<ResourceKey<World>> dataresult = World.RESOURCE_KEY_CODEC.parse(DynamicOpsNBT.INSTANCE, nbttagcompound.get("SpawnDimension")); // CraftBukkit - decompile error
+                 Logger logger = EntityPlayer.LOGGER;
+ 
+                 Objects.requireNonNull(logger);
@@ -356,7 +450,20 @@
         Entity entity = this.getRootVehicle();
         Entity entity1 = this.getVehicle();
@@ -414,7 +421,7 @@
 +            /*
             WorldData worlddata = worldserver.getLevelData();
 
-             this.connection.send(new PacketPlayOutRespawn(worldserver.dimensionType(), worldserver.dimension(), BiomeManager.obfuscateSeed(worldserver.getSeed()), this.gameMode.getGameModeForPlayer(), this.gameMode.getPreviousGameModeForPlayer(), worldserver.isDebug(), worldserver.isFlat(), true));
+             this.connection.send(new PacketPlayOutRespawn(worldserver.dimensionTypeRegistration(), worldserver.dimension(), BiomeManager.obfuscateSeed(worldserver.getSeed()), this.gameMode.getGameModeForPlayer(), this.gameMode.getPreviousGameModeForPlayer(), worldserver.isDebug(), worldserver.isFlat(), true));
@@ -780,22 +993,52 @@
             playerlist.sendPlayerPermissionLevel(this);
             worldserver1.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
@@ -454,7 +461,7 @@
 +            if (true) { // CraftBukkit
 +                this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
 +
-+                this.connection.send(new PacketPlayOutRespawn(worldserver.dimensionType(), worldserver.dimension(), BiomeManager.obfuscateSeed(worldserver.getSeed()), this.gameMode.getGameModeForPlayer(), this.gameMode.getPreviousGameModeForPlayer(), worldserver.isDebug(), worldserver.isFlat(), true));
+                this.connection.send(new PacketPlayOutRespawn(worldserver.dimensionTypeRegistration(), worldserver.dimension(), BiomeManager.obfuscateSeed(worldserver.getSeed()), this.gameMode.getGameModeForPlayer(), this.gameMode.getPreviousGameModeForPlayer(), worldserver.isDebug(), worldserver.isFlat(), true));
 +                this.connection.send(new PacketPlayOutServerDifficulty(this.level.getDifficulty(), this.level.getLevelData().isDifficultyLocked()));
 +                PlayerList playerlist = this.server.getPlayerList();
 +
--- a/paper-server/nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch
+++ b/paper-server/nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch
@@ -1,8 +1,8 @@
 --- a/net/minecraft/server/level/EntityTrackerEntry.java
 +++ b/net/minecraft/server/level/EntityTrackerEntry.java
@@ -40,6 +40,12 @@
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
+ import net.minecraft.world.phys.Vec3D;
+ import org.slf4j.Logger;
 
 +// CraftBukkit start
 +import net.minecraft.server.network.ServerPlayerConnection;
@@ -12,7 +12,7 @@
 +
 public class EntityTrackerEntry {
 
-     private static final Logger LOGGER = LogManager.getLogger();
+     private static final Logger LOGGER = LogUtils.getLogger();
@@ -61,8 +67,12 @@
     private List<Entity> lastPassengers;
     private boolean wasRiding;
--- a/paper-server/nms-patches/net/minecraft/server/level/PlayerChunk.patch
+++ b/paper-server/nms-patches/net/minecraft/server/level/PlayerChunk.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/PlayerChunk.java
 +++ b/net/minecraft/server/level/PlayerChunk.java
-@@ -35,6 +35,10 @@
+@@ -37,6 +37,10 @@
 import net.minecraft.world.level.chunk.ProtoChunkExtension;
 import net.minecraft.world.level.lighting.LightEngine;
 
@@ -11,7 +11,7 @@
 public class PlayerChunk {
 
     public static final Either<IChunkAccess, PlayerChunk.Failure> UNLOADED_CHUNK = Either.right(PlayerChunk.Failure.UNLOADED);
-@@ -72,11 +76,11 @@
+@@ -75,11 +79,11 @@
         this.fullChunkFuture = PlayerChunk.UNLOADED_LEVEL_CHUNK_FUTURE;
         this.tickingChunkFuture = PlayerChunk.UNLOADED_LEVEL_CHUNK_FUTURE;
         this.entityTickingChunkFuture = PlayerChunk.UNLOADED_LEVEL_CHUNK_FUTURE;
@@ -25,27 +25,7 @@
         this.pos = chunkcoordintpair;
         this.levelHeightAccessor = levelheightaccessor;
         this.lightEngine = lightengine;
-@@ -89,6 +93,19 @@
-         this.changedBlocksPerSection = new ShortSet[levelheightaccessor.getSectionsCount()];
-     }
- 
-+    // CraftBukkit start
-+    public Chunk getFullChunk() {
-+        if (!getFullChunkStatus(this.oldTicketLevel).isOrAfter(PlayerChunk.State.BORDER)) return null; // note: using oldTicketLevel for isLoaded checks
-+        return this.getFullChunkUnchecked();
-+    }
-+
-+    public Chunk getFullChunkUnchecked() {
-+        CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> statusFuture = this.getFutureIfPresentUnchecked(ChunkStatus.FULL);
-+        Either<IChunkAccess, PlayerChunk.Failure> either = (Either<IChunkAccess, PlayerChunk.Failure>) statusFuture.getNow(null);
-+        return (either == null) ? null : (Chunk) either.left().orElse(null);
-+    }
-+    // CraftBukkit end
-+
-     public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getFutureIfPresentUnchecked(ChunkStatus chunkstatus) {
-         CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = (CompletableFuture) this.futures.get(chunkstatus.getIndex());
- 
-@@ -114,9 +131,9 @@
+@@ -117,17 +121,17 @@
     @Nullable
     public Chunk getTickingChunk() {
         CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture = this.getTickingChunkFuture();
@@ -57,7 +37,17 @@
     }
 
     @Nullable
-@@ -161,6 +178,7 @@
+     public Chunk getFullChunk() {
+         CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture = this.getFullChunkFuture();
+-        Either<Chunk, PlayerChunk.Failure> either = (Either) completablefuture.getNow((Object) null);
+        Either<Chunk, PlayerChunk.Failure> either = (Either) completablefuture.getNow(null); // CraftBukkit - decompile error
+ 
+-        return either == null ? null : (Chunk) either.left().orElse((Object) null);
+        return either == null ? null : (Chunk) either.left().orElse(null); // CraftBukkit - decompile error
+     }
+ 
+     @Nullable
+@@ -172,6 +176,7 @@
         if (chunk != null) {
             int i = this.levelHeightAccessor.getSectionIndex(blockposition.getY());
 
@@ -65,16 +55,7 @@
             if (this.changedBlocksPerSection[i] == null) {
                 this.hasChangedSections = true;
                 this.changedBlocksPerSection[i] = new ShortOpenHashSet();
-@@ -271,7 +289,7 @@
-         CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = (CompletableFuture) this.futures.get(i);
- 
-         if (completablefuture != null) {
-            Either<IChunkAccess, PlayerChunk.Failure> either = (Either) completablefuture.getNow((Object) null);
-+            Either<IChunkAccess, PlayerChunk.Failure> either = (Either) completablefuture.getNow(null); // CraftBukkit - decompile error
-             boolean flag = either != null && either.right().isPresent();
- 
-             if (!flag) {
-@@ -348,7 +366,7 @@
+@@ -368,7 +373,7 @@
         this.pendingFullStateConfirmation = completablefuture1;
         completablefuture.thenAccept((either) -> {
             either.ifLeft((chunk) -> {
@@ -83,7 +64,7 @@
             });
         });
     }
-@@ -365,6 +383,30 @@
+@@ -385,6 +390,30 @@
         boolean flag1 = this.ticketLevel <= PlayerChunkMap.MAX_CHUNK_DISTANCE;
         PlayerChunk.State playerchunk_state = getFullChunkStatus(this.oldTicketLevel);
         PlayerChunk.State playerchunk_state1 = getFullChunkStatus(this.ticketLevel);
@@ -103,7 +84,7 @@
 +                }
 +            }).exceptionally((throwable) -> {
 +                // ensure exceptions are printed, by default this is not the case
-+                MinecraftServer.LOGGER.fatal("Failed to schedule unload callback for chunk " + PlayerChunk.this.pos, throwable);
+                MinecraftServer.LOGGER.error("Failed to schedule unload callback for chunk " + PlayerChunk.this.pos, throwable);
 +                return null;
 +            });
 +
@@ -114,7 +95,7 @@
 
         if (flag) {
             Either<IChunkAccess, PlayerChunk.Failure> either = Either.right(new PlayerChunk.Failure() {
-@@ -435,6 +477,26 @@
+@@ -455,6 +484,26 @@
 
         this.onLevelChange.onLevelChange(this.pos, this::getQueueLevel, this.ticketLevel, this::setQueueLevel);
         this.oldTicketLevel = this.ticketLevel;
@@ -130,7 +111,7 @@
 +                }
 +            }).exceptionally((throwable) -> {
 +                // ensure exceptions are printed, by default this is not the case
-+                MinecraftServer.LOGGER.fatal("Failed to schedule load callback for chunk " + PlayerChunk.this.pos, throwable);
+                MinecraftServer.LOGGER.error("Failed to schedule load callback for chunk " + PlayerChunk.this.pos, throwable);
 +                return null;
 +            });
 +
--- a/paper-server/nms-patches/net/minecraft/server/level/PlayerChunkMap.patch
+++ b/paper-server/nms-patches/net/minecraft/server/level/PlayerChunkMap.patch
@@ -1,8 +1,8 @@
 --- a/net/minecraft/server/level/PlayerChunkMap.java
 +++ b/net/minecraft/server/level/PlayerChunkMap.java
-@@ -96,6 +96,11 @@
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
+@@ -98,6 +98,11 @@
+ import org.apache.commons.lang3.mutable.MutableObject;
+ import org.slf4j.Logger;
 
 +// CraftBukkit start
 +import net.minecraft.world.level.levelgen.GeneratorSettings;
@@ -12,7 +12,7 @@
 public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.e {
 
     private static final byte CHUNK_TYPE_REPLACEABLE = -1;
-@@ -135,6 +140,27 @@
+@@ -139,6 +144,27 @@
     private final Queue<Runnable> unloadQueue;
     int viewDistance;
 
@@ -40,7 +40,7 @@
     public PlayerChunkMap(WorldServer worldserver, Convertable.ConversionSession convertable_conversionsession, DataFixer datafixer, DefinedStructureManager definedstructuremanager, Executor executor, IAsyncTaskHandler<Runnable> iasynctaskhandler, ILightAccess ilightaccess, ChunkGenerator chunkgenerator, WorldLoadListener worldloadlistener, ChunkStatusUpdateListener chunkstatusupdatelistener, Supplier<WorldPersistentData> supplier, int i, boolean flag) {
         super(convertable_conversionsession.getDimensionPath(worldserver.dimension()).resolve("region"), datafixer, flag);
         this.visibleChunkMap = this.updatingChunkMap.clone();
-@@ -291,9 +317,12 @@
+@@ -296,9 +322,12 @@
         CompletableFuture<List<Either<IChunkAccess, PlayerChunk.Failure>>> completablefuture1 = SystemUtils.sequence(list);
         CompletableFuture<Either<List<IChunkAccess>, PlayerChunk.Failure>> completablefuture2 = completablefuture1.thenApply((list2) -> {
             List<IChunkAccess> list3 = Lists.newArrayList();
@@ -53,9 +53,9 @@
 +                final int l1 = cnt;
 +                // CraftBukkit end
                 final Either<IChunkAccess, PlayerChunk.Failure> either = (Either) iterator.next();
-                 Optional<IChunkAccess> optional = either.left();
 
-@@ -463,7 +492,7 @@
+                 if (either == null) {
+@@ -503,7 +532,7 @@
 
     private void scheduleUnload(long i, PlayerChunk playerchunk) {
         CompletableFuture<IChunkAccess> completablefuture = playerchunk.getChunkToSave();
@@ -64,7 +64,7 @@
             CompletableFuture<IChunkAccess> completablefuture1 = playerchunk.getChunkToSave();
 
             if (completablefuture1 != completablefuture) {
-@@ -642,7 +671,21 @@
+@@ -683,7 +712,21 @@
 
     private static void postLoadProtoChunk(WorldServer worldserver, List<NBTTagCompound> list) {
         if (!list.isEmpty()) {
@@ -87,7 +87,7 @@
         }
 
     }
-@@ -740,7 +783,7 @@
+@@ -782,7 +825,7 @@
         if (!playerchunk.wasAccessibleSinceLastSave()) {
             return false;
         } else {
@@ -96,7 +96,7 @@
 
             if (!(ichunkaccess instanceof ProtoChunkExtension) && !(ichunkaccess instanceof Chunk)) {
                 return false;
-@@ -890,7 +933,8 @@
+@@ -944,7 +987,8 @@
                 return ichunkaccess instanceof Chunk ? Optional.of((Chunk) ichunkaccess) : Optional.empty();
             });
 
@@ -106,7 +106,7 @@
                 return chunk.getBlockEntities().size();
             }).orElse(0), tickingtracker.getTicketDebugString(i), tickingtracker.getLevel(i), optional1.map((chunk) -> {
                 return chunk.getBlockTicks().count();
-@@ -903,7 +947,7 @@
+@@ -957,7 +1001,7 @@
 
     private static String printFuture(CompletableFuture<Either<Chunk, PlayerChunk.Failure>> completablefuture) {
         try {
@@ -115,7 +115,7 @@
 
             return either != null ? (String) either.map((chunk) -> {
                 return "done";
-@@ -921,7 +965,7 @@
+@@ -975,7 +1019,7 @@
     private NBTTagCompound readChunk(ChunkCoordIntPair chunkcoordintpair) throws IOException {
         NBTTagCompound nbttagcompound = this.read(chunkcoordintpair);
 
@@ -124,7 +124,7 @@
     }
 
     boolean anyPlayerCloseEnoughForSpawning(ChunkCoordIntPair chunkcoordintpair) {
-@@ -1342,7 +1386,7 @@
+@@ -1396,7 +1440,7 @@
         public final Set<ServerPlayerConnection> seenBy = Sets.newIdentityHashSet();
 
         public EntityTracker(Entity entity, int i, int j, boolean flag) {
@@ -133,7 +133,7 @@
             this.entity = entity;
             this.range = i;
             this.lastSectionPos = SectionPosition.of(entity);
-@@ -1395,12 +1439,17 @@
+@@ -1449,12 +1493,17 @@
 
         public void updatePlayer(EntityPlayer entityplayer) {
             if (entityplayer != this.entity) {
--- a/paper-server/nms-patches/net/minecraft/server/level/PlayerInteractManager.patch
+++ b/paper-server/nms-patches/net/minecraft/server/level/PlayerInteractManager.patch
@@ -1,8 +1,8 @@
 --- a/net/minecraft/server/level/PlayerInteractManager.java
 +++ b/net/minecraft/server/level/PlayerInteractManager.java
-@@ -24,6 +24,27 @@
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
+@@ -26,6 +26,27 @@
+ import net.minecraft.world.phys.MovingObjectPositionBlock;
+ import org.slf4j.Logger;
 
 +// CraftBukkit start
 +import java.util.ArrayList;
@@ -27,8 +27,8 @@
 +
 public class PlayerInteractManager {
 
-     private static final Logger LOGGER = LogManager.getLogger();
-@@ -54,6 +75,13 @@
+     private static final Logger LOGGER = LogUtils.getLogger();
+@@ -56,6 +77,13 @@
         if (enumgamemode == this.gameModeForPlayer) {
             return false;
         } else {
@@ -42,7 +42,7 @@
             this.setGameModeForPlayer(enumgamemode, this.gameModeForPlayer);
             return true;
         }
-@@ -64,7 +92,7 @@
+@@ -66,7 +94,7 @@
         this.gameModeForPlayer = enumgamemode;
         enumgamemode.updatePlayerAbilities(this.player.getAbilities());
         this.player.onUpdateAbilities();
@@ -51,7 +51,7 @@
         this.level.updateSleepingPlayerList();
     }
 
-@@ -86,7 +114,7 @@
+@@ -88,7 +116,7 @@
     }
 
     public void tick() {
@@ -60,7 +60,7 @@
         IBlockData iblockdata;
 
         if (this.hasDelayedDestroy) {
-@@ -142,10 +170,32 @@
+@@ -152,10 +180,32 @@
 
             if (packetplayinblockdig_enumplayerdigtype == PacketPlayInBlockDig.EnumPlayerDigType.START_DESTROY_BLOCK) {
                 if (!this.level.mayInteract(this.player, blockposition)) {
@@ -93,11 +93,11 @@
                 if (this.isCreative()) {
                     this.destroyAndAck(blockposition, packetplayinblockdig_enumplayerdigtype, "creative destroy");
                     return;
-@@ -160,11 +210,43 @@
+@@ -170,11 +220,43 @@
                 float f = 1.0F;
 
-                 iblockdata = this.level.getBlockState(blockposition);
-                if (!iblockdata.isAir()) {
+                 iblockdata1 = this.level.getBlockState(blockposition);
+-                if (!iblockdata1.isAir()) {
 +                // CraftBukkit start - Swings at air do *NOT* exist.
 +                if (event.useInteractedBlock() == Event.Result.DENY) {
 +                    // If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door.
@@ -110,9 +110,9 @@
 +                    } else if (data.getBlock() instanceof BlockTrapdoor) {
 +                        this.player.connection.send(new PacketPlayOutBlockChange(this.level, blockposition));
 +                    }
-+                } else if (!iblockdata.isAir()) {
-                     iblockdata.attack(this.level, blockposition, this.player);
-                     f = iblockdata.getDestroyProgress(this.player, this.player.level, blockposition);
+                } else if (!iblockdata1.isAir()) {
+                     iblockdata1.attack(this.level, blockposition, this.player);
+                     f = iblockdata1.getDestroyProgress(this.player, this.player.level, blockposition);
                 }
 
 +                if (event.useItemInHand() == Event.Result.DENY) {
@@ -135,10 +135,10 @@
 +                }
 +                // CraftBukkit end
 +
-                 if (!iblockdata.isAir() && f >= 1.0F) {
+                 if (!iblockdata1.isAir() && f >= 1.0F) {
                     this.destroyAndAck(blockposition, packetplayinblockdig_enumplayerdigtype, "insta mine");
                 } else {
-@@ -208,13 +290,15 @@
+@@ -218,13 +300,15 @@
             } else if (packetplayinblockdig_enumplayerdigtype == PacketPlayInBlockDig.EnumPlayerDigType.ABORT_DESTROY_BLOCK) {
                 this.isDestroyingBlock = false;
                 if (!Objects.equals(this.destroyPos, blockposition)) {
@@ -155,7 +155,7 @@
             }
 
         }
-@@ -224,17 +308,72 @@
+@@ -234,17 +318,72 @@
         if (this.destroyBlock(blockposition)) {
             this.player.connection.send(new PacketPlayOutBlockBreak(blockposition, this.level.getBlockState(blockposition), packetplayinblockdig_enumplayerdigtype, true, s));
         } else {
@@ -230,7 +230,7 @@
             TileEntity tileentity = this.level.getBlockEntity(blockposition);
             Block block = iblockdata.getBlock();
 
-@@ -244,6 +383,10 @@
+@@ -254,6 +393,10 @@
             } else if (this.player.blockActionRestricted(this.level, blockposition, this.gameModeForPlayer)) {
                 return false;
             } else {
@@ -241,7 +241,7 @@
                 block.playerWillDestroy(this.level, blockposition, iblockdata, this.player);
                 boolean flag = this.level.removeBlock(blockposition, false);
 
-@@ -252,19 +395,32 @@
+@@ -262,19 +405,32 @@
                 }
 
                 if (this.isCreative()) {
@@ -277,7 +277,7 @@
             }
         }
     }
-@@ -306,12 +462,52 @@
+@@ -316,12 +472,52 @@
         }
     }
 
@@ -330,7 +330,7 @@
 
             if (itileinventory != null) {
                 entityplayer.openMenu(itileinventory);
-@@ -325,7 +521,7 @@
+@@ -335,7 +531,7 @@
             ItemStack itemstack1 = itemstack.copy();
 
             if (!flag1) {
@@ -339,7 +339,7 @@
 
                 if (enuminteractionresult.consumesAction()) {
                     CriterionTriggers.ITEM_USED_ON_BLOCK.trigger(entityplayer, blockposition, itemstack1);
-@@ -333,17 +529,17 @@
+@@ -343,17 +539,17 @@
                 }
             }
 
@@ -360,7 +360,7 @@
                 }
 
                 if (enuminteractionresult1.consumesAction()) {
-@@ -351,10 +547,10 @@
+@@ -361,10 +557,10 @@
                 }
 
                 return enuminteractionresult1;
--- a/paper-server/nms-patches/net/minecraft/server/level/RegionLimitedWorldAccess.patch
+++ b/paper-server/nms-patches/net/minecraft/server/level/RegionLimitedWorldAccess.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/RegionLimitedWorldAccess.java
 +++ b/net/minecraft/server/level/RegionLimitedWorldAccess.java
-@@ -200,7 +200,7 @@
+@@ -199,7 +199,7 @@
         if (iblockdata.isAir()) {
             return false;
         } else {
@@ -9,7 +9,7 @@
                 TileEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(blockposition) : null;
 
                 Block.dropResources(iblockdata, this.level, blockposition, tileentity, entity, ItemStack.EMPTY);
-@@ -319,6 +319,13 @@
+@@ -318,6 +318,13 @@
 
     @Override
     public boolean addFreshEntity(Entity entity) {
--- a/paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch
+++ b/paper-server/nms-patches/net/minecraft/server/level/WorldServer.patch
@@ -1,8 +1,8 @@
 --- a/net/minecraft/server/level/WorldServer.java
 +++ b/net/minecraft/server/level/WorldServer.java
-@@ -149,6 +149,20 @@
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
+@@ -150,6 +150,20 @@
+ import net.minecraft.world.ticks.TickListServer;
+ import org.slf4j.Logger;
 
 +// CraftBukkit start
 +import net.minecraft.world.entity.monster.EntityDrowned;
@@ -21,7 +21,7 @@
 public class WorldServer extends World implements GeneratorAccessSeed {
 
     public static final BlockPosition END_SPAWN_POINT = new BlockPosition(100, 50, 0);
-@@ -166,7 +180,7 @@
+@@ -167,7 +181,7 @@
     final List<EntityPlayer> players;
     private final ChunkProviderServer chunkSource;
     private final MinecraftServer server;
@@ -30,13 +30,13 @@
     final EntityTickList entityTickList;
     public final PersistentEntitySectionManager<Entity> entityManager;
     public boolean noSave;
-@@ -189,9 +203,29 @@
+@@ -190,9 +204,29 @@
     private final StructureCheck structureCheck;
     private final boolean tickTime;
 
-    public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey<World> resourcekey, DimensionManager dimensionmanager, WorldLoadListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<MobSpawner> list, boolean flag1) {
+-    public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey<World> resourcekey, Holder<DimensionManager> holder, WorldLoadListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<MobSpawner> list, boolean flag1) {
 -        Objects.requireNonNull(minecraftserver);
-        super(iworlddataserver, resourcekey, dimensionmanager, minecraftserver::getProfiler, false, flag, i);
+-        super(iworlddataserver, resourcekey, holder, minecraftserver::getProfiler, false, flag, i);
 +
 +    // CraftBukkit start
 +    private int tickPosition;
@@ -53,9 +53,9 @@
 +    }
 +
 +    // Add env and gen to constructor, WorldData -> WorldDataServer
-+    public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey<World> resourcekey, DimensionManager dimensionmanager, WorldLoadListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<MobSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
+    public WorldServer(MinecraftServer minecraftserver, Executor executor, Convertable.ConversionSession convertable_conversionsession, IWorldDataServer iworlddataserver, ResourceKey<World> resourcekey, Holder<DimensionManager> holder, WorldLoadListener worldloadlistener, ChunkGenerator chunkgenerator, boolean flag, long i, List<MobSpawner> list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) {
 +        // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error
-+        super(iworlddataserver, resourcekey, dimensionmanager, minecraftserver::getProfiler, false, flag, i, gen, biomeProvider, env);
+        super(iworlddataserver, resourcekey, holder, minecraftserver::getProfiler, false, flag, i, gen, biomeProvider, env);
 +        this.pvpMode = minecraftserver.isPvpAllowed();
 +        convertable = convertable_conversionsession;
 +        uuid = WorldUUID.getUUID(convertable_conversionsession.levelPath.toFile());
@@ -63,7 +63,7 @@
         this.players = Lists.newArrayList();
         this.entityTickList = new EntityTickList();
         this.blockTicks = new TickListServer<>(this::isPositionTickingWithEntitiesLoaded, this.getProfilerSupplier());
-@@ -203,7 +237,13 @@
+@@ -204,7 +238,13 @@
         this.tickTime = flag1;
         this.server = minecraftserver;
         this.customSpawners = list;
@@ -75,10 +75,10 @@
 +            chunkgenerator = new org.bukkit.craftbukkit.generator.CustomChunkGenerator(this, chunkgenerator, gen);
 +        }
 +        // CraftBukkit end
+         chunkgenerator.ensureStructuresGenerated();
         boolean flag2 = minecraftserver.forceSynchronousWrites();
         DataFixer datafixer = minecraftserver.getFixerUpper();
-         EntityPersistentStorage<Entity> entitypersistentstorage = new EntityStorage(this, convertable_conversionsession.getDimensionPath(resourcekey).resolve("entities"), datafixer, flag2, minecraftserver);
-@@ -234,14 +274,15 @@
+@@ -236,14 +276,15 @@
         long l = minecraftserver.getWorldData().worldGenSettings().seed();
 
         this.structureCheck = new StructureCheck(this.chunkSource.chunkScanner(), this.registryAccess(), minecraftserver.getStructureManager(), resourcekey, chunkgenerator, this, chunkgenerator.getBiomeSource(), l, datafixer);
@@ -96,7 +96,7 @@
     }
 
     public void setWeatherParameters(int i, int j, boolean flag, boolean flag1) {
-@@ -273,12 +314,20 @@
+@@ -275,12 +316,20 @@
         long j;
 
         if (this.sleepStatus.areEnoughSleeping(i) && this.sleepStatus.areEnoughDeepSleeping(i, this.players)) {
@@ -120,7 +120,7 @@
             if (this.getGameRules().getBoolean(GameRules.RULE_WEATHER_CYCLE) && this.isRaining()) {
                 this.resetWeatherCycle();
             }
-@@ -304,7 +353,7 @@
+@@ -306,7 +355,7 @@
         this.runBlockEvents();
         this.handlingTick = false;
         gameprofilerfiller.pop();
@@ -129,7 +129,7 @@
 
         if (flag) {
             this.resetEmptyTime();
-@@ -320,7 +369,7 @@
+@@ -322,7 +371,7 @@
 
             this.entityTickList.forEach((entity) -> {
                 if (!entity.isRemoved()) {
@@ -138,7 +138,7 @@
                         entity.discard();
                     } else {
                         gameprofilerfiller.push("checkDespawn");
-@@ -392,7 +441,7 @@
+@@ -394,7 +443,7 @@
 
     private void wakeUpAllPlayers() {
         this.sleepStatus.removeAllSleepers();
@@ -147,7 +147,7 @@
             entityplayer.stopSleepInBed(false, false);
         });
     }
-@@ -419,14 +468,14 @@
+@@ -421,14 +470,14 @@
                     entityhorseskeleton.setTrap(true);
                     entityhorseskeleton.setAge(0);
                     entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
@@ -164,8 +164,8 @@
             }
         }
 
-@@ -437,12 +486,12 @@
-             BiomeBase biomebase = this.getBiome(blockposition);
+@@ -439,12 +488,12 @@
+             BiomeBase biomebase = (BiomeBase) this.getBiome(blockposition).value();
 
             if (biomebase.shouldFreeze(this, blockposition1)) {
 -                this.setBlockAndUpdate(blockposition1, Blocks.ICE.defaultBlockState());
@@ -179,7 +179,7 @@
                 }
 
                 IBlockData iblockdata = this.getBlockState(blockposition1);
-@@ -638,6 +687,7 @@
+@@ -640,6 +689,7 @@
             this.rainLevel = MathHelper.clamp(this.rainLevel, 0.0F, 1.0F);
         }
 
@@ -187,7 +187,7 @@
         if (this.oRainLevel != this.rainLevel) {
             this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel), this.dimension());
         }
-@@ -656,14 +706,47 @@
+@@ -658,14 +708,47 @@
             this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.RAIN_LEVEL_CHANGE, this.rainLevel));
             this.server.getPlayerList().broadcastAll(new PacketPlayOutGameStateChange(PacketPlayOutGameStateChange.THUNDER_LEVEL_CHANGE, this.thunderLevel));
         }
@@ -237,7 +237,7 @@
     }
 
     public void resetEmptyTime() {
-@@ -698,6 +781,7 @@
+@@ -700,6 +783,7 @@
         });
         gameprofilerfiller.incrementCounter("tickNonPassenger");
         entity.tick();
@@ -245,7 +245,7 @@
         this.getProfiler().pop();
         Iterator iterator = entity.getPassengers().iterator();
 
-@@ -721,6 +805,7 @@
+@@ -723,6 +807,7 @@
                 });
                 gameprofilerfiller.incrementCounter("tickPassenger");
                 entity1.rideTick();
@@ -253,7 +253,7 @@
                 gameprofilerfiller.pop();
                 Iterator iterator = entity1.getPassengers().iterator();
 
-@@ -745,6 +830,7 @@
+@@ -747,6 +832,7 @@
         ChunkProviderServer chunkproviderserver = this.getChunkSource();
 
         if (!flag1) {
@@ -261,7 +261,7 @@
             if (iprogressupdate != null) {
                 iprogressupdate.progressStartNoAbort(new ChatMessage("menu.savingLevel"));
             }
-@@ -762,11 +848,19 @@
+@@ -764,11 +850,19 @@
             }
 
         }
@@ -282,7 +282,7 @@
         }
 
         this.getChunkSource().getDataStorage().save();
-@@ -812,15 +906,34 @@
+@@ -814,15 +908,34 @@
 
     @Override
     public boolean addFreshEntity(Entity entity) {
@@ -320,7 +320,7 @@
     }
 
     public void addDuringCommandTeleport(EntityPlayer entityplayer) {
-@@ -851,24 +964,36 @@
+@@ -853,24 +966,36 @@
         this.entityManager.addNewEntity(entityplayer);
     }
 
@@ -361,7 +361,7 @@
             return true;
         }
     }
-@@ -882,10 +1007,32 @@
+@@ -884,10 +1009,32 @@
         entityplayer.remove(entity_removalreason);
     }
 
@@ -394,7 +394,7 @@
         while (iterator.hasNext()) {
             EntityPlayer entityplayer = (EntityPlayer) iterator.next();
 
-@@ -894,6 +1041,12 @@
+@@ -896,6 +1043,12 @@
                 double d1 = (double) blockposition.getY() - entityplayer.getY();
                 double d2 = (double) blockposition.getZ() - entityplayer.getZ();
 
@@ -407,7 +407,7 @@
                 if (d0 * d0 + d1 * d1 + d2 * d2 < 1024.0D) {
                     entityplayer.connection.send(new PacketPlayOutBlockBreakAnimation(i, blockposition, j));
                 }
-@@ -948,7 +1101,18 @@
+@@ -950,7 +1103,18 @@
             Iterator iterator = this.navigatingMobs.iterator();
 
             while (iterator.hasNext()) {
@@ -427,7 +427,7 @@
                 NavigationAbstract navigationabstract = entityinsentient.getNavigation();
 
                 if (navigationabstract.shouldRecomputePath(blockposition)) {
-@@ -984,10 +1148,20 @@
+@@ -986,10 +1150,20 @@
 
     @Override
     public Explosion explode(@Nullable Entity entity, @Nullable DamageSource damagesource, @Nullable ExplosionDamageCalculator explosiondamagecalculator, double d0, double d1, double d2, float f, boolean flag, Explosion.Effect explosion_effect) {
@@ -448,7 +448,7 @@
         if (explosion_effect == Explosion.Effect.NONE) {
             explosion.clearToBlow();
         }
-@@ -1068,13 +1242,20 @@
+@@ -1070,13 +1244,20 @@
     }
 
     public <T extends ParticleParam> int sendParticles(T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6) {
@@ -471,16 +471,16 @@
                 ++j;
             }
         }
-@@ -1125,7 +1306,7 @@
+@@ -1127,7 +1308,7 @@
 
     @Nullable
-     public BlockPosition findNearestMapFeature(StructureGenerator<?> structuregenerator, BlockPosition blockposition, int i, boolean flag) {
-        return !this.server.getWorldData().worldGenSettings().generateFeatures() ? null : this.getChunkSource().getGenerator().findNearestMapFeature(this, structuregenerator, blockposition, i, flag);
-+        return !this.serverLevelData.worldGenSettings().generateFeatures() ? null : this.getChunkSource().getGenerator().findNearestMapFeature(this, structuregenerator, blockposition, i, flag); // CraftBukkit
-     }
- 
-     @Nullable
-@@ -1162,11 +1343,21 @@
+     public BlockPosition findNearestMapFeature(TagKey<StructureFeature<?, ?>> tagkey, BlockPosition blockposition, int i, boolean flag) {
+-        if (!this.server.getWorldData().worldGenSettings().generateFeatures()) {
+        if (!this.serverLevelData.worldGenSettings().generateFeatures()) { // CraftBukkit
+             return null;
+         } else {
+             Optional<HolderSet.Named<StructureFeature<?, ?>>> optional = this.registryAccess().registryOrThrow(IRegistry.CONFIGURED_STRUCTURE_FEATURE_REGISTRY).getTag(tagkey);
+@@ -1169,11 +1350,21 @@
     @Nullable
     @Override
     public WorldMap getMapData(String s) {
@@ -503,7 +503,7 @@
         this.getServer().overworld().getDataStorage().set(s, worldmap);
     }
 
-@@ -1478,6 +1669,11 @@
+@@ -1485,6 +1676,11 @@
     @Override
     public void blockUpdated(BlockPosition blockposition, Block block) {
         if (!this.isDebug()) {
@@ -515,7 +515,7 @@
             this.updateNeighborsAt(blockposition, block);
         }
 
-@@ -1497,12 +1693,12 @@
+@@ -1504,12 +1700,12 @@
     }
 
     public boolean isFlat() {
@@ -530,7 +530,7 @@
     }
 
     @Nullable
-@@ -1530,7 +1726,7 @@
+@@ -1532,7 +1728,7 @@
     private static <T> String getTypeCount(Iterable<T> iterable, Function<T, String> function) {
         try {
             Object2IntOpenHashMap<String> object2intopenhashmap = new Object2IntOpenHashMap();
@@ -539,7 +539,7 @@
 
             while (iterator.hasNext()) {
                 T t0 = iterator.next();
-@@ -1539,7 +1735,7 @@
+@@ -1541,7 +1737,7 @@
                 object2intopenhashmap.addTo(s, 1);
             }
 
@@ -548,7 +548,7 @@
                 String s1 = (String) entry.getKey();
 
                 return s1 + ":" + entry.getIntValue();
-@@ -1550,17 +1746,33 @@
+@@ -1552,17 +1748,33 @@
     }
 
     public static void makeObsidianPlatform(WorldServer worldserver) {
@@ -584,7 +584,7 @@
     }
 
     @Override
-@@ -1666,6 +1878,7 @@
+@@ -1672,6 +1884,7 @@
                 }
             }
 
@@ -592,7 +592,7 @@
         }
 
         public void onTrackingEnd(Entity entity) {
-@@ -1707,6 +1920,14 @@
+@@ -1713,6 +1926,14 @@
                 gameeventlistenerregistrar.onListenerRemoved(entity.level);
             }