Upstream/WorldBorder
1
0
Fork 0
mirror of https://github.com/Brettflan/WorldBorder.git synced 2024-11-26 12:05:26 +01:00
Code Issues Projects Releases Wiki Activity

Release 1.4.2: removed usage of ColouredConsoleSender, as it apparently can now trigger a console duping bug

Browse Source
This commit is contained in:
Brettflan 2011-09-15 01:27:45 -05:00
parent f24c676c18
commit 887c858b81
4 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nbproject/build-impl.xml
View File

@ -861,11 +861,12 @@ is divided into following sections:
<classpath> <classpath>
<path path="${javac.classpath}"/> <path path="${javac.classpath}"/>
</classpath> </classpath>
<fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}"> <fileset dir="${src.src.dir}" excludes="*.java,${excludes}" includes="${includes}">
<filename name="**/*.java"/> <filename name="**/*.java"/>
</fileset> </fileset>
<fileset dir="${build.generated.sources.dir}" erroronmissingdir="false"> <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
<include name="**/*.java"/> <include name="**/*.java"/>
<exclude name="*.java"/>
</fileset> </fileset>
</javadoc> </javadoc>
<copy todir="${dist.javadoc.dir}"> <copy todir="${dist.javadoc.dir}">

4
nbproject/genfiles.properties
View File

@ -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. # 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. # 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.data.CRC32=7ce24f55
nbproject/build-impl.xml.script.CRC32=83187d5f nbproject/build-impl.xml.script.CRC32=b6c24088
nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45

14
src/com/wimbli/WorldBorder/Config.java
View File

@ -16,9 +16,6 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.util.config.Configuration; import org.bukkit.util.config.Configuration;
import org.bukkit.util.config.ConfigurationNode; import org.bukkit.util.config.ConfigurationNode;
import org.bukkit.craftbukkit.command.ColouredConsoleSender;
import org.bukkit.craftbukkit.CraftServer;
import org.anjocaido.groupmanager.GroupManager; import org.anjocaido.groupmanager.GroupManager;
import com.nijiko.permissions.PermissionHandler; import com.nijiko.permissions.PermissionHandler;
import com.nijikokun.bukkit.Permissions.Permissions; import com.nijikokun.bukkit.Permissions.Permissions;
@ -38,7 +35,6 @@ public class Config
public static WorldTrimTask trimTask = null; public static WorldTrimTask trimTask = null;
public static Set<String> movedPlayers = Collections.synchronizedSet(new HashSet<String>()); public static Set<String> movedPlayers = Collections.synchronizedSet(new HashSet<String>());
private static Runtime rt = Runtime.getRuntime(); private static Runtime rt = Runtime.getRuntime();
private static ColouredConsoleSender console = null;
// actual configuration values which can be changed // actual configuration values which can be changed
private static boolean shapeRound = true; private static boolean shapeRound = true;
@ -306,14 +302,7 @@ public class Config
private static final String logName = "WorldBorder"; private static final String logName = "WorldBorder";
public static void Log(Level lvl, String text) public static void Log(Level lvl, String text)
{ {
if (console != null) mcLog.log(lvl, String.format("[%s] %s", logName, text));
{
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));
} }
public static void Log(String text) public static void Log(String text)
{ {
@ -334,7 +323,6 @@ public class Config
public static void load(WorldBorder master, boolean logIt) public static void load(WorldBorder master, boolean logIt)
{ // load config from file { // load config from file
plugin = master; plugin = master;
console = new ColouredConsoleSender((CraftServer)plugin.getServer());
cfg = plugin.getConfiguration(); cfg = plugin.getConfiguration();
int cfgVersion = cfg.getInt("cfg-version", currentCfgVersion); int cfgVersion = cfg.getInt("cfg-version", currentCfgVersion);

2
src/plugin.yml
View File

@ -1,7 +1,7 @@
name: WorldBorder name: WorldBorder
author: Brettflan author: Brettflan
description: Efficient, feature-rich plugin for limiting the size of your worlds. 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 main: com.wimbli.WorldBorder.WorldBorder
softdepend: softdepend:
- Essentials - Essentials