Add a custom shutdown message set in bukkit.yml. Addresses BUKKIT-3031

This commit is contained in:
feildmaster
2012-12-03 19:32:44 -06:00
parent 320712aba7
commit fb6d9e1808
4 changed files with 12 additions and 4 deletions

View File

@@ -142,7 +142,10 @@ public class NetServerHandler extends NetHandler {
String leaveMessage = "\u00A7e" + this.player.name + " left the game.";
PlayerKickEvent event = new PlayerKickEvent(this.server.getPlayer(this.player), s, leaveMessage);
this.server.getPluginManager().callEvent(event);
if (this.server.getServer().isRunning()) {
this.server.getPluginManager().callEvent(event);
}
if (event.isCancelled()) {
// Do not kick the player

View File

@@ -824,7 +824,7 @@ public abstract class ServerConfigurationManagerAbstract {
public void r() {
while (!this.players.isEmpty()) {
((EntityPlayer) this.players.get(0)).netServerHandler.disconnect("Server closed");
((EntityPlayer) this.players.get(0)).netServerHandler.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message
}
}
}