More

Author: kennytv

paper-server/patches/rejected/net/minecraft/world/level/chunk/storage/SerializableChunkData.java.patch paper-server/patches/sources/net/minecraft/world/level/chunk/storage/SerializableChunkData.java.patch

@@ -1,22 +1,14 @@
-From 3aeeaf31b7a7f888f54e47826e8ec0ddbe65c4bf Mon Sep 17 00:00:00 2001
-From: File <[email protected]>
-Date: Sun, 20 Apr 1997 14:37:42 +0100
-Subject: [PATCH] paper File Patches
-
-
-diff --git a/net/minecraft/world/level/chunk/storage/SerializableChunkData.java b/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
-index d84090814956f36cacb4e1ed1e3dbad1fc8a2ab0..c7c87bc8df86ceeef3e15a8f23fc252d4cee1984 100644
 --- a/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
 +++ b/net/minecraft/world/level/chunk/storage/SerializableChunkData.java
-@@ -91,6 +91,7 @@ public record SerializableChunkData(
+@@ -91,6 +_,7 @@
      List<CompoundTag> entities,
      List<CompoundTag> blockEntities,
      CompoundTag structureData
 +    , @Nullable net.minecraft.nbt.Tag persistentDataContainer // CraftBukkit - persistentDataContainer
  ) {
      public static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codecRW(
          Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState()
-@@ -107,12 +108,39 @@ public record SerializableChunkData(
+@@ -109,12 +_,39 @@
      public static final String BLOCK_LIGHT_TAG = "BlockLight";
      public static final String SKY_LIGHT_TAG = "SkyLight";
 
@@ -25,10 +17,10 @@ index d84090814956f36cacb4e1ed1e3dbad1fc8a2ab0..c7c87bc8df86ceeef3e15a8f23fc252d
 +    public static ChunkPos getChunkCoordinate(final CompoundTag chunkData) {
 +        final int dataVersion = ChunkStorage.getVersion(chunkData);
 +        if (dataVersion < 2842) { // Level tag is removed after this version
-+            final CompoundTag levelData = chunkData.getCompound("Level");
-+            return new ChunkPos(levelData.getInt("xPos"), levelData.getInt("zPos"));
++            final CompoundTag levelData = chunkData.getCompound("Level").orElse(null);
++            return new ChunkPos(levelData.getIntOr("xPos", 0), levelData.getIntOr("zPos", 0));
 +        } else {
-+            return new ChunkPos(chunkData.getInt("xPos"), chunkData.getInt("zPos"));
++            return new ChunkPos(chunkData.getIntOr("xPos", 0), chunkData.getIntOr("zPos", 0));
 +        }
 +    }
 +    // Paper end - guard against serializing mismatching coordinates
@@ -40,50 +32,50 @@ index d84090814956f36cacb4e1ed1e3dbad1fc8a2ab0..c7c87bc8df86ceeef3e15a8f23fc252d
 +
      @Nullable
      public static SerializableChunkData parse(LevelHeightAccessor levelHeightAccessor, RegistryAccess registries, CompoundTag tag) {
-         if (!tag.contains("Status", 8)) {
+         if (tag.getString("Status").isEmpty()) {
              return null;
          } else {
--            ChunkPos chunkPos = new ChunkPos(tag.getInt("xPos"), tag.getInt("zPos"));
+-            ChunkPos chunkPos = new ChunkPos(tag.getIntOr("xPos", 0), tag.getIntOr("zPos", 0));
 +            // Paper start - Do not let the server load chunks from newer versions
-+            if (tag.contains("DataVersion", net.minecraft.nbt.Tag.TAG_ANY_NUMERIC)) {
-+                final int dataVersion = tag.getInt("DataVersion");
++            if (tag.get("DataVersion") instanceof net.minecraft.nbt.NumericTag dataVersionTag) {
++                final int dataVersion = dataVersionTag.intValue();
 +                if (!JUST_CORRUPT_IT && dataVersion > CURRENT_DATA_VERSION) {
 +                    new RuntimeException("Server attempted to load chunk saved with newer version of minecraft! " + dataVersion + " > " + CURRENT_DATA_VERSION).printStackTrace();
 +                    System.exit(1);
 +                }
 +            }
 +            // Paper end - Do not let the server load chunks from newer versions
-+            ChunkPos chunkPos = new ChunkPos(tag.getInt("xPos"), tag.getInt("zPos")); // Paper - guard against serializing mismatching coordinates; diff on change, see ChunkSerializer#getChunkCoordinate
-             long _long = tag.getLong("LastUpdate");
-             long _long1 = tag.getLong("InhabitedTime");
-             ChunkStatus chunkStatus = ChunkStatus.byName(tag.getString("Status"));
-@@ -181,7 +209,7 @@ public record SerializableChunkData(
-             ListTag list7 = tag.getList("sections", 10);
-             List<SerializableChunkData.SectionData> list8 = new ArrayList<>(list7.size());
++            ChunkPos chunkPos = new ChunkPos(tag.getIntOr("xPos", 0), tag.getIntOr("zPos", 0)); // Paper - guard against serializing mismatching coordinates; diff on change, see ChunkSerializer#getChunkCoordinate
+             long longOr = tag.getLongOr("LastUpdate", 0L);
+             long longOr1 = tag.getLongOr("InhabitedTime", 0L);
+             ChunkStatus chunkStatus = tag.read("Status", ChunkStatus.CODEC).orElse(ChunkStatus.EMPTY);
+@@ -154,7 +_,7 @@
+             ListTag listOrEmpty2 = tag.getListOrEmpty("sections");
+             List<SerializableChunkData.SectionData> list5 = new ArrayList<>(listOrEmpty2.size());
              Registry<Biome> registry = registries.lookupOrThrow(Registries.BIOME);
 -            Codec<PalettedContainerRO<Holder<Biome>>> codec = makeBiomeCodec(registry);
 +            Codec<PalettedContainer<Holder<Biome>>> codec = makeBiomeCodecRW(registry); // CraftBukkit - read/write
 
-             for (int i2 = 0; i2 < list7.size(); i2++) {
-                 CompoundTag compound2 = list7.getCompound(i2);
-@@ -199,7 +227,7 @@ public record SerializableChunkData(
-                         );
-                     }
- 
--                    PalettedContainerRO<Holder<Biome>> palettedContainerRo;
-+                    PalettedContainer<Holder<Biome>> palettedContainerRo; // CraftBukkit - read/write
-                     if (compound2.contains("biomes", 10)) {
-                         palettedContainerRo = codec.parse(NbtOps.INSTANCE, compound2.getCompound("biomes"))
-                             .promotePartial(string -> logErrors(chunkPos, _byte, string))
-@@ -239,6 +267,7 @@ public record SerializableChunkData(
-                 list5,
-                 list6,
-                 compound1
+             for (int i2 = 0; i2 < listOrEmpty2.size(); i2++) {
+                 Optional<CompoundTag> compound = listOrEmpty2.getCompound(i2);
+@@ -174,7 +_,7 @@
+                                     Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES
+                                 )
+                             );
+-                        PalettedContainerRO<Holder<Biome>> palettedContainerRo = compoundTag.getCompound("biomes")
++                        PalettedContainer<Holder<Biome>> palettedContainerRo = compoundTag.getCompound("biomes") // CraftBukkit - read/write
+                             .map(
+                                 compoundTag1 -> codec.parse(NbtOps.INSTANCE, compoundTag1)
+                                     .promotePartial(string -> logErrors(chunkPos, byteOr, string))
+@@ -215,6 +_,7 @@
+                 list3,
+                 list4,
+                 compoundOrEmpty
 +                , tag.get("ChunkBukkitValues") // CraftBukkit - ChunkBukkitValues
              );
          }
      }
-@@ -316,6 +345,12 @@ public record SerializableChunkData(
+@@ -292,6 +_,12 @@
              }
          }
 
@@ -96,21 +88,7 @@ index d84090814956f36cacb4e1ed1e3dbad1fc8a2ab0..c7c87bc8df86ceeef3e15a8f23fc252d
          chunkAccess.setLightCorrect(this.lightCorrect);
          EnumSet<Heightmap.Types> set = EnumSet.noneOf(Heightmap.Types.class);
 
-@@ -346,6 +381,13 @@ public record SerializableChunkData(
-             }
- 
-             for (CompoundTag compoundTag : this.blockEntities) {
-+                // Paper start - do not read tile entities positioned outside the chunk
-+                final BlockPos blockposition = BlockEntity.getPosFromTag(compoundTag);
-+                if ((blockposition.getX() >> 4) != this.chunkPos.x || (blockposition.getZ() >> 4) != this.chunkPos.z) {
-+                    LOGGER.warn("Tile entity serialized in chunk {} in world '{}' positioned at {} is located outside of the chunk", this.chunkPos, level.getWorld().getName(), blockposition);
-+                    continue;
-+                }
-+                // Paper end - do not read tile entities positioned outside the chunk
-                 protoChunk1.setBlockEntityNbt(compoundTag);
-             }
- 
-@@ -370,6 +412,12 @@ public record SerializableChunkData(
+@@ -346,6 +_,12 @@
          );
      }
 
@@ -123,7 +101,7 @@ index d84090814956f36cacb4e1ed1e3dbad1fc8a2ab0..c7c87bc8df86ceeef3e15a8f23fc252d
      public static SerializableChunkData copyOf(ServerLevel level, ChunkAccess chunk) {
          if (!chunk.canBeSerialized()) {
              throw new IllegalArgumentException("Chunk can't be serialized: " + chunk);
-@@ -428,6 +476,12 @@ public record SerializableChunkData(
+@@ -404,6 +_,12 @@
              CompoundTag compoundTag = packStructureData(
                  StructurePieceSerializationContext.fromLevel(level), pos, chunk.getAllStarts(), chunk.getAllReferences()
              );
@@ -136,15 +114,15 @@ index d84090814956f36cacb4e1ed1e3dbad1fc8a2ab0..c7c87bc8df86ceeef3e15a8f23fc252d
              return new SerializableChunkData(
                  level.registryAccess().lookupOrThrow(Registries.BIOME),
                  pos,
-@@ -447,6 +501,7 @@ public record SerializableChunkData(
+@@ -423,6 +_,7 @@
                  list2,
                  list1,
                  compoundTag
 +                , persistentDataContainer // CraftBukkit - persistentDataContainer
              );
          }
      }
-@@ -525,6 +580,11 @@ public record SerializableChunkData(
+@@ -489,6 +_,11 @@
          this.heightmaps.forEach((types, longs) -> compoundTag2.put(types.getSerializationKey(), new LongArrayTag(longs)));
          compoundTag.put("Heightmaps", compoundTag2);
          compoundTag.put("structures", this.structureData);
@@ -156,26 +134,12 @@ index d84090814956f36cacb4e1ed1e3dbad1fc8a2ab0..c7c87bc8df86ceeef3e15a8f23fc252d
          return compoundTag;
      }
 
-@@ -562,6 +622,13 @@ public record SerializableChunkData(
-                     chunk.setBlockEntityNbt(compoundTag);
-                 } else {
-                     BlockPos posFromTag = BlockEntity.getPosFromTag(compoundTag);
-+                    // Paper start - do not read tile entities positioned outside the chunk
-+                    ChunkPos chunkPos = chunk.getPos();
-+                    if ((posFromTag.getX() >> 4) != chunkPos.x || (posFromTag.getZ() >> 4) != chunkPos.z) {
-+                        LOGGER.warn("Tile entity serialized in chunk " + chunkPos + " in world '" + level.getWorld().getName() + "' positioned at " + posFromTag + " is located outside of the chunk");
-+                        continue;
-+                    }
-+                    // Paper end - do not read tile entities positioned outside the chunk
-                     BlockEntity blockEntity = BlockEntity.loadStatic(posFromTag, chunk.getBlockState(posFromTag), compoundTag, level.registryAccess());
-                     if (blockEntity != null) {
-                         chunk.setBlockEntity(blockEntity);
-@@ -610,6 +677,12 @@ public record SerializableChunkData(
+@@ -562,6 +_,12 @@
              } else {
-                 StructureStart structureStart = StructureStart.loadStaticStart(context, compound.getCompound(string), seed);
+                 StructureStart structureStart = StructureStart.loadStaticStart(context, compoundOrEmpty.getCompoundOrEmpty(string), seed);
                  if (structureStart != null) {
 +                    // CraftBukkit start - load persistent data for structure start
-+                    net.minecraft.nbt.Tag persistentBase = compound.getCompound(string).get("StructureBukkitValues");
++                    net.minecraft.nbt.Tag persistentBase = compoundOrEmpty.getCompoundOrEmpty(string).get("StructureBukkitValues");
 +                    if (persistentBase instanceof CompoundTag compoundTag) {
 +                        structureStart.persistentDataContainer.putAll(compoundTag);
 +                    }

paper-server/patches/rejected/net/minecraft/world/level/storage/DimensionDataStorage.java.patch paper-server/patches/sources/net/minecraft/world/level/storage/DimensionDataStorage.java.patch

@@ -1,14 +1,6 @@
-From 3aeeaf31b7a7f888f54e47826e8ec0ddbe65c4bf Mon Sep 17 00:00:00 2001
-From: File <[email protected]>
-Date: Sun, 20 Apr 1997 14:37:42 +0100
-Subject: [PATCH] paper File Patches
-
-
-diff --git a/net/minecraft/world/level/storage/DimensionDataStorage.java b/net/minecraft/world/level/storage/DimensionDataStorage.java
-index 693edd43b9ff2a9f93889eb321c3c7b943b98708..d9a3b5a2e6495b7e22c114506c2bd1e406f58f8f 100644
 --- a/net/minecraft/world/level/storage/DimensionDataStorage.java
 +++ b/net/minecraft/world/level/storage/DimensionDataStorage.java
-@@ -139,7 +139,7 @@ public class DimensionDataStorage implements AutoCloseable {
+@@ -150,7 +_,7 @@
          } else {
              int i = Util.maxAllowedExecutorThreads();
              int size = map.size();
@@ -17,12 +9,12 @@ index 693edd43b9ff2a9f93889eb321c3c7b943b98708..d9a3b5a2e6495b7e22c114506c2bd1e4
                  this.pendingWriteFuture = this.pendingWriteFuture.thenCompose(object -> {
                      List<CompletableFuture<?>> list = new ArrayList<>(i);
                      int i1 = Mth.positiveCeilDiv(size, i);
-@@ -160,7 +160,7 @@ public class DimensionDataStorage implements AutoCloseable {
+@@ -171,7 +_,7 @@
                          object -> CompletableFuture.allOf(
                              map.entrySet()
                                  .stream()
--                                .map(entry -> CompletableFuture.runAsync(() -> tryWrite(entry.getKey(), entry.getValue()), Util.ioPool()))
-+                                .map(entry -> CompletableFuture.runAsync(() -> tryWrite(entry.getKey(), entry.getValue()), Util.DIMENSION_DATA_IO_POOL)) // Paper - Separate dimension data IO pool
+-                                .map(entry -> CompletableFuture.runAsync(() -> this.tryWrite(entry.getKey(), entry.getValue()), Util.ioPool()))
++                                .map(entry -> CompletableFuture.runAsync(() -> this.tryWrite(entry.getKey(), entry.getValue()), Util.DIMENSION_DATA_IO_POOL)) // Paper - Separate dimension data IO pool
                                  .toArray(CompletableFuture[]::new)
                          )
                      );

paper-server/patches/rejected/net/minecraft/world/level/storage/PrimaryLevelData.java.patch paper-server/patches/sources/net/minecraft/world/level/storage/PrimaryLevelData.java.patch

@@ -1,14 +1,6 @@
-From 3aeeaf31b7a7f888f54e47826e8ec0ddbe65c4bf Mon Sep 17 00:00:00 2001
-From: File <[email protected]>
-Date: Sun, 20 Apr 1997 14:37:42 +0100
-Subject: [PATCH] paper File Patches
-
-
-diff --git a/net/minecraft/world/level/storage/PrimaryLevelData.java b/net/minecraft/world/level/storage/PrimaryLevelData.java
-index 385d424ed08a6f3202c263cc8acedbc32cdeae7c..2f4922a2035cc7d628dd2c979137163feb90e19f 100644
 --- a/net/minecraft/world/level/storage/PrimaryLevelData.java
 +++ b/net/minecraft/world/level/storage/PrimaryLevelData.java
-@@ -74,6 +74,21 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
+@@ -74,6 +_,21 @@
      private final Set<String> removedFeatureFlags;
      private final TimerQueue<MinecraftServer> scheduledEvents;
 
@@ -30,7 +22,7 @@ index 385d424ed08a6f3202c263cc8acedbc32cdeae7c..2f4922a2035cc7d628dd2c979137163f
      private PrimaryLevelData(
          @Nullable CompoundTag loadedPlayerTag,
          boolean wasModded,
-@@ -237,7 +252,7 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
+@@ -237,7 +_,7 @@
          nbt.put("Version", compoundTag);
          NbtUtils.addCurrentDataVersion(nbt);
          DynamicOps<Tag> dynamicOps = registry.createSerializationContext(NbtOps.INSTANCE);
@@ -39,16 +31,16 @@ index 385d424ed08a6f3202c263cc8acedbc32cdeae7c..2f4922a2035cc7d628dd2c979137163f
              .resultOrPartial(Util.prefix("WorldGenSettings: ", LOGGER::error))
              .ifPresent(worldOptionsTag -> nbt.put("WorldGenSettings", worldOptionsTag));
          nbt.putInt("GameType", this.settings.gameType().getId());
-@@ -281,6 +296,8 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
-         if (this.wanderingTraderId != null) {
-             nbt.putUUID("WanderingTraderId", this.wanderingTraderId);
-         }
+@@ -276,6 +_,8 @@
+         nbt.putInt("WanderingTraderSpawnDelay", this.wanderingTraderSpawnDelay);
+         nbt.putInt("WanderingTraderSpawnChance", this.wanderingTraderSpawnChance);
+         nbt.storeNullable("WanderingTraderId", UUIDUtil.CODEC, this.wanderingTraderId);
 +        nbt.putString("Bukkit.Version", org.bukkit.Bukkit.getName() + "/" + org.bukkit.Bukkit.getVersion() + "/" + org.bukkit.Bukkit.getBukkitVersion()); // CraftBukkit
 +        this.world.getWorld().storeBukkitValues(nbt); // CraftBukkit - add pdc
      }
 
      private static ListTag stringCollectionToTag(Set<String> stringCollection) {
-@@ -358,6 +375,25 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
+@@ -353,6 +_,25 @@
 
      @Override
      public void setThundering(boolean thundering) {
@@ -74,7 +66,7 @@ index 385d424ed08a6f3202c263cc8acedbc32cdeae7c..2f4922a2035cc7d628dd2c979137163f
          this.thundering = thundering;
      }
 
-@@ -378,6 +414,26 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
+@@ -373,6 +_,26 @@
 
      @Override
      public void setRaining(boolean isRaining) {
@@ -101,7 +93,7 @@ index 385d424ed08a6f3202c263cc8acedbc32cdeae7c..2f4922a2035cc7d628dd2c979137163f
          this.raining = isRaining;
      }
 
-@@ -444,6 +500,12 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
+@@ -439,6 +_,12 @@
      @Override
      public void setDifficulty(Difficulty difficulty) {
          this.settings = this.settings.withDifficulty(difficulty);
@@ -114,18 +106,18 @@ index 385d424ed08a6f3202c263cc8acedbc32cdeae7c..2f4922a2035cc7d628dd2c979137163f
      }
 
      @Override
-@@ -580,6 +642,14 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
+@@ -574,6 +_,14 @@
+     public LevelSettings getLevelSettings() {
          return this.settings.copy();
      }
- 
++
 +    // CraftBukkit start - Check if the name stored in NBT is the correct one
 +    public void checkName(String name) {
 +        if (!this.settings.levelName.equals(name)) {
 +            this.settings.levelName = name;
 +        }
 +    }
 +    // CraftBukkit end
-+
+ 
      @Deprecated
      public static enum SpecialWorldProperty {
-         NONE,