diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java
index 04ed16cae..b04137397 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java
@@ -369,6 +369,7 @@ public class ChunkWrapper implements IChunkWrapper
 		blockPos.setY(relY);
 		blockPos.setZ(relZ);
 		
+		// TODO copy into pooled array, this isn't thread safe and can cause MC to throw errors if the chunk is loaded
 		return BlockStateWrapper.fromBlockState(this.chunk.getBlockState(blockPos), this.wrappedLevel);
 	}
 	
diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java
index 22ee32275..6875f2285 100644
--- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java
+++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java
@@ -202,15 +202,18 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 	
 	#if MC_VER >= MC_1_18_2
 	@Override
+	@NotNull
 	public LevelTickAccess<Block> getBlockTicks()
 	{
+		// DH world gen doesn't need ticking, so return the BlackholeTickAccess list (which causes all ticks to be ignored).
+		// If this isn't done the server may attempt to tick chunks outside the vanilla render distance,
+		// which can throw warnings or cause other issues
 		return BlackholeTickAccess.emptyLevelList();
 	}
+	
 	@Override
-	public LevelTickAccess<Fluid> getFluidTicks()
-	{
-		return BlackholeTickAccess.emptyLevelList();
-	}
+	@NotNull
+	public LevelTickAccess<Fluid> getFluidTicks() { return BlackholeTickAccess.emptyLevelList(); }
 	#endif
 	
 	// TODO Check this