Merge pull request #271 from FTBTeam/1.20.1/dev

1.20.1/dev

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2001.2.4]
+
+### Fixed
+* Fixed cross-mod compat issue causing an NPE
+  * not entirely sure of the cause, but added some defensive coding checks to ensure chunk claim manager is not null when it's used in a mixin
+
 ## [2001.2.3]
 
 ### Added

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);
 		}
 	}

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.daemon=false
 mod_id=ftbchunks
 archives_base_name=ftb-chunks
 maven_group=dev.ftb.mods
-mod_version=2001.2.3
+mod_version=2001.2.4
 mod_author=FTB Team
 
 minecraft_version=1.20.1