From 8dbfbd2650b6c9de2d0b855d9a14b7f39db1070f Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Wed, 4 Jul 2018 20:50:28 +0800
Subject: [PATCH] Check null for chunk unload #13

---
 .../java/io/akarin/server/mixin/cps/MixinCraftWorld.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sources/src/main/java/io/akarin/server/mixin/cps/MixinCraftWorld.java b/sources/src/main/java/io/akarin/server/mixin/cps/MixinCraftWorld.java
index 04a28cc77..0e755a9f5 100644
--- a/sources/src/main/java/io/akarin/server/mixin/cps/MixinCraftWorld.java
+++ b/sources/src/main/java/io/akarin/server/mixin/cps/MixinCraftWorld.java
@@ -9,6 +9,8 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
+
+import net.minecraft.server.Chunk;
 import net.minecraft.server.WorldServer;
 
 @Mixin(value = CraftWorld.class, remap = false)
@@ -30,7 +32,8 @@ public abstract class MixinCraftWorld {
             opcode = Opcodes.INVOKEINTERFACE
     ))
     public boolean regenChunk(Set<Long> set, Object chunkHash) {
-        world.getChunkProviderServer().chunks.get(chunkHash).setShouldUnload(false);
+        Chunk chunk = world.getChunkProviderServer().chunks.get(chunkHash);
+        if (chunk != null) chunk.setShouldUnload(false);
         return true;
     }
 }