From 63ad22a0211c10cc22ab5cea600b6a641eddeb55 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Fri, 22 Apr 2016 02:31:20 +1000
Subject: [PATCH] Forgot to load the chunk, whoops. Also bumping the version

---
 build.gradle                                  |  2 +-
 bukkit/build/resources/main/plugin.yml        |  2 +-
 .../com/boydti/fawe/bukkit/FaweBukkit.java    | 21 +++++++++----------
 .../fawe/bukkit/v0/BukkitQueue_All.java       |  3 ++-
 bukkit/src/main/resources/plugin.yml          |  2 +-
 .../com/boydti/fawe/forge/SpongeMain.java     |  2 +-
 pom.xml                                       |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index c41bf81d..198e19a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
 }
 
 group = 'com.boydti.fawe'
-version = '3.3.19'
+version = '3.3.20'
 description = """FastAsyncWorldEdit"""
 
 subprojects {
diff --git a/bukkit/build/resources/main/plugin.yml b/bukkit/build/resources/main/plugin.yml
index 1ca8120b..0153138e 100644
--- a/bukkit/build/resources/main/plugin.yml
+++ b/bukkit/build/resources/main/plugin.yml
@@ -1,6 +1,6 @@
 name: FastAsyncWorldEdit
 main: com.boydti.fawe.bukkit.FaweBukkit
-version: 3.3.19
+version: 3.3.20
 description: Fast Async WorldEdit plugin
 authors: [Empire92]
 loadbefore: [WorldEdit]
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
index 5bd2b9fc..21960aed 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java
@@ -202,18 +202,17 @@ public class FaweBukkit extends JavaPlugin implements IFawe, Listener {
                 }
             }
             return new BukkitQueue_1_8(world);
-        } catch (Throwable e) {
-            if (hasNMS) {
-                debug("====== NO NMS BLOCK PLACER FOUND ======");
-                debug("FAWE couldn't find a fast block placer");
-                debug("Bukkit version: " + Bukkit.getVersion());
-                debug("Supported NMS versions: 1.8, 1.9");
-                debug("Fallback placer: " + BukkitQueue_All.class);
-                debug("=======================================");
-                hasNMS = false;
-            }
-            return new BukkitQueue_All(world);
+        } catch (Throwable ignore) {}
+        if (hasNMS) {
+            debug("====== NO NMS BLOCK PLACER FOUND ======");
+            debug("FAWE couldn't find a fast block placer");
+            debug("Bukkit version: " + Bukkit.getVersion());
+            debug("Supported NMS versions: 1.8, 1.9");
+            debug("Fallback placer: " + BukkitQueue_All.class);
+            debug("=======================================");
+            hasNMS = false;
         }
+        return new BukkitQueue_All(world);
     }
 
     /**
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
index 43901005..25fb1f49 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
@@ -85,6 +85,7 @@ public class BukkitQueue_All extends BukkitQueue_0 {
             startSet();
             final BukkitChunk_1_8 fs = ((BukkitChunk_1_8) fc);
             final Chunk chunk = fs.getChunk();
+            chunk.load(true);
             final World world = chunk.getWorld();
             char[][] sections = fs.getIdArrays();
             boolean done = false;
@@ -283,7 +284,7 @@ public class BukkitQueue_All extends BukkitQueue_0 {
             lastSection = getCachedSection(lastChunk, cy);
         }
 
-        if (lastChunk == null) {
+        if (lastSection == null) {
             return 0;
         }
         return getCombinedId4Data(lastSection, x, y, z);
diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
index 1ca8120b..0153138e 100644
--- a/bukkit/src/main/resources/plugin.yml
+++ b/bukkit/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: FastAsyncWorldEdit
 main: com.boydti.fawe.bukkit.FaweBukkit
-version: 3.3.19
+version: 3.3.20
 description: Fast Async WorldEdit plugin
 authors: [Empire92]
 loadbefore: [WorldEdit]
diff --git a/forge/src/main/java/com/boydti/fawe/forge/SpongeMain.java b/forge/src/main/java/com/boydti/fawe/forge/SpongeMain.java
index 02d57ad9..81521f77 100644
--- a/forge/src/main/java/com/boydti/fawe/forge/SpongeMain.java
+++ b/forge/src/main/java/com/boydti/fawe/forge/SpongeMain.java
@@ -18,7 +18,7 @@ import org.spongepowered.api.plugin.PluginContainer;
 import org.spongepowered.api.profile.GameProfileManager;
 import org.spongepowered.api.world.World;
 
-@Plugin(id = "com.boydti.fawe", name = "FastAsyncWorldEdit", description = "Lagless WorldEdit, Area restrictions, Memory mangement, Block logging", url = "https://github.com/boy0001/FastAsyncWorldedit", version = "3.3.19")
+@Plugin(id = "com.boydti.fawe", name = "FastAsyncWorldEdit", description = "Lagless WorldEdit, Area restrictions, Memory mangement, Block logging", url = "https://github.com/boy0001/FastAsyncWorldedit", version = "3.3.20")
 public class SpongeMain {
     public PluginContainer plugin;
 
diff --git a/pom.xml b/pom.xml
index f1282258..8610c1b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <artifactId>FastAsyncWorldEdit</artifactId>
-    <version>3.3.19</version>
+    <version>3.3.20</version>
     <name>FastAsyncWorldEdit</name>
     <packaging>jar</packaging>
     <build>