From 58db4030118cb0877dc9f0851676c782e5d67e6b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 May 2019 21:53:54 +1000
Subject: [PATCH] SPIGOT-4916: Fix loading legacy structure data

---
 nms-patches/IChunkLoader.patch | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nms-patches/IChunkLoader.patch b/nms-patches/IChunkLoader.patch
index 27666cca0c..a70e9f1dbb 100644
--- a/nms-patches/IChunkLoader.patch
+++ b/nms-patches/IChunkLoader.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/IChunkLoader.java
 +++ b/net/minecraft/server/IChunkLoader.java
-@@ -17,10 +17,51 @@
+@@ -17,15 +17,56 @@
          this.b = datafixer;
      }
  
@@ -53,3 +53,9 @@
          if (i < 1493) {
              nbttagcompound = GameProfileSerializer.a(this.b, DataFixTypes.CHUNK, nbttagcompound, i, 1493);
              if (nbttagcompound.getCompound("Level").getBoolean("hasLegacyStructureData")) {
+                 if (this.a == null) {
+-                    this.a = PersistentStructureLegacy.a(dimensionmanager, (WorldPersistentData) supplier.get());
++                    this.a = PersistentStructureLegacy.a(dimensionmanager.getType(), (WorldPersistentData) supplier.get()); // CraftBukkit - getType
+                 }
+ 
+                 nbttagcompound = this.a.a(nbttagcompound);