From 2147c18f81930cd2d202388ed3b1867d055f7a58 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sun, 26 Aug 2018 00:51:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20World=20=D0=B8=D0=B7=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?=
 =?UTF-8?q?=D0=B0=20Chunk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/mc/core/world/chunk/Chunk.java  |  4 ---
 .../java/mc/world/simple/SimpleChunk.java     | 30 ++-----------------
 .../java/mc/world/simple/SimpleWorld.java     |  2 +-
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/core/src/main/java/mc/core/world/chunk/Chunk.java b/core/src/main/java/mc/core/world/chunk/Chunk.java
index 9436ccf..0ee2e28 100644
--- a/core/src/main/java/mc/core/world/chunk/Chunk.java
+++ b/core/src/main/java/mc/core/world/chunk/Chunk.java
@@ -1,7 +1,6 @@
 package mc.core.world.chunk;
 
 import mc.core.world.Biome;
-import mc.core.world.World;
 
 public interface Chunk {
     int getX();
@@ -12,7 +11,4 @@ public interface Chunk {
 
     Biome getBiome(int localX, int localZ);
     void setBiome(int localX, int localZ, Biome biome);
-
-    World getWorld();
-    void setWorld(World world);
 }
diff --git a/simple_world/src/main/java/mc/world/simple/SimpleChunk.java b/simple_world/src/main/java/mc/world/simple/SimpleChunk.java
index 0cd0abf..aadf810 100644
--- a/simple_world/src/main/java/mc/world/simple/SimpleChunk.java
+++ b/simple_world/src/main/java/mc/world/simple/SimpleChunk.java
@@ -1,30 +1,20 @@
 package mc.world.simple;
 
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import mc.core.exception.ResourceUnloadedException;
 import mc.core.world.Biome;
-import mc.core.world.World;
 import mc.core.world.chunk.Chunk;
 import mc.core.world.chunk.ChunkSection;
 
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
-
 @Slf4j
+@RequiredArgsConstructor
 public class SimpleChunk implements Chunk {
     @Getter
-    private int x, z;
-    private Reference<World> refWorld;
+    private final int x, z;
     private ChunkSection chunkSection;
     private final Biome biome = Biome.PLAINS;
 
-    public SimpleChunk(int x, int z, World world) {
-        this.x = x;
-        this.z = z;
-        setWorld(world);
-    }
-
     @Override
     public ChunkSection getChunkSection(int height) {
         return chunkSection;
@@ -44,18 +34,4 @@ public class SimpleChunk implements Chunk {
     public void setBiome(int localX, int localZ, Biome biome) {
         // ignore
     }
-
-    @Override
-    public World getWorld() {
-        if (refWorld.get() == null) {
-            throw new ResourceUnloadedException("World unloaded");
-        } else {
-            return refWorld.get();
-        }
-    }
-
-    @Override
-    public void setWorld(World world) {
-        this.refWorld = new WeakReference<>(world);
-    }
 }
diff --git a/simple_world/src/main/java/mc/world/simple/SimpleWorld.java b/simple_world/src/main/java/mc/world/simple/SimpleWorld.java
index 179e9f0..c1b1b19 100644
--- a/simple_world/src/main/java/mc/world/simple/SimpleWorld.java
+++ b/simple_world/src/main/java/mc/world/simple/SimpleWorld.java
@@ -40,7 +40,7 @@ public class SimpleWorld implements World {
 
     @Override
     public Chunk getChunk(int x, int z) {
-        Chunk chunk = new SimpleChunk(x, z, this);
+        Chunk chunk = new SimpleChunk(x, z);
         chunk.setChunkSection(0, chunkSection);
         return chunk;
     }