2019-06-25 21:18:50 +02:00
From cd69e9e378344e8dc74dbc6c16193fb4bed87c7b Mon Sep 17 00:00:00 2001
2018-07-16 22:08:09 +02:00
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
2019-06-25 21:18:50 +02:00
index 7bcd9786a2..775ec63890 100644
2018-07-16 22:08:09 +02:00
--- a/src/main/java/net/minecraft/server/DefinedStructure.java
+++ b/src/main/java/net/minecraft/server/DefinedStructure.java
2019-04-27 08:26:04 +02:00
@@ -203,9 +203,11 @@ public class DefinedStructure {
definedstructure_blockinfo.c.setInt("x", blockposition1.getX());
definedstructure_blockinfo.c.setInt("y", blockposition1.getY());
definedstructure_blockinfo.c.setInt("z", blockposition1.getZ());
+ tileentity.isLoadingStructure = true; // Paper
tileentity.load(definedstructure_blockinfo.c);
tileentity.a(definedstructureinfo.c());
tileentity.a(definedstructureinfo.d());
+ tileentity.isLoadingStructure = false; // Paper
2018-07-16 22:08:09 +02:00
}
2019-04-27 08:26:04 +02:00
}
2018-07-16 22:08:09 +02:00
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
2019-06-25 21:18:50 +02:00
index e79e256138..5e495a4b8c 100644
2018-07-16 22:08:09 +02:00
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
2019-05-14 04:20:58 +02:00
@@ -20,6 +20,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
2019-05-06 04:58:04 +02:00
public final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
// CraftBukkit end
2019-04-27 08:26:04 +02:00
private static final Logger LOGGER = LogManager.getLogger();
2018-07-16 22:08:09 +02:00
+ boolean isLoadingStructure = false; // Paper
2019-04-27 08:26:04 +02:00
private final TileEntityTypes<?> b; public TileEntityTypes getTileEntityType() { return b; } // Paper - OBFHELPER
@Nullable
2018-07-16 22:08:09 +02:00
protected World world;
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
2019-06-06 17:36:57 +02:00
index a8f0aae9ea..2c6ce5bae0 100644
2018-07-16 22:08:09 +02:00
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
2019-04-27 08:26:04 +02:00
@@ -58,13 +58,14 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
2018-07-16 22:08:09 +02:00
}
try {
2019-05-14 04:20:58 +02:00
- IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.a(s.isEmpty() ? "\"\"" : s);
+ //IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.a(s.isEmpty() ? "\"\"" : s); // Paper - move down - the old format might throw a json error
2018-07-16 22:08:09 +02:00
- 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
2019-05-14 04:20:58 +02:00
+ IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.a(s.isEmpty() ? "\"\"" : s); // Paper - after old sign
2018-07-16 22:08:09 +02:00
if (this.world instanceof WorldServer) {
try {
--
2019-06-25 21:18:50 +02:00
2.22.0
2018-07-16 22:08:09 +02:00