From 02af1ff93f5528e9046fad51824ff6745ce93bbe Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 21 Feb 2016 19:22:37 +1100 Subject: [PATCH] SPIGOT-1499: Outdated server message not working --- CraftBukkit-Patches/0029-Configurable-Messages.patch | 4 ++-- CraftBukkit-Patches/0110-Convert-player-skulls-async.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CraftBukkit-Patches/0029-Configurable-Messages.patch b/CraftBukkit-Patches/0029-Configurable-Messages.patch index 36ea43789..fc1287459 100644 --- a/CraftBukkit-Patches/0029-Configurable-Messages.patch +++ b/CraftBukkit-Patches/0029-Configurable-Messages.patch @@ -13,12 +13,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (packethandshakinginsetprotocol.b() > 47) { - chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.8"); -+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.8" ) ); // Spigot ++ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage.replaceAll("'", "''"), "1.8.8" ) ); // Spigot this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); this.b.close(chatcomponenttext); } else if (packethandshakinginsetprotocol.b() < 47) { - chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.8"); -+ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.8" ) ); // Spigot ++ chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage.replaceAll("'", "''"), "1.8.8" ) ); // Spigot this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext)); this.b.close(chatcomponenttext); } else { diff --git a/CraftBukkit-Patches/0110-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0110-Convert-player-skulls-async.patch index b0f54d178..8ee90c026 100644 --- a/CraftBukkit-Patches/0110-Convert-player-skulls-async.patch +++ b/CraftBukkit-Patches/0110-Convert-player-skulls-async.patch @@ -206,7 +206,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + void applyToItem(final NBTTagCompound tag) { // Spigot - make final super.applyToItem(tag); - if (hasOwner()) { + if (profile != null) { NBTTagCompound owner = new NBTTagCompound(); GameProfileSerializer.serialize(owner, profile); - tag.set(SKULL_OWNER.NBT, owner);