From cf3dd6eb318a2314054a2f8b0699a5fcd4b54ee0 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 21 May 2016 01:28:36 +1000
Subject: [PATCH] Fix chunk loading for sponge

---
 .../fawe/sponge/v1_8/SpongeQueue_1_8.java     | 18 +++++++++++++-----
 .../fawe/sponge/v1_8/SpongeQueue_ALL.java     | 19 +++++++++++++++----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_1_8.java b/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_1_8.java
index 26dfa4a3..568ae9d7 100644
--- a/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_1_8.java
+++ b/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_1_8.java
@@ -45,7 +45,6 @@ import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 import net.minecraft.world.gen.ChunkProviderServer;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.world.Chunk;
 import org.spongepowered.api.world.Location;
 import org.spongepowered.api.world.World;
 
@@ -136,8 +135,9 @@ public class SpongeQueue_1_8 extends NMSMappedFaweQueue<World, net.minecraft.wor
 
     @Override
     public boolean isChunkLoaded(World world, int x, int z) {
-        Chunk chunk = world.getChunk(x << 4, 0, z << 4).orElse(null);
-        return chunk != null && chunk.isLoaded();
+        net.minecraft.world.World nmsWorld = (net.minecraft.world.World) world;
+        IChunkProvider provider = nmsWorld.getChunkProvider();
+        return provider.chunkExists(x, z);
     }
 
     @Override
@@ -603,8 +603,16 @@ public class SpongeQueue_1_8 extends NMSMappedFaweQueue<World, net.minecraft.wor
 
     @Override
     public ExtendedBlockStorage[] getCachedSections(World world, int cx, int cz) {
-        Chunk chunk = world.loadChunk(cx, 0, cz, true).orElse(null);
-        return ((net.minecraft.world.chunk.Chunk) chunk).getBlockStorageArray();
+        net.minecraft.world.World nmsWorld = (net.minecraft.world.World) world;
+        IChunkProvider provider = nmsWorld.getChunkProvider();
+        net.minecraft.world.chunk.Chunk chunk = provider.provideChunk(cx, cz);
+        if (chunk == null) {
+            return null;
+        }
+        if (!chunk.isLoaded()) {
+            chunk.onChunkLoad();
+        }
+        return chunk.getBlockStorageArray();
     }
 
     @Override
diff --git a/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_ALL.java b/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_ALL.java
index deec7fee..c53ec788 100644
--- a/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_ALL.java
+++ b/sponge/src/main/java/com/boydti/fawe/sponge/v1_8/SpongeQueue_ALL.java
@@ -126,10 +126,12 @@ public class SpongeQueue_ALL extends NMSMappedFaweQueue<World, net.minecraft.wor
 
     @Override
     public boolean isChunkLoaded(World world, int x, int z) {
-        Chunk chunk = world.getChunk(x << 4, 0, z << 4).orElse(null);
-        return chunk != null && chunk.isLoaded();
+        net.minecraft.world.World nmsWorld = (net.minecraft.world.World) world;
+        IChunkProvider provider = nmsWorld.getChunkProvider();
+        return provider.chunkExists(x, z);
     }
 
+
     @Override
     public boolean regenerateChunk(World world, int x, int z) {
         try {
@@ -377,10 +379,19 @@ public class SpongeQueue_ALL extends NMSMappedFaweQueue<World, net.minecraft.wor
 
     @Override
     public ExtendedBlockStorage[] getCachedSections(World world, int cx, int cz) {
-        Chunk chunk = world.loadChunk(cx, 0, cz, true).orElse(null);
-        return ((net.minecraft.world.chunk.Chunk) chunk).getBlockStorageArray();
+        net.minecraft.world.World nmsWorld = (net.minecraft.world.World) world;
+        IChunkProvider provider = nmsWorld.getChunkProvider();
+        net.minecraft.world.chunk.Chunk chunk = provider.provideChunk(cx, cz);
+        if (chunk == null) {
+            return null;
+        }
+        if (!chunk.isLoaded()) {
+            chunk.onChunkLoad();
+        }
+        return chunk.getBlockStorageArray();
     }
 
+
     @Override
     public int getCombinedId4Data(char[] chars, int x, int y, int z) {
         return chars[FaweCache.CACHE_J[y][x & 15][z & 15]];