diff --git a/src/main/java/com/sk89q/worldguard/TickSyncDelayLoggerFilter.java b/src/main/java/com/sk89q/worldguard/TickSyncDelayLoggerFilter.java deleted file mode 100644 index 5aaebe56..00000000 --- a/src/main/java/com/sk89q/worldguard/TickSyncDelayLoggerFilter.java +++ /dev/null @@ -1,35 +0,0 @@ -// $Id$ -/* - * WorldGuard - * Copyright (C) 2010 sk89q - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . -*/ - -package com.sk89q.worldguard; - -import java.util.logging.Filter; -import java.util.logging.Level; -import java.util.logging.LogRecord; - -public class TickSyncDelayLoggerFilter implements Filter { - public boolean isLoggable(LogRecord record) { - if (record.getLevel() == Level.WARNING - && record.getMessage().equals("Can't keep up! Did the system time change, or is the server overloaded?")) { - return false; - } - - return true; - } -} diff --git a/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java b/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java index a61d443c..257e2f96 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java @@ -93,7 +93,6 @@ public class ConfigurationManager { private boolean hasCommandBookGodMode = false; - public boolean suppressTickSyncWarnings; public boolean useRegionsScheduler; public boolean activityHaltToggle = false; public boolean autoGodMode; @@ -132,9 +131,8 @@ public void load() { plugin.getLogger().severe("Error reading configuration for global config: "); e.printStackTrace(); } - - suppressTickSyncWarnings = config.getBoolean( - "suppress-tick-sync-warnings", false); + + config.removeProperty("suppress-tick-sync-warnings"); useRegionsScheduler = config.getBoolean( "regions.use-scheduler", true); autoGodMode = config.getBoolean( diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java index 8c69c77b..b8124ac2 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java @@ -49,7 +49,6 @@ import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldguard.LocalPlayer; -import com.sk89q.worldguard.TickSyncDelayLoggerFilter; import com.sk89q.worldguard.bukkit.commands.GeneralCommands; import com.sk89q.worldguard.bukkit.commands.ProtectionCommands; import com.sk89q.worldguard.bukkit.commands.ToggleCommands; @@ -147,16 +146,6 @@ public void run() { getServer().getScheduler().scheduleAsyncRepeatingTask(this, flagStateManager, FlagStateManager.RUN_DELAY, FlagStateManager.RUN_DELAY); } - if (configuration.suppressTickSyncWarnings) { - Logger.getLogger("Minecraft").setFilter( - new TickSyncDelayLoggerFilter()); - } else { - Filter filter = Logger.getLogger("Minecraft").getFilter(); - if (filter != null && filter instanceof TickSyncDelayLoggerFilter) { - Logger.getLogger("Minecraft").setFilter(null); - } - } - // Register events (new WorldGuardPlayerListener(this)).registerEvents(); (new WorldGuardBlockListener(this)).registerEvents();