From 887c858b8171f81dae528004072ab31ef5807475 Mon Sep 17 00:00:00 2001
From: Brettflan <dsr@fenrisoft.com>
Date: Thu, 15 Sep 2011 01:27:45 -0500
Subject: [PATCH] Release 1.4.2: removed usage of ColouredConsoleSender, as it
 apparently can now trigger a console duping bug

---
 nbproject/build-impl.xml               |  3 ++-
 nbproject/genfiles.properties          |  4 ++--
 src/com/wimbli/WorldBorder/Config.java | 16 ++--------------
 src/plugin.yml                         |  2 +-
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 62fcc0f..85e1d33 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -861,11 +861,12 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
-            <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
+            <fileset dir="${src.src.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
                 <include name="**/*.java"/>
+                <exclude name="*.java"/>
             </fileset>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index b9b022f..b475776 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.38.3.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=7ce24f55
-nbproject/build-impl.xml.script.CRC32=83187d5f
-nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
+nbproject/build-impl.xml.script.CRC32=b6c24088
+nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
diff --git a/src/com/wimbli/WorldBorder/Config.java b/src/com/wimbli/WorldBorder/Config.java
index a1b75a5..6d8368b 100644
--- a/src/com/wimbli/WorldBorder/Config.java
+++ b/src/com/wimbli/WorldBorder/Config.java
@@ -16,9 +16,6 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.util.config.Configuration;
 import org.bukkit.util.config.ConfigurationNode;
 
-import org.bukkit.craftbukkit.command.ColouredConsoleSender;
-import org.bukkit.craftbukkit.CraftServer;
-
 import org.anjocaido.groupmanager.GroupManager;
 import com.nijiko.permissions.PermissionHandler;
 import com.nijikokun.bukkit.Permissions.Permissions;
@@ -38,7 +35,6 @@ public class Config
 	public static WorldTrimTask trimTask = null;
 	public static Set<String> movedPlayers = Collections.synchronizedSet(new HashSet<String>());
 	private static Runtime rt = Runtime.getRuntime();
-	private static ColouredConsoleSender console = null;
 	
 	// actual configuration values which can be changed
 	private static boolean shapeRound = true;
@@ -306,14 +302,7 @@ public class Config
 	private static final String logName = "WorldBorder";
 	public static void Log(Level lvl, String text)
 	{
-		if (console != null)
-		{
-			if (lvl != Level.INFO)
-				text = "[" + lvl.getLocalizedName() + "] " + text;
-			console.sendMessage(String.format("[%s] %s", logName, text));
-		}
-		else
-			mcLog.log(lvl, String.format("[%s] %s", logName, text));
+		mcLog.log(lvl, String.format("[%s] %s", logName, text));
 	}
 	public static void Log(String text)
 	{
@@ -334,8 +323,7 @@ public class Config
 	public static void load(WorldBorder master, boolean logIt)
 	{	// load config from file
 		plugin = master;
-		console = new ColouredConsoleSender((CraftServer)plugin.getServer());
-		cfg = plugin.getConfiguration();	
+		cfg = plugin.getConfiguration();
 
 		int cfgVersion = cfg.getInt("cfg-version", currentCfgVersion);
 
diff --git a/src/plugin.yml b/src/plugin.yml
index a921cb3..31a1139 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,7 +1,7 @@
 name: WorldBorder
 author: Brettflan
 description: Efficient, feature-rich plugin for limiting the size of your worlds.
-version: 1.4.1
+version: 1.4.2
 main: com.wimbli.WorldBorder.WorldBorder
 softdepend:
   - Essentials