Partly completes #71 and allows server admins to change 'Left the ser…

…ver' Eventually when #82 is done (which will require custom console checks) we will also have msgDisconnectEndOfStream, msgDisconnectTimeout, msgDisconnectOverflow and msgDisconnectGenericReason
WMCAlliance · Jul 31, 2013 · ca2c3d7 · ca2c3d7
1 parent b3b2c71
commit ca2c3d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/com/Jdbye/BukkitIRCd/IRCd.java b/src/com/Jdbye/BukkitIRCd/IRCd.java
@@ -130,6 +130,7 @@ public class IRCd implements Runnable {
 	public static String msgIRCMessageDynmap = "<{User}> {Message}";
 	public static String msgIRCNoticeDynmap = "-{User}- {Message}";
 	public static String msgDynmapMessage = "[Dynmap] {User}: {Message}";
+	public static String msgDisconnectQuitting = "Left the server";
 	public static String msgPlayerList = "^BOnline Players ({Count}):^B {Users}";
 
 	public static final long serverStartTime = System.currentTimeMillis() / 1000L;
@@ -1938,9 +1939,9 @@ public static boolean removeBukkitUser(int ID) {
 				BukkitPlayer bp = bukkitPlayers.get(ID);
 				if (mode == Modes.STANDALONE) {
 					writeAll(":" + bp.nick + Config.getIrcdIngameSuffix() + "!" + bp.nick + "@"
-							+ bp.host + " QUIT :Left the server");
+							+ bp.host + " QUIT :" + msgDisconnectQuitting);
 				} else if (mode == Modes.INSPIRCD) {
-					println(":" + bp.getUID() + " QUIT :Left the server");
+					println(":" + bp.getUID() + " QUIT :" + msgDisconnectQuitting);
 				}
 				bukkitPlayers.remove(ID);
 				return true;

diff --git a/src/com/Jdbye/BukkitIRCd/configuration/Messages.java b/src/com/Jdbye/BukkitIRCd/configuration/Messages.java
@@ -78,6 +78,7 @@ public static void loadMessages(IRCd ircd) {
 			IRCd.msgIRCNoticeDynmap = messages.getString("irc-notice-dynmap", IRCd.msgIRCNoticeDynmap);
 
 			IRCd.msgDynmapMessage = messages.getString("dynmap-message", IRCd.msgDynmapMessage);
+			IRCd.msgDisconnectQuitting = messages.getString("leave", IRCd.msgDisconnectQuitting);
 			IRCd.msgPlayerList = messages.getString("player-list", IRCd.msgPlayerList);
 
 			IRCd.consoleFilters = messages.getStringList("console-filters");
@@ -115,6 +116,7 @@ public static void loadMessages(IRCd ircd) {
 			IRCd.msgIRCMessageDynmap = BukkitIRCdPlugin.colorize(IRCd.msgIRCMessageDynmap);
 			IRCd.msgIRCNoticeDynmap = BukkitIRCdPlugin.colorize(IRCd.msgIRCNoticeDynmap);
 			IRCd.msgDynmapMessage = BukkitIRCdPlugin.colorize(IRCd.msgDynmapMessage);
+			IRCd.msgDisconnectQuitting = BukkitIRCdPlugin.colorize(IRCd.msgDisconnectQuitting);
 			IRCd.msgPlayerList = BukkitIRCdPlugin.colorize(IRCd.msgPlayerList);
 
 			BukkitIRCdPlugin.log.info("[BukkitIRCd] Loaded messages file." + (Config.isDebugModeEnabled() ? " Code BukkitIRCdPlugin464." : ""));