fix: null check for claim manager in ChunkMapMixin

FTBTeam/FTB-Mods-Issues#1020
FTBTeam · Nov 30, 2023 · c5cb65f · c5cb65f
1 parent b34a96a
commit c5cb65f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/common/src/main/java/dev/ftb/mods/ftbchunks/core/mixin/ChunkMapMixin.java b/common/src/main/java/dev/ftb/mods/ftbchunks/core/mixin/ChunkMapMixin.java
@@ -20,7 +20,10 @@ public abstract class ChunkMapMixin {
 
 	@Inject(method = "anyPlayerCloseEnoughForSpawning", at = @At("RETURN"), cancellable = true)
 	private void anyPlayerCloseEnoughForSpawningFTBC(ChunkPos pos, CallbackInfoReturnable<Boolean> ci) {
-		if (!ci.getReturnValue() && ClaimedChunkManagerImpl.getInstance().isChunkForceLoaded(new ChunkDimPos(level.dimension(), pos))) {
+		// it's possible for the claim manager to be null at this point, depending on what other mixins are in play...
+		// https://github.com/FTBTeam/FTB-Mods-Issues/issues/1020
+		if (!ci.getReturnValue() && ClaimedChunkManagerImpl.getInstance() != null
+				&& ClaimedChunkManagerImpl.getInstance().isChunkForceLoaded(new ChunkDimPos(level.dimension(), pos))) {
 			ci.setReturnValue(true);
 		}
 	}