Added ability to disable the join/leave notices by setting the message to null in the event. The join message is moved to the onJoinEvent rather than during login

1 files changed, 4 insertions, 1 deletions

diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 1ea515cc..ba060ff8 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -90,7 +90,10 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
         // Send the possibly modified leave message
         this.b.a((Packet) (new Packet255KickDisconnect( event.getReason() )));
         this.b.c();
-        this.d.f.a((Packet) (new Packet3Chat( event.getLeaveMessage() )));
+        leaveMessage = event.getLeaveMessage();
+        if (leaveMessage != null) {
+            this.d.f.a((Packet) (new Packet3Chat(leaveMessage)));
+        }
         // CraftBukkit end
 
         this.d.f.c(this.e);