From 3999d804cf47d1a28c6c2f1de455499d26b79b85 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Fri, 2 Sep 2016 14:15:28 +1000
Subject: [PATCH] Possible fix for #271

---
 .../java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java   | 4 +++-
 .../java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java     | 4 +++-
 .../java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java  | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java b/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
index 943f85d9..08c0317e 100644
--- a/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
+++ b/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
@@ -180,7 +180,9 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
         worlddata.checkName(name);
         final WorldServer internal = (WorldServer)new WorldServer(console, sdm, worlddata, dimension, console.methodProfiler, creator.environment(), generator).b();
         startSet(true); // Temporarily allow async chunk load since the world isn't added yet
-        internal.a(worldSettings);
+        if (worldSettings != null) {
+            internal.a(worldSettings);
+        }
         endSet(true);
         internal.scoreboard = server.getScoreboardManager().getMainScoreboard().getHandle();
         internal.tracker = new EntityTracker(internal);
diff --git a/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java b/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
index 0f3c1432..376dc123 100644
--- a/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
+++ b/bukkit18/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
@@ -584,7 +584,9 @@ public class BukkitQueue18R3 extends BukkitQueue_0<Chunk, ChunkSection[], ChunkS
         worlddata.checkName(name);
         final WorldServer internal = (WorldServer)new WorldServer(console, sdm, worlddata, dimension, console.methodProfiler, creator.environment(), generator).b();
         startSet(true); // Temporarily allow async chunk load since the world isn't added yet
-        internal.a(worldSettings);
+        if (worldSettings != null) {
+            internal.a(worldSettings);
+        }
         endSet(true);
         internal.scoreboard = server.getScoreboardManager().getMainScoreboard().getHandle();
         internal.tracker = new EntityTracker(internal);
diff --git a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java b/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
index 9a33db82..b25eeb37 100644
--- a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
+++ b/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
@@ -230,7 +230,9 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_0<Chunk, ChunkSection[], Chu
         worlddata.checkName(name);
         final WorldServer internal = (WorldServer)new WorldServer(console, sdm, worlddata, dimension, console.methodProfiler, creator.environment(), generator).b();
         startSet(true); // Temporarily allow async chunk load since the world isn't added yet
-        internal.a(worldSettings);
+        if (worldSettings != null) {
+            internal.a(worldSettings);
+        }
         endSet(true);
         internal.scoreboard = server.getScoreboardManager().getMainScoreboard().getHandle();
         internal.tracker = new EntityTracker(internal);