From 2778f5e4851d21ea27ce92d119b271b1d0331606 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 2 Jun 2015 02:08:51 -0700 Subject: [PATCH] Fix another structure generator NPE --- Spigot-Server-Patches/Generator-Settings.patch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Spigot-Server-Patches/Generator-Settings.patch b/Spigot-Server-Patches/Generator-Settings.patch index de72b940ba..866d13dfe3 100644 --- a/Spigot-Server-Patches/Generator-Settings.patch +++ b/Spigot-Server-Patches/Generator-Settings.patch @@ -234,6 +234,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.a(this.c); return this.c(blockposition) != null; } +@@ -0,0 +0,0 @@ public abstract class StructureGenerator extends WorldGenBase { + } + + public boolean a(World world, BlockPosition blockposition) { ++ if (this.c == null) return false; // PaperSpigot + this.a(world); + Iterator iterator = this.e.values().iterator(); + diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java