From b4f2b72e3aa7bbfca73faed5054defba9cee1cbb Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Thu, 16 Aug 2018 13:25:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20WorldUnloadedException?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flat_world/src/main/java/mc/world/flat/SimpleChunk.java | 3 +-- .../src/main/java/mc/world/flat/SimpleChunkSection.java | 2 +- .../src/main/java/mc/world/flat/WorldUnloadedException.java | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 flat_world/src/main/java/mc/world/flat/WorldUnloadedException.java diff --git a/flat_world/src/main/java/mc/world/flat/SimpleChunk.java b/flat_world/src/main/java/mc/world/flat/SimpleChunk.java index 21cafb7..5208c33 100644 --- a/flat_world/src/main/java/mc/world/flat/SimpleChunk.java +++ b/flat_world/src/main/java/mc/world/flat/SimpleChunk.java @@ -47,8 +47,7 @@ public class SimpleChunk implements Chunk { @Override public World getWorld() { if (refWorld.get() == null) { - log.error("World unloaded?"); - return null; + throw new WorldUnloadedException(); } else { return refWorld.get(); } diff --git a/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java b/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java index 414cbb4..4db9cf5 100644 --- a/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java +++ b/flat_world/src/main/java/mc/world/flat/SimpleChunkSection.java @@ -71,6 +71,6 @@ public class SimpleChunkSection implements ChunkSection { @Override public World getWorld() { - return null; + throw new UnsupportedOperationException(); } } diff --git a/flat_world/src/main/java/mc/world/flat/WorldUnloadedException.java b/flat_world/src/main/java/mc/world/flat/WorldUnloadedException.java new file mode 100644 index 0000000..127f2ab --- /dev/null +++ b/flat_world/src/main/java/mc/world/flat/WorldUnloadedException.java @@ -0,0 +1,4 @@ +package mc.world.flat; + +public class WorldUnloadedException extends RuntimeException { +}