From ce10eb73f072d2771f978e8981486671d87679f1 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sat, 14 Jan 2017 01:24:11 -0600
Subject: [PATCH] Assign the World in WorldGenStronghold

Fixes GH-580
---
 ...sign-the-World-in-WorldGenStronghold.patch | 19 +++++++++++++++++++
 scripts/importmcdev.sh                        |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 Spigot-Server-Patches/Assign-the-World-in-WorldGenStronghold.patch

diff --git a/Spigot-Server-Patches/Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/Assign-the-World-in-WorldGenStronghold.patch
new file mode 100644
index 0000000000..b35a0adfff
--- /dev/null
+++ b/Spigot-Server-Patches/Assign-the-World-in-WorldGenStronghold.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+Date: Sat, 14 Jan 2017 01:22:07 -0600
+Subject: [PATCH] Assign the World in WorldGenStronghold
+
+
+diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
++++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
+@@ -0,0 +0,0 @@ public class WorldGenStronghold extends StructureGenerator {
+     }
+ 
+     public BlockPosition getNearestGeneratedFeature(World world, BlockPosition blockposition, boolean flag) {
++        this.g = world; // Paper
+         if (!this.b) {
+             this.c();
+             this.b = true;
+--
\ No newline at end of file
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index 998ce7d627..7898d99e6d 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -84,6 +84,7 @@ import PersistentVillage
 import RemoteControlListener
 import TileEntityEnderChest
 import TileEntityLootable
+import WorldGenStronghold
 import WorldProvider
 
 cd "$workdir/Spigot/Spigot-Server/"