From 097dcf0f6c3115215560da1348c5eecf05342816 Mon Sep 17 00:00:00 2001 From: themode Date: Wed, 4 Nov 2020 14:18:02 +0100 Subject: [PATCH] Log the proper warning message instead of a NPE --- .../minestom/server/instance/MinestomBasicChunkLoader.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minestom/server/instance/MinestomBasicChunkLoader.java b/src/main/java/net/minestom/server/instance/MinestomBasicChunkLoader.java index d358cc5d4..c0539d2e3 100644 --- a/src/main/java/net/minestom/server/instance/MinestomBasicChunkLoader.java +++ b/src/main/java/net/minestom/server/instance/MinestomBasicChunkLoader.java @@ -6,6 +6,7 @@ import net.minestom.server.utils.callback.OptionalCallback; import net.minestom.server.utils.chunk.ChunkCallback; import net.minestom.server.utils.chunk.ChunkSupplier; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,10 +38,10 @@ public class MinestomBasicChunkLoader implements IChunkLoader { } @Override - public void saveChunk(@NotNull Chunk chunk, Runnable callback) { + public void saveChunk(@NotNull Chunk chunk, @Nullable Runnable callback) { final StorageLocation storageLocation = instanceContainer.getStorageLocation(); if (storageLocation == null) { - callback.run(); + OptionalCallback.execute(callback); LOGGER.warn("No storage location to save chunk!"); return; }