Skip to content

Commit 119c4e5

Browse files
committed
fix: fix rushed snapshot 25w18a
1 parent 6a40751 commit 119c4e5

File tree

1 file changed

+12
-5
lines changed
  • c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses

1 file changed

+12
-5
lines changed

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ServerAccessible.java

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,27 @@
1313
import com.ishland.c2me.rewrites.chunksystem.common.fapi.LifecycleEventInvoker;
1414
import com.ishland.c2me.rewrites.chunksystem.common.threadstate.ChunkTaskWork;
1515
import com.ishland.flowsched.scheduler.Cancellable;
16+
import net.minecraft.class_11352;
17+
import net.minecraft.class_11368;
1618
import net.minecraft.entity.EntityType;
1719
import net.minecraft.entity.SpawnReason;
18-
import net.minecraft.nbt.NbtCompound;
1920
import net.minecraft.server.world.ServerWorld;
21+
import net.minecraft.util.ErrorReporter;
2022
import net.minecraft.world.chunk.Chunk;
2123
import net.minecraft.world.chunk.ChunkStatus;
2224
import net.minecraft.world.chunk.ProtoChunk;
2325
import net.minecraft.world.chunk.WorldChunk;
2426
import net.minecraft.world.chunk.WrapperProtoChunk;
27+
import org.slf4j.Logger;
28+
import org.slf4j.LoggerFactory;
2529

26-
import java.util.List;
2730
import java.util.concurrent.CompletableFuture;
2831
import java.util.concurrent.CompletionStage;
2932

3033
public class ServerAccessible extends NewChunkStatus {
3134

35+
private static final Logger LOGGER = LoggerFactory.getLogger(ServerAccessible.class);
36+
3237
public ServerAccessible(int ordinal) {
3338
super(ordinal, ChunkStatus.FULL);
3439
}
@@ -70,9 +75,11 @@ private static WorldChunk toFullChunk(ProtoChunk protoChunk, ServerWorld serverW
7075
worldChunk = ((WrapperProtoChunk) protoChunk).getWrappedChunk();
7176
} else {
7277
worldChunk = new WorldChunk(serverWorld, protoChunk, worldChunkx -> {
73-
final List<NbtCompound> entities = protoChunk.getEntities();
74-
if (!entities.isEmpty()) {
75-
serverWorld.addEntities(EntityType.streamFromNbt(entities, serverWorld, SpawnReason.LOAD));
78+
try (ErrorReporter.class_11340 lv = new ErrorReporter.class_11340(protoChunk.method_71412(), LOGGER)) {
79+
class_11368.class_11370 arg = class_11352.method_71416(lv, serverWorld.getRegistryManager(), protoChunk.getEntities());
80+
if (!arg.method_71444()) {
81+
serverWorld.addEntities(EntityType.streamFromNbt(arg, serverWorld, SpawnReason.LOAD));
82+
}
7683
}
7784
});
7885
}

0 commit comments

Comments
 (0)