From 114372194a8859423547ed920969d8d47faf1dfe Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Wed, 19 Feb 2014 10:01:02 -0800 Subject: [PATCH 1/3] Should be using the regular Bukkit logger for this. --- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 17579e4f..34249464 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -6,6 +6,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map.Entry; import java.util.regex.Pattern; +import java.util.logging.Logger; import me.StevenLawson.TotalFreedomMod.*; import me.StevenLawson.TotalFreedomMod.Commands.Command_landmine; import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager.RollbackEntry; @@ -33,6 +34,8 @@ public class TFM_PlayerListener implements Listener { private static final List BLOCKED_MUTED_CMDS = Arrays.asList(StringUtils.split("say,me,msg,m,tell,r,reply,mail,email", ",")); private static final int MSG_PER_HEARTBEAT = 10; + + public static final Logger log = Bukkit.getLogger(); @EventHandler(priority = EventPriority.HIGH) public void onPlayerInteract(PlayerInteractEvent event) @@ -662,7 +665,7 @@ public class TFM_PlayerListener implements Listener } // Log player quitting, because 1.7 doesn't do this - TFM_Log.info(player.getName() + " left the game."); + log.info(player.getName() + " left the game."); } @EventHandler(priority = EventPriority.MONITOR) @@ -680,6 +683,9 @@ public class TFM_PlayerListener implements Listener playerdata.regenerateHistory(); playerdata.clearHistory(); } + + // Log player quitting, because 1.7 doesn't do this + log.info(player.getName() + " left the game."); } @EventHandler(priority = EventPriority.MONITOR) @@ -693,7 +699,7 @@ public class TFM_PlayerListener implements Listener final String IP = player.getAddress().getAddress().getHostAddress().trim(); // Log join message, as 1.7 doesn't log it anymore - TFM_Log.info(player.getName() + " joined the game with IP address: " + IP); + log.info(player.getName() + " joined the game with IP address: " + IP); TFM_UserList.getInstance(TotalFreedomMod.plugin).addUser(player); From 1c14889bdf98a3e1ae442adfc222ad75a9949e15 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Wed, 19 Feb 2014 10:10:29 -0800 Subject: [PATCH 2/3] Prefix player join/exit. --- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 34249464..1e499099 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -665,7 +665,7 @@ public class TFM_PlayerListener implements Listener } // Log player quitting, because 1.7 doesn't do this - log.info(player.getName() + " left the game."); + log.info("[EXIT] " + player.getName() + " left the game."); } @EventHandler(priority = EventPriority.MONITOR) @@ -685,7 +685,7 @@ public class TFM_PlayerListener implements Listener } // Log player quitting, because 1.7 doesn't do this - log.info(player.getName() + " left the game."); + log.info("[EXIT] " + player.getName() + " left the game."); } @EventHandler(priority = EventPriority.MONITOR) @@ -699,7 +699,7 @@ public class TFM_PlayerListener implements Listener final String IP = player.getAddress().getAddress().getHostAddress().trim(); // Log join message, as 1.7 doesn't log it anymore - log.info(player.getName() + " joined the game with IP address: " + IP); + log.info("[JOIN] " + player.getName() + " joined the game with IP address: " + IP); TFM_UserList.getInstance(TotalFreedomMod.plugin).addUser(player); From fbca5f052702784bbfeb9c27a1c03f136ab692c0 Mon Sep 17 00:00:00 2001 From: Wilee999 Date: Wed, 19 Feb 2014 11:28:09 -0800 Subject: [PATCH 3/3] Raw... --- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 1e499099..99d3aa43 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -6,7 +6,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map.Entry; import java.util.regex.Pattern; -import java.util.logging.Logger; import me.StevenLawson.TotalFreedomMod.*; import me.StevenLawson.TotalFreedomMod.Commands.Command_landmine; import me.StevenLawson.TotalFreedomMod.TFM_RollbackManager.RollbackEntry; @@ -34,8 +33,6 @@ public class TFM_PlayerListener implements Listener { private static final List BLOCKED_MUTED_CMDS = Arrays.asList(StringUtils.split("say,me,msg,m,tell,r,reply,mail,email", ",")); private static final int MSG_PER_HEARTBEAT = 10; - - public static final Logger log = Bukkit.getLogger(); @EventHandler(priority = EventPriority.HIGH) public void onPlayerInteract(PlayerInteractEvent event) @@ -665,7 +662,7 @@ public class TFM_PlayerListener implements Listener } // Log player quitting, because 1.7 doesn't do this - log.info("[EXIT] " + player.getName() + " left the game."); + TFM_Log.info("[EXIT] " + player.getName() + " left the game.", true); } @EventHandler(priority = EventPriority.MONITOR) @@ -685,7 +682,7 @@ public class TFM_PlayerListener implements Listener } // Log player quitting, because 1.7 doesn't do this - log.info("[EXIT] " + player.getName() + " left the game."); + TFM_Log.info("[EXIT] " + player.getName() + " left the game.", true); } @EventHandler(priority = EventPriority.MONITOR) @@ -699,7 +696,7 @@ public class TFM_PlayerListener implements Listener final String IP = player.getAddress().getAddress().getHostAddress().trim(); // Log join message, as 1.7 doesn't log it anymore - log.info("[JOIN] " + player.getName() + " joined the game with IP address: " + IP); + TFM_Log.info("[JOIN] " + player.getName() + " joined the game with IP address: " + IP, true); TFM_UserList.getInstance(TotalFreedomMod.plugin).addUser(player);