Paper/nms-patches/TileEntitySign.patch

119 lines
5.2 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/TileEntitySign.java
+++ b/net/minecraft/server/TileEntitySign.java
2019-04-23 04:00:00 +02:00
@@ -3,7 +3,7 @@
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import javax.annotation.Nullable;
-public class TileEntitySign extends TileEntity {
+public class TileEntitySign extends TileEntity implements ICommandListener { // CraftBukkit - implements
2019-05-27 22:30:00 +02:00
public final IChatBaseComponent[] lines = new IChatBaseComponent[]{new ChatComponentText(""), new ChatComponentText(""), new ChatComponentText(""), new ChatComponentText("")};
2019-04-23 04:00:00 +02:00
private int c = -1;
@@ -29,6 +29,12 @@
nbttagcompound.setString("Text" + (i + 1), s);
}
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start
+ if (Boolean.getBoolean("convertLegacySigns")) {
+ nbttagcompound.setBoolean("Bukkit.isConverted", true);
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2019-05-14 02:00:00 +02:00
nbttagcompound.setString("Color", this.color.b());
2016-05-10 13:47:39 +02:00
return nbttagcompound;
}
2019-04-23 04:00:00 +02:00
@@ -39,18 +45,38 @@
2018-07-15 02:00:00 +02:00
super.load(nbttagcompound);
2019-05-14 02:00:00 +02:00
this.color = EnumColor.a(nbttagcompound.getString("Color"), EnumColor.BLACK);
+ // 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
2015-02-26 23:41:06 +01:00
+
+ boolean oldSign = Boolean.getBoolean("convertLegacySigns") && !nbttagcompound.getBoolean("Bukkit.isConverted");
2015-02-26 23:41:06 +01:00
+
for (int i = 0; i < 4; ++i) {
String s = nbttagcompound.getString("Text" + (i + 1));
2019-05-14 02:00:00 +02:00
- IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.a(s.isEmpty() ? "\"\"" : s);
+ if (s != null && s.length() > 2048) {
+ s = "\"\"";
+ }
2019-04-23 04:00:00 +02:00
+
+ try {
2019-05-14 02:00:00 +02:00
+ IChatBaseComponent ichatbasecomponent = IChatBaseComponent.ChatSerializer.a(s.isEmpty() ? "\"\"" : s);
2018-07-15 02:00:00 +02:00
- if (this.world instanceof WorldServer) {
- try {
2019-05-27 22:30:00 +02:00
- this.lines[i] = ChatComponentUtils.filterForDisplay(this.a((EntityPlayer) null), ichatbasecomponent, (Entity) null, 0);
2018-07-15 02:00:00 +02:00
- } catch (CommandSyntaxException commandsyntaxexception) {
2015-02-26 23:41:06 +01:00
+ if (oldSign) {
+ lines[i] = org.bukkit.craftbukkit.util.CraftChatMessage.fromString(s)[0];
+ continue;
+ }
+ // CraftBukkit end
+
2018-07-15 02:00:00 +02:00
+ if (this.world instanceof WorldServer) {
+ try {
2019-05-27 22:30:00 +02:00
+ this.lines[i] = ChatComponentUtils.filterForDisplay(this.a((EntityPlayer) null), ichatbasecomponent, (Entity) null, 0);
2018-07-15 02:00:00 +02:00
+ } catch (CommandSyntaxException commandsyntaxexception) {
+ this.lines[i] = ichatbasecomponent;
+ }
+ } else {
this.lines[i] = ichatbasecomponent;
}
- } else {
- this.lines[i] = ichatbasecomponent;
2016-02-29 22:32:46 +01:00
+ } catch (com.google.gson.JsonParseException jsonparseexception) {
+ this.lines[i] = new ChatComponentText(s);
}
2019-04-23 04:00:00 +02:00
this.k[i] = null;
@@ -111,11 +137,37 @@
return true;
}
2018-07-15 02:00:00 +02:00
+ // CraftBukkit start
+ @Override
2019-04-23 04:00:00 +02:00
+ public void sendMessage(IChatBaseComponent ichatbasecomponent) {}
+
+ @Override
2018-07-15 02:00:00 +02:00
+ public org.bukkit.command.CommandSender getBukkitSender(CommandListenerWrapper wrapper) {
2018-12-13 01:00:00 +01:00
+ return wrapper.getEntity() != null ? wrapper.getEntity().getBukkitSender(wrapper) : new org.bukkit.craftbukkit.command.CraftBlockCommandSender(wrapper, this);
2018-07-15 02:00:00 +02:00
+ }
2019-04-23 04:00:00 +02:00
+
+ @Override
+ public boolean shouldSendSuccess() {
+ return false;
+ }
+
+ @Override
+ public boolean shouldSendFailure() {
+ return false;
+ }
+
+ @Override
+ public boolean shouldBroadcastCommands() {
+ return false;
+ }
2018-07-15 02:00:00 +02:00
+ // CraftBukkit end
+
public CommandListenerWrapper a(@Nullable EntityPlayer entityplayer) {
String s = entityplayer == null ? "Sign" : entityplayer.getDisplayName().getString();
Object object = entityplayer == null ? new ChatComponentText("Sign") : entityplayer.getScoreboardDisplayName();
2019-04-23 04:00:00 +02:00
- return new CommandListenerWrapper(ICommandListener.DUMMY, new Vec3D((double) this.position.getX() + 0.5D, (double) this.position.getY() + 0.5D, (double) this.position.getZ() + 0.5D), Vec2F.a, (WorldServer) this.world, 2, s, (IChatBaseComponent) object, this.world.getMinecraftServer(), entityplayer);
+ // CraftBukkit - this
+ return new CommandListenerWrapper(this, new Vec3D((double) this.position.getX() + 0.5D, (double) this.position.getY() + 0.5D, (double) this.position.getZ() + 0.5D), Vec2F.a, (WorldServer) this.world, 2, s, (IChatBaseComponent) object, this.world.getMinecraftServer(), entityplayer);
}
2019-05-14 02:00:00 +02:00
public EnumColor getColor() {
@@ -126,7 +178,7 @@
if (enumcolor != this.getColor()) {
this.color = enumcolor;
this.update();
- this.world.notify(this.getPosition(), this.getBlock(), this.getBlock(), 3);
+ if (this.world != null) this.world.notify(this.getPosition(), this.getBlock(), this.getBlock(), 3); // CraftBukkit - skip notify if world is null (SPIGOT-5122)
return true;
} else {
return false;