From b89ccb2d5530e728460623b3685a3056ecbd915c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 4 Apr 2014 13:37:45 +0200 Subject: [PATCH] Fixed duplicate messages in console and telnet --- buildnumber.properties | 4 ++-- .../TotalFreedomMod/Listener/TFM_PlayerListener.java | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index df06ccf5..04ada3a7 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Fri Mar 21 11:38:49 CET 2014 -build.number=705 +#Fri Apr 04 13:36:06 CEST 2014 +build.number=706 diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index 99d3aa43..73ad2ca9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -454,10 +454,10 @@ public class TFM_PlayerListener implements Listener final Player player = event.getPlayer(); String message = event.getMessage().trim(); - TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); + final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); // Check for spam - Long lastRan = TFM_Heartbeat.getLastRan(); + final Long lastRan = TFM_Heartbeat.getLastRan(); if (lastRan == null || lastRan + TotalFreedomMod.HEARTBEAT_RATE * 1000L < System.currentTimeMillis()) { //TFM_Log.warning("Heartbeat service timeout - can't check block place/break rates."); @@ -537,9 +537,6 @@ public class TFM_PlayerListener implements Listener // Finally, set message event.setMessage(message); - // Broadcast it to console (since 1.7 doesn't do that anymore) - TFM_Log.info(String.format(event.getFormat(), player.getDisplayName(), event.getMessage()), true); - // Set the tag if (playerdata.getTag() != null) { @@ -680,7 +677,7 @@ public class TFM_PlayerListener implements Listener playerdata.regenerateHistory(); playerdata.clearHistory(); } - + // Log player quitting, because 1.7 doesn't do this TFM_Log.info("[EXIT] " + player.getName() + " left the game.", true); }