MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Null pointer fix

Browse source
This commit is contained in:
paulevsGitch 2021-06-07 10:45:10 +03:00
parent cfaf8263d6
commit 1e20595ab5
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -8,7 +8,7 @@ yarn_mappings=6
loader_version=0.11.3 loader_version=0.11.3
# Mod Properties # Mod Properties
mod_version = 0.1.18 mod_version = 0.1.19
maven_group = ru.bclib maven_group = ru.bclib
archives_base_name = bclib archives_base_name = bclib

8
src/main/java/ru/bclib/mixin/common/ServerLevelMixin.java
View file

@ -27,19 +27,19 @@ import ru.bclib.api.WorldDataAPI;
@Mixin(ServerLevel.class) @Mixin(ServerLevel.class)
public abstract class ServerLevelMixin extends Level { 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) { 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); super(writableLevelData, resourceKey, dimensionType, supplier, bl, bl2, l);
} }
@Inject(method = "<init>*", at = @At("TAIL")) @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) { 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 (be_lastWorld != null && be_lastWorld.equals(session.getLevelId())) { if (bcl_lastWorld != null && bcl_lastWorld.equals(session.getLevelId())) {
return; return;
} }
be_lastWorld = session.getLevelId(); bcl_lastWorld = session.getLevelId();
ServerLevel world = ServerLevel.class.cast(this); ServerLevel world = ServerLevel.class.cast(this);
File dir = session.getDimensionPath(world.dimension()); File dir = session.getDimensionPath(world.dimension());

3
src/main/java/ru/bclib/world/biomes/BCLBiome.java
View file

@ -86,7 +86,8 @@ public class BCLBiome {
} }
public BCLBiome getSubBiome(Random random) { public BCLBiome getSubBiome(Random random) {
return subbiomes.get(random); BCLBiome biome = subbiomes.get(random);
return biome == null ? this : biome;
} }
public BCLBiome getParentBiome() { public BCLBiome getParentBiome() {