Added the ability to set the quit message

This commit is contained in:
Raphfrk 2011-04-02 15:42:11 +01:00 committed by Erik Broes
parent c84d51f458
commit 121bcd5adc
2 changed files with 8 additions and 4 deletions

View file

@ -500,8 +500,10 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
// CraftBukkit start -- rarely it would send a disconnect line twice // CraftBukkit start -- rarely it would send a disconnect line twice
if (!this.c) { if (!this.c) {
a.info(this.e.name + " lost connection: " + s); a.info(this.e.name + " lost connection: " + s);
this.d.f.a((Packet) (new Packet3Chat("\u00A7e" + this.e.name + " left the game."))); String quitMessage = this.d.f.c(this.e);
this.d.f.c(this.e); if (quitMessage != null) {
this.d.f.a((Packet) (new Packet3Chat(quitMessage)));
}
} }
// CraftBukkit end // CraftBukkit end
this.c = true; this.c = true;

View file

@ -111,14 +111,16 @@ public class ServerConfigurationManager {
((WorldServer) entityplayer.world).manager.c(entityplayer); // CraftBukkit ((WorldServer) entityplayer.world).manager.c(entityplayer); // CraftBukkit
} }
public void c(EntityPlayer entityplayer) { public String c(EntityPlayer entityplayer) { // CraftBukkit - changed return type
this.n.a(entityplayer); this.n.a(entityplayer);
entityplayer.world.d(entityplayer); // CraftBukkit entityplayer.world.d(entityplayer); // CraftBukkit
this.b.remove(entityplayer); this.b.remove(entityplayer);
// CraftBukkit start // CraftBukkit start
((WorldServer) entityplayer.world).manager.b(entityplayer); ((WorldServer) entityplayer.world).manager.b(entityplayer);
server.getPluginManager().callEvent(new PlayerQuitEvent(server.getPlayer(entityplayer))); // CraftBukkit PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(server.getPlayer(entityplayer), "\u00A7e" + entityplayer.name + " left the game.");
server.getPluginManager().callEvent(playerQuitEvent);
return playerQuitEvent.getQuitMessage();
// CraftBukkit end // CraftBukkit end
} }