Parker Hawke / CraftBukkit / 1eeba6a0ec9

Commits

DerFrZocker authored and md_5 committed 1eeba6a0ec9 29 Jan 2022

SPIGOT-6891: Crash when importing 1.16 chunks with entities above the world, when a BlockPopulator is active

src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java

Modified

-31
-32
+public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRegion {
-33
-34
+    private final WeakReference<GeneratorAccessSeed> weakAccess;
-35
+    private final int centerChunkX;
-36
+    private final int centerChunkZ;
-37
+    // Buffer is one chunk (16 blocks), can be seen in ChunkStatus#q
-38
+    // there the order is {..., FEATURES, LIQUID_CARVERS, STRUCTURE_STARTS, ...}
-39
+    private final int buffer = 16;
-40
+    private final BoundingBox region;
-+
+    boolean entitiesLoaded = false;
-42
+    // Minecraft saves the entities as NBTTagCompound during chunk generation. This causes that
-43
+    // changes made to the returned bukkit entity are not saved. To combat this we keep them and
-44
+    // save them when the population is finished.
-45
+    private final List<net.minecraft.world.entity.Entity> entities = new ArrayList<>();
-+
+    // SPIGOT-6891: Save outside Entities extra, since they are not part of the region.
-+
+    // Prevents crash for chunks which are converting from 1.17 to 1.18
-+
+    private final List<net.minecraft.world.entity.Entity> outsideEntities = new ArrayList<>();
-49
-50
+    public CraftLimitedRegion(GeneratorAccessSeed access, ChunkCoordIntPair center) {
-51
+        this.weakAccess = new WeakReference<>(access);
-52
+        centerChunkX = center.x;
-53
+        centerChunkZ = center.z;
-54
--
+        // load entities which are already present
--
+        for (int x = -(buffer >> 4); x <= (buffer >> 4); x++) {
--
+            for (int z = -(buffer >> 4); z <= (buffer >> 4); z++) {
--
+                ProtoChunk chunk = (ProtoChunk) access.getChunk(centerChunkX + x, centerChunkZ + z);
--
+                for (NBTTagCompound compound : chunk.getEntities()) {
--
+                    EntityTypes.loadEntityRecursive(compound, access.getMinecraftWorld(), (entity) -> {
--
+                        entity.generation = true;
--
+                        entities.add(entity);
--
+                        return entity;
--
+                    });
--
+                }
--
+            }
--
+        }
--
-55
+        World world = access.getMinecraftWorld().getWorld();
-56
+        int xCenter = centerChunkX << 4;
-57
+        int zCenter = centerChunkZ << 4;
-58
+        int xMin = xCenter - getBuffer();
-59
+        int zMin = zCenter - getBuffer();
-60
+        int xMax = xCenter + getBuffer() + 16;
-61
+        int zMax = zCenter + getBuffer() + 16;
-62
-63
+        this.region = new BoundingBox(xMin, world.getMinHeight(), zMin, xMax, world.getMaxHeight(), zMax);
-64
+    }
-65
-66
+    public GeneratorAccessSeed getHandle() {
-67
+        GeneratorAccessSeed handle = weakAccess.get();
-68
-69
+        if (handle == null) {
-70
+            throw new IllegalStateException("GeneratorAccessSeed no longer present, are you using it in a different tick?");
-71
+        }
-72
-73
+        return handle;
-74
+    }
-75
--
+    public void saveEntities() {
-+
+    public void loadEntities() {
-+
+        if (entitiesLoaded) {
-+
+            return;
-+
+        }
-+
-81
+        GeneratorAccessSeed access = getHandle();
-+
+        // load entities which are already present
-83
+        for (int x = -(buffer >> 4); x <= (buffer >> 4); x++) {
-84
+            for (int z = -(buffer >> 4); z <= (buffer >> 4); z++) {
-85
+                ProtoChunk chunk = (ProtoChunk) access.getChunk(centerChunkX + x, centerChunkZ + z);
--
+                chunk.getEntities().clear();
-+
+                for (NBTTagCompound compound : chunk.getEntities()) {
-+
+                    EntityTypes.loadEntityRecursive(compound, access.getMinecraftWorld(), (entity) -> {
-+
+                        if (region.contains(entity.getX(), entity.getY(), entity.getZ())) {
-+
+                            entity.generation = true;
-+
+                            entities.add(entity);
-+
+                        } else {
-+
+                            outsideEntities.add(entity);
-+
+                        }
-+
+                        return entity;
-+
+                    });
-+
+                }
-+
+            }
-+
+        }
-+
-+
+        entitiesLoaded = true;
-+
+    }
-+
-+
+    public void saveEntities() {
-+
+        GeneratorAccessSeed access = getHandle();
-+
+        // We don't clear existing entities when they are not loaded and therefore not modified
-+
+        if (entitiesLoaded) {
-+
+            for (int x = -(buffer >> 4); x <= (buffer >> 4); x++) {
-+
+                for (int z = -(buffer >> 4); z <= (buffer >> 4); z++) {
-+
+                    ProtoChunk chunk = (ProtoChunk) access.getChunk(centerChunkX + x, centerChunkZ + z);
-+
+                    chunk.getEntities().clear();
-+
+                }
-112
+            }
-113
+        }
-114
-115
+        for (net.minecraft.world.entity.Entity entity : entities) {
-116
+            if (entity.isAlive()) {
-117
+                // check if entity is still in region or if it got teleported outside it
-118
+                Preconditions.checkState(region.contains(entity.getX(), entity.getY(), entity.getZ()), "Entity %s is not in the region", entity);
-119
+                access.addFreshEntity(entity);
-120
+            }
-121
+        }
-+
-+
+        for (net.minecraft.world.entity.Entity entity : outsideEntities) {
-+
+            access.addFreshEntity(entity);
-+
+        }
-126
+    }
-127
-128
+    public void breakLink() {
-129
+        weakAccess.clear();
-130
+    }
-131
-132
+    @Override
-133
+    public int getBuffer() {
-134
+        return buffer;
-135
+    }
-204
+    }
-205
-206
+    @Override
-207
+    public boolean generateTree(Location location, Random random, TreeType treeType, Consumer<BlockState> consumer) {
-208
+        Preconditions.checkArgument(isInRegion(location), "Coordinates %s, %s, %s are not in the region", location.getBlockX(), location.getBlockY(), location.getBlockZ());
-209
+        return super.generateTree(location, random, treeType, consumer);
-210
+    }
-211
-212
+    @Override
-213
+    public Collection<net.minecraft.world.entity.Entity> getNMSEntities() {
-+
+        // Only load entities if we need them
-+
+        loadEntities();
-216
+        return new ArrayList<>(entities);
-217
+    }
-218
-219
+    @Override
-220
+    public <T extends Entity> T spawn(Location location, Class<T> clazz, Consumer<T> function, CreatureSpawnEvent.SpawnReason reason) throws IllegalArgumentException {
-221
+        Preconditions.checkArgument(isInRegion(location), "Coordinates %s, %s, %s are not in the region", location.getBlockX(), location.getBlockY(), location.getBlockZ());
-222
+        return super.spawn(location, clazz, function, reason);
-223
+    }
-224
-225
+    @Override

CraftBukkit

Commits

Jira Issues

Add shortcut