56 lines
2.3 KiB
Diff
56 lines
2.3 KiB
Diff
|
--- a/net/minecraft/server/TileEntitySign.java
|
||
|
|
+++ b/net/minecraft/server/TileEntitySign.java
|
||
|
|
@@ -21,6 +21,12 @@
|
||
|
|
nbttagcompound.setString("Text" + (i + 1), s);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ if (Boolean.getBoolean("convertLegacySigns")) {
|
||
|
|
+ nbttagcompound.setBoolean("Bukkit.isConverted", true);
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
+
|
||
|
|
this.i.b(nbttagcompound);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -65,12 +71,27 @@
|
||
|
|
public void a(CommandObjectiveExecutor.EnumCommandResult commandobjectiveexecutor_enumcommandresult, int i) {}
|
||
|
|
};
|
||
|
|
|
||
|
|
+ // CraftBukkit start - Add an option to convert signs correctly
|
||
|
|
+ // This is done with a flag instead of all the time because
|
||
|
|
+ // we have no way to tell whether a sign is from 1.7.10 or 1.8
|
||
|
|
+
|
||
|
|
+ boolean oldSign = Boolean.getBoolean("convertLegacySigns") && !nbttagcompound.getBoolean("Bukkit.isConverted");
|
||
|
|
+
|
||
|
|
for (int i = 0; i < 4; ++i) {
|
||
|
|
String s = nbttagcompound.getString("Text" + (i + 1));
|
||
|
|
+ if (s != null && s.length() > 2048) {
|
||
|
|
+ s = "\"\"";
|
||
|
|
+ }
|
||
|
|
|
||
|
|
try {
|
||
|
|
IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.a(s);
|
||
|
|
|
||
|
|
+ if (oldSign) {
|
||
|
|
+ lines[i] = org.bukkit.craftbukkit.util.CraftChatMessage.fromString(s)[0];
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
+
|
||
|
|
try {
|
||
|
|
this.lines[i] = ChatComponentUtils.filterForDisplay(icommandlistener, ichatbasecomponent, (Entity) null);
|
||
|
|
} catch (CommandException commandexception) {
|
||
|
|
@@ -155,7 +176,10 @@
|
||
|
|
ChatClickable chatclickable = chatmodifier.h();
|
||
|
|
|
||
|
|
if (chatclickable.a() == ChatClickable.EnumClickAction.RUN_COMMAND) {
|
||
|
|
- MinecraftServer.getServer().getCommandHandler().a(icommandlistener, chatclickable.b());
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ // MinecraftServer.getServer().getCommandHandler().a(tileentitysignplayerwrapper, chatclickable.b());
|
||
|
|
+ CommandBlockListenerAbstract.executeCommand(entityhuman, (org.bukkit.entity.Player) entityhuman.getBukkitEntity(), chatclickable.b());
|
||
|
|
+ // CraftBukkit end
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|