From aa001b5fe2b894793776d4c8b1f8e11919d3035a Mon Sep 17 00:00:00 2001 From: Forwolk Date: Sat, 4 Aug 2018 16:17:31 +0300 Subject: [PATCH] fix: return null if reference is null --- core/src/main/java/mc/core/Location.java | 2 +- .../src/main/java/mc/world/generated_world/chunk/ChunkImpl.java | 2 +- .../main/java/mc/world/generated_world/region/RegionImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/mc/core/Location.java b/core/src/main/java/mc/core/Location.java index 6f5d7d7..6f58136 100644 --- a/core/src/main/java/mc/core/Location.java +++ b/core/src/main/java/mc/core/Location.java @@ -99,7 +99,7 @@ public class Location implements Serializable{ public World getWorld () { if (world == null) { - throw new IllegalStateException("World is not initialized"); + return null; } if (world.get() == null) { throw new ResourceUnloadedException("You're trying to get unloaded world"); diff --git a/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkImpl.java b/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkImpl.java index d47cb1f..2eb78a0 100644 --- a/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkImpl.java +++ b/generated_world/src/main/java/mc/world/generated_world/chunk/ChunkImpl.java @@ -112,7 +112,7 @@ public class ChunkImpl implements Chunk{ @Override public Region getRegion() { if (region == null) { - throw new IllegalStateException("Region is not initialized"); + return null; } if (region.get() == null) { throw new ResourceUnloadedException("Region is unloaded"); diff --git a/generated_world/src/main/java/mc/world/generated_world/region/RegionImpl.java b/generated_world/src/main/java/mc/world/generated_world/region/RegionImpl.java index 69bfbcb..1c48196 100644 --- a/generated_world/src/main/java/mc/world/generated_world/region/RegionImpl.java +++ b/generated_world/src/main/java/mc/world/generated_world/region/RegionImpl.java @@ -81,7 +81,7 @@ public class RegionImpl implements Region{ @Override public World getWorld() { if (world == null) { - throw new IllegalStateException("World is not initialized"); + return null; } if (world.get() == null) { throw new ResourceUnloadedException("World is unloaded");