mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-02 13:07:06 +01:00
57dd397155
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b999860d SPIGOT-2304: Add LootGenerateEvent CraftBukkit Changes:77fd87e4SPIGOT-2304: Implement LootGenerateEventa1a705eeSPIGOT-5566: Doused campfires & fires should call EntityChangeBlockEvent41712eddSPIGOT-5707: PersistentDataHolder not Persistent on API dropped Item
62 lines
3.7 KiB
Diff
62 lines
3.7 KiB
Diff
From 8ee372396e90b9726ce78e193b6215290e45300a 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 dad966825d..8c411ff074 100644
|
|
--- a/src/main/java/net/minecraft/server/DefinedStructure.java
|
|
+++ b/src/main/java/net/minecraft/server/DefinedStructure.java
|
|
@@ -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
|
|
}
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
|
|
index e2f3cec742..630b279158 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
|
@@ -20,6 +20,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
|
|
public CraftPersistentDataContainer persistentDataContainer;
|
|
// CraftBukkit end
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
|
+ boolean isLoadingStructure = false; // Paper
|
|
private final TileEntityTypes<?> tileType; public TileEntityTypes getTileEntityType() { return tileType; } // Paper - OBFHELPER
|
|
@Nullable
|
|
protected World world;
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
|
|
index 4a48c09e96..03f6ddf000 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
|
|
@@ -55,13 +55,14 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
|
|
}
|
|
|
|
try {
|
|
- 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
|
|
|
|
- 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.isEmpty() ? "\"\"" : s); // Paper - after old sign
|
|
|
|
if (this.world instanceof WorldServer) {
|
|
try {
|
|
--
|
|
2.26.2
|
|
|