diff --git a/shreddedpaper-server/src/main/java/io/multipaper/shreddedpaper/threading/ShreddedPaperEntityTicker.java b/shreddedpaper-server/src/main/java/io/multipaper/shreddedpaper/threading/ShreddedPaperEntityTicker.java index 190290b..3f31a6a 100644 --- a/shreddedpaper-server/src/main/java/io/multipaper/shreddedpaper/threading/ShreddedPaperEntityTicker.java +++ b/shreddedpaper-server/src/main/java/io/multipaper/shreddedpaper/threading/ShreddedPaperEntityTicker.java @@ -41,6 +41,7 @@ public static void tickEntity(Entity entity) { /** processTrackQueue has been renamed to newTrackerTick */ public static void processTrackQueue(Entity entity) { ChunkMap.TrackedEntity tracker = Objects.requireNonNull(entity.moonrise$getTrackedEntity()); + if (((ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity)entity).moonrise$getChunkData() == null) return; // ShreddedPaper - skip if chunk data not loaded ((ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerTrackedEntity)tracker).moonrise$tick(((ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity)entity).moonrise$getChunkData().nearbyPlayers); if (((ca.spottedleaf.moonrise.patches.entity_tracker.EntityTrackerTrackedEntity)tracker).moonrise$hasPlayers() || ((ca.spottedleaf.moonrise.patches.chunk_system.entity.ChunkSystemEntity)entity).moonrise$getChunkStatus().isOrAfter(FullChunkStatus.ENTITY_TICKING)) {