From ba61e44475929768c4558a8a60fe514b5a1cae9a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 22 Jun 2016 22:56:57 -0400
Subject: [PATCH] Fix Old Sign Conversion

    1) Sign loading code was trying to parse the JSON before the check for oldSign.
       That code could then skip the old sign converting code if it triggers a JSON parse exception.
    2) New Mojang Schematic system has Tile Entities in the new converted format, but missing the Bukkit.isConverted flag
       This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures
---
 .../Fix-Old-Sign-Conversion.patch             | 69 +++++++++++++++++++
 scripts/importmcdev.sh                        |  1 +
 2 files changed, 70 insertions(+)
 create mode 100644 Spigot-Server-Patches/Fix-Old-Sign-Conversion.patch

diff --git a/Spigot-Server-Patches/Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/Fix-Old-Sign-Conversion.patch
new file mode 100644
index 0000000000..5d81b5ce3c
--- /dev/null
+++ b/Spigot-Server-Patches/Fix-Old-Sign-Conversion.patch
@@ -0,0 +1,69 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Fri, 17 Jun 2016 20:50:11 -0400
+Subject: [PATCH] Fix Old Sign Conversion
+
+1) Sign loading code was trying to parse the JSON before the check for oldSign.
+   That code could then skip the old sign converting code if it triggers a JSON parse exception.
+2) New Mojang Schematic system has Tile Entities in the new converted format, but missing the Bukkit.isConverted flag
+   This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures
+
+diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/DefinedStructure.java
++++ b/src/main/java/net/minecraft/server/DefinedStructure.java
+@@ -0,0 +0,0 @@ public class DefinedStructure {
+                                 definedstructure_blockinfo1.c.setInt("x", blockposition1.getX());
+                                 definedstructure_blockinfo1.c.setInt("y", blockposition1.getY());
+                                 definedstructure_blockinfo1.c.setInt("z", blockposition1.getZ());
++                                tileentity.isLoadingStructure = true; // Paper
+                                 tileentity.a(definedstructure_blockinfo1.c);
+                                 tileentity.a(definedstructureinfo.b());
+                                 tileentity.a(definedstructureinfo.c());
++                                tileentity.isLoadingStructure = false; // Paper
+                             }
+                         }
+                     }
+@@ -0,0 +0,0 @@ public class DefinedStructure {
+         public IBlockData a(int i) {
+             IBlockData iblockdata = (IBlockData) this.b.fromId(i);
+ 
+-            return iblockdata == null ? DefinedStructure.a.a : iblockdata;
++            return iblockdata == null ? a : iblockdata; // Paper - decompile error - Blocks.AIR.getBlockData()
+         }
+ 
+         public Iterator<IBlockData> iterator() {
+diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/TileEntity.java
++++ b/src/main/java/net/minecraft/server/TileEntity.java
+@@ -0,0 +0,0 @@ import org.bukkit.inventory.InventoryHolder; // CraftBukkit
+ public abstract class TileEntity {
+ 
+     public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper
++    boolean isLoadingStructure = false; // Paper
+     private static final Logger a = LogManager.getLogger();
+     private static final Map<String, Class<? extends TileEntity>> f = Maps.newHashMap();
+     private static final Map<Class<? extends TileEntity>, String> g = Maps.newHashMap();
+diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/TileEntitySign.java
++++ b/src/main/java/net/minecraft/server/TileEntitySign.java
+@@ -0,0 +0,0 @@ public class TileEntitySign extends TileEntity {
+             }
+ 
+             try {
+-                IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.a(s);
++                //IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.a(s); // Paper - move down - the old format might throw a json error
+ 
+-                if (oldSign) {
++                if (oldSign && !isLoadingStructure) { // Paper - saved structures will be in the new format, but will not have isConverted
+                     lines[i] = org.bukkit.craftbukkit.util.CraftChatMessage.fromString(s)[0];
+                     continue;
+                 }
+                 // CraftBukkit end
++                IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.a(s); // Paper - after old sign
+ 
+                 try {
+                     this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
+--
\ No newline at end of file
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index bf887323be..6e72cf4bc7 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -53,6 +53,7 @@ import CommandScoreboard
 import CommandWhitelist
 import DataBits
 import DataConverterMaterialId
+import DefinedStructure
 import EULA
 import EntitySquid
 import EntityWaterAnimal