Null pointer fix

paulevsGitch · Jun 7, 2021 · 1e20595 · 1e20595
1 parent cfaf826
commit 1e20595
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,7 @@ yarn_mappings=6
 loader_version=0.11.3
 
 # Mod Properties
-mod_version = 0.1.18
+mod_version = 0.1.19
 maven_group = ru.bclib
 archives_base_name = bclib
 

diff --git a/src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java b/src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java
@@ -27,19 +27,19 @@
 
 @Mixin(ServerLevel.class)
 public abstract class ServerLevelMixin extends Level {
-	private static String be_lastWorld = null;
+	private static String bcl_lastWorld = null;
 
 	protected ServerLevelMixin(WritableLevelData writableLevelData, ResourceKey<Level> resourceKey, DimensionType dimensionType, Supplier<ProfilerFiller> supplier, boolean bl, boolean bl2, long l) {
 		super(writableLevelData, resourceKey, dimensionType, supplier, bl, bl2, l);
 	}
 
 	@Inject(method = "<init>*", at = @At("TAIL"))
-	private void be_onServerWorldInit(MinecraftServer server, Executor workerExecutor, LevelStorageSource.LevelStorageAccess session, ServerLevelData properties, ResourceKey<Level> registryKey, DimensionType dimensionType, ChunkProgressListener worldGenerationProgressListener, ChunkGenerator chunkGenerator, boolean debugWorld, long l, List<CustomSpawner> list, boolean bl, CallbackInfo info) {
-		if (be_lastWorld != null && be_lastWorld.equals(session.getLevelId())) {
+	private void bcl_onServerWorldInit(MinecraftServer server, Executor workerExecutor, LevelStorageSource.LevelStorageAccess session, ServerLevelData properties, ResourceKey<Level> registryKey, DimensionType dimensionType, ChunkProgressListener worldGenerationProgressListener, ChunkGenerator chunkGenerator, boolean debugWorld, long l, List<CustomSpawner> list, boolean bl, CallbackInfo info) {
+		if (bcl_lastWorld != null && bcl_lastWorld.equals(session.getLevelId())) {
 			return;
 		}
 
-		be_lastWorld = session.getLevelId();
+		bcl_lastWorld = session.getLevelId();
 
 		ServerLevel world = ServerLevel.class.cast(this);
 		File dir = session.getDimensionPath(world.dimension());

diff --git a/src/main/java/ru/bclib/world/biomes/BCLBiome.java b/src/main/java/ru/bclib/world/biomes/BCLBiome.java
@@ -86,7 +86,8 @@ public boolean containsSubBiome(BCLBiome biome) {
 	}
 
 	public BCLBiome getSubBiome(Random random) {
-		return subbiomes.get(random);
+		BCLBiome biome = subbiomes.get(random);
+		return biome == null ? this : biome;
 	}
 
 	public BCLBiome getParentBiome() {