OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-05 18:27:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2022-01-30 10:52:42 +11:00
parent 2fb7e5202f
commit 99e0adb83b
1 changed files with 42 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
paper-server/src/main/java/org/bukkit/craftbukkit/generator/CraftLimitedRegion.java
View file

@ -38,30 +38,20 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe
// there the order is {..., FEATURES, LIQUID_CARVERS, STRUCTURE_STARTS, ...}
private final int buffer = 16;
private final BoundingBox region;
boolean entitiesLoaded = false;
// Minecraft saves the entities as NBTTagCompound during chunk generation. This causes that
// changes made to the returned bukkit entity are not saved. To combat this we keep them and
// save them when the population is finished.
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<>();
public CraftLimitedRegion(GeneratorAccessSeed access, ChunkCoordIntPair center) {
this.weakAccess = new WeakReference<>(access);
centerChunkX = center.x;
centerChunkZ = center.z;
// 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;
});
}
}
}
World world = access.getMinecraftWorld().getWorld();
int xCenter = centerChunkX << 4;
int zCenter = centerChunkZ << 4;
@ -83,12 +73,42 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe
return handle;
}
public void saveEntities() {
public void loadEntities() {
if (entitiesLoaded) {
return;
}
GeneratorAccessSeed access = getHandle();
// 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);
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();
}
}
}
@ -99,6 +119,10 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe
access.addFreshEntity(entity);
}
}
for (net.minecraft.world.entity.Entity entity : outsideEntities) {
access.addFreshEntity(entity);
}
}
public void breakLink() {
@ -187,6 +211,8 @@ public class CraftLimitedRegion extends CraftRegionAccessor implements LimitedRe
@Override
public Collection<net.minecraft.world.entity.Entity> getNMSEntities() {
// Only load entities if we need them
loadEntities();
return new ArrayList<>(entities);
}