From c6431dbe4300144a3e29f5a823d0221d8ccae42e Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sun, 28 Oct 2018 21:15:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B5=20=D1=87=D0=B0=D0=BD=D0=BA=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D0=B4=D0=BE=D0=BB=D0=B6=D0=BD=D0=BE=20=D0=B3=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B5=D1=80=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?exception's?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/src/main/java/mc/core/CoreEventListener.java               | 2 ++
 .../mc/core/network/proto_1_12_2/netty/PlayerEventListener.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/core/src/main/java/mc/core/CoreEventListener.java b/core/src/main/java/mc/core/CoreEventListener.java
index 201b60e..6f37f71 100644
--- a/core/src/main/java/mc/core/CoreEventListener.java
+++ b/core/src/main/java/mc/core/CoreEventListener.java
@@ -25,9 +25,11 @@ public class CoreEventListener {
 
         Chunk chunk;
         chunk = event.getPlayer().getWorld().getChunk(event.getOldLocation()); // Old chunk
+        if (chunk == null) return;
         int ccX = chunk.getX();
         int ccZ = chunk.getZ();
         chunk = event.getPlayer().getWorld().getChunk(event.getNewLocation()); // Next chunk
+        if (chunk == null) return;
         int ncX = chunk.getX();
         int ncZ = chunk.getZ();
 
diff --git a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java
index 4c7e533..b959987 100644
--- a/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java
+++ b/proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/PlayerEventListener.java
@@ -30,6 +30,7 @@ class PlayerEventListener {
         for(Integer compressXZ : event.getNeedLoadChunks()) {
             int[] xz = CompactedCoords.uncompressXZ(compressXZ);
             Chunk chunk = event.getPlayer().getWorld().getChunk(xz[0], xz[1]);
+            if (chunk == null) continue;
 
             ChunkDataPacket packet = new ChunkDataPacket();
             packet.setX(xz[0]);