From 51a056ecd5820ff24a87f0c20a05024f68275224 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Fri, 20 Jan 2012 16:03:15 +0000 Subject: Disallow colour names in offline-mode. This fixes BUKKIT-439. Thanks to cainfool for the discovery. --- src/main/java/net/minecraft/server/NetLoginHandler.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/main/java') diff --git a/src/main/java/net/minecraft/server/NetLoginHandler.java b/src/main/java/net/minecraft/server/NetLoginHandler.java index e3494c05..82e3804c 100644 --- a/src/main/java/net/minecraft/server/NetLoginHandler.java +++ b/src/main/java/net/minecraft/server/NetLoginHandler.java @@ -6,6 +6,7 @@ import java.util.Random; import java.util.logging.Logger; // CraftBukkit start +import org.bukkit.ChatColor; import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.event.server.ServerListPingEvent; // CraftBukkit end @@ -77,6 +78,12 @@ public class NetLoginHandler extends NetHandler { } } else { if (!this.server.onlineMode) { + // CraftBukkit start - disallow colour in names + if (!packet1login.name.equals(ChatColor.stripColor(packet1login.name))) { + this.disconnect("Colourful names are not permitted!"); + return; + } + // CraftBukkit end this.b(packet1login); } else { (new ThreadLoginVerifier(this, packet1login, this.server.server)).start(); // CraftBukkit -- cgit v1.2.3