Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-19 15:09:18 +00:00
Code Issues Releases Activity

fix null pointer when failing to load a dimension

Browse Source
This commit is contained in:
Julian Krings
2025-07-10 19:20:46 +02:00
parent 94c5782490
commit 343dc429d5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/volmit/iris/core/ServerConfigurator.java
View File

@@ -44,6 +44,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Objects;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicIntegerArray; import java.util.concurrent.atomic.AtomicIntegerArray;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -140,6 +141,7 @@ public class ServerConfigurator {
var loader = data.getDimensionLoader(); var loader = data.getDimensionLoader();
return loader.loadAll(loader.getPossibleKeys()) return loader.loadAll(loader.getPossibleKeys())
.stream() .stream()
.filter(Objects::nonNull)
.map(ServerConfigurator::verifyDataPackInstalled) .map(ServerConfigurator::verifyDataPackInstalled)
.toList() .toList()
.contains(false); .contains(false);
@@ -280,6 +282,7 @@ public class ServerConfigurator {
var loader = data.getDimensionLoader(); var loader = data.getDimensionLoader();
return loader.loadAll(loader.getPossibleKeys()) return loader.loadAll(loader.getPossibleKeys())
.stream() .stream()
.filter(Objects::nonNull)
.peek(this::merge); .peek(this::merge);
} }