From aa86f4829aa2209ebd14cea8a5e43ca04737dde1 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.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 | 21 +++++++++++++++++++
 scripts/importmcdev.sh                        |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 Spigot-Server-Patches/0206-Assign-the-World-in-WorldGenStronghold.patch

diff --git a/Spigot-Server-Patches/0206-Assign-the-World-in-WorldGenStronghold.patch b/Spigot-Server-Patches/0206-Assign-the-World-in-WorldGenStronghold.patch
new file mode 100644
index 0000000000..818f1bba14
--- /dev/null
+++ b/Spigot-Server-Patches/0206-Assign-the-World-in-WorldGenStronghold.patch
@@ -0,0 +1,21 @@
+From 2c920428190a7cd077e69044fb770862c62e3c86 Mon Sep 17 00:00:00 2001
+From: Zach Brown <zach.brown@destroystokyo.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 c937547..a3b958e 100644
+--- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
++++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
+@@ -56,6 +56,7 @@ 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;
+-- 
+2.9.3
+
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/"