Merge branch 'master' into release

Xesxen's Dutch translation.

.gitignore

@@ -25,4 +25,7 @@
 /EssentialsProtect/build/
 /EssentialsPermissionsCommands/nbproject/private/
 /EssentialsPermissionsCommands/build/
-/EssentialsPermissionsCommands/dist/
+/EssentialsPermissionsCommands/dist/
+/Essentials/nbproject/private/
+/Essentials/dist/
+/Essentials/build/

BuildAll/nbproject/project.properties

@@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 application.title=BuildAll
-application.vendor=Paul
+application.vendor=
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -27,7 +62,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 includes=**
-jar.compress=false
+jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
     ${reference.EssentialsChat.jar}:\
@@ -35,16 +70,16 @@ javac.classpath=\
     ${reference.EssentialsPermissionsCommands.jar}:\
     ${reference.EssentialsSpawn.jar}:\
     ${reference.EssentialsGeoIP.jar}:\
-    ${reference.EssentialsXMPP.jar}:\
     ${reference.EssentialsGroupBridge.jar}:\
+    ${reference.EssentialsXMPP.jar}:\
     ${reference.EssentialsGroupManager.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.5
+javac.source=1.6
-javac.target=1.5
+javac.target=1.6
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\

Essentials/.gitignore

@@ -1,7 +0,0 @@
-# NetBeans cruft
-/build
-/dist
-/nbproject/private
-
-# Mac cruft
-.DS_Store

Essentials/build.xml

@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
+<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
+<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
+<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
+<!-- in the project's Project Properties dialog box.-->
-<project name="Essentials" default="default" basedir=".">
+<project name="Essentials" default="default" basedir=".">
-
+
-    <description>Builds, tests, and runs the project Essentials.</description>
+    <description>Builds, tests, and runs the project Essentials.</description>
-    <import file="nbproject/build-impl.xml"/>
+    <import file="nbproject/build-impl.xml"/>
-    <!--
+    <!--
-
+
-    There exist several targets which are by default empty and which can be 
+    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
+    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
+    before and after some main targets. They are: 
-
+
-      -pre-init:                 called before initialization of project properties
+      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
+      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
+      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
+      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
+      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
+      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
+      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
+      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
+      -post-clean:               called after cleaning build products
-
+
-    (Targets beginning with '-' are not intended to be called on their own.)
+    (Targets beginning with '-' are not intended to be called on their own.)
-
+
-    Example of inserting an obfuscator after compilation could look like this:
+    Example of inserting an obfuscator after compilation could look like this:
-
+
-        <target name="-post-compile">
+        <target name="-post-compile">
-            <obfuscate>
+            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
+                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
+            </obfuscate>
-        </target>
+        </target>
-
+
-    For list of available properties check the imported 
+    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-
+
-    Another way to customize the build is by overriding existing main targets.
+    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
+    The targets of interest are: 
-
+
-      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
+      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
+      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
+      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
+      test-report:              JUnit report generation
-
+
-    An example of overriding the target for project execution could look like this:
+    An example of overriding the target for project execution could look like this:
-
+
-        <target name="run" depends="Essentials-impl.jar">
+        <target name="run" depends="Essentials-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
+            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
+                <arg file="${dist.jar}"/>
-            </exec>
+            </exec>
-        </target>
+        </target>
-
+
-    Notice that the overridden target depends on the jar target and not only on 
+    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
+    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
+    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-    -->
+    -->
-	<!--target name="-post-jar">
+	<!--target name="-post-jar">
-	    <jar jarfile="${dist.dir}/Essentials.jar">
+	    <jar jarfile="${dist.dir}/Essentials.jar">
-	      <zipfileset src="${dist.jar}" excludes="META-INF/*" />
+	      <zipfileset src="${dist.jar}" excludes="META-INF/*" />
-	      <zipfileset src="${dist.dir}/lib/Register.jar" excludes="META-INF/*" />
+	      <zipfileset src="${dist.dir}/lib/Register.jar" excludes="META-INF/*" />
-	      <manifest>
+	      <manifest>
-	        <attribute name="Classpath" value="Essentials.jar"/>
+	        <attribute name="Classpath" value="Essentials.jar"/>
-	      </manifest>
+	      </manifest>
-	    </jar>
+	    </jar>
-	  </target-->
+	  </target-->
-</project>
+</project>

Essentials/nbproject/project.properties

@@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 application.title=Essentials
-application.vendor=Paul
+application.vendor=
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -34,7 +69,9 @@ file.reference.junit-4.5.jar=..\\lib\\junit_4\\junit-4.5.jar
 file.reference.Permissions3.jar=../lib/Permissions3.jar
 file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar
 includes=**
-jar.compress=false
+jar.archive.disabled=${jnlp.enabled}
+jar.compress=true
+jar.index=${jnlp.enabled}
 javac.classpath=\
     ${file.reference.Permissions3.jar}:\
     ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
@@ -47,8 +84,8 @@ javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.5
+javac.source=1.6
-javac.target=1.5
+javac.target=1.6
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
@@ -66,8 +103,17 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
+jnlp.codebase.type=no.codebase
+jnlp.descriptor=application
+jnlp.enabled=false
+jnlp.mixed.code=default
+jnlp.offline-allowed=false
+jnlp.signed=false
+jnlp.signing=
+jnlp.signing.alias=
+jnlp.signing.keystore=
 meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
+mkdist.disabled=true
 platform.active=default_platform
 run.classpath=\
     ${javac.classpath}:\

Essentials/src/com/earth2me/essentials/ISettings.java

@@ -130,4 +130,6 @@ public interface ISettings extends IConf
 	boolean isPlayerCommand(String string);
 
 	public boolean useBukkitPermissions();
+
+	public boolean addPrefixSuffix();
 }

Essentials/src/com/earth2me/essentials/Permissions2Handler.java

@@ -17,7 +17,8 @@ public class Permissions2Handler implements IPermissionsHandler
 
 	public String getGroup(final Player base)
 	{
-		return permissionHandler.getGroup(base.getWorld().getName(), base.getName());
+		final String group = permissionHandler.getGroup(base.getWorld().getName(), base.getName());
+		return group == null ? "default" : group;
 	}
 
 	public boolean canBuild(final Player base, final String group)

Essentials/src/com/earth2me/essentials/Settings.java

@@ -468,4 +468,9 @@ public class Settings implements ISettings
 	{
 		return config.getBoolean("use-bukkit-permissions", false);
 	}
+
+	public boolean addPrefixSuffix()
+	{
+		return config.getBoolean("add-prefix-suffix", ess.getServer().getPluginManager().isPluginEnabled("EssentialsChat"));
+	}
 }

Essentials/src/com/earth2me/essentials/User.java

@@ -246,14 +246,17 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
 			}
 		}
 
-		final String prefix = ess.getPermissionsHandler().getPrefix(this).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
+		if (ess.getSettings().addPrefixSuffix())
-		final String suffix = ess.getPermissionsHandler().getSuffix(this).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
-
-		nickname.insert(0, prefix);
-		nickname.append(suffix);
-		if (suffix.length() < 2 || !suffix.substring(suffix.length() - 2, suffix.length() - 1).equals("§"))
 		{
-			nickname.append("§f");
+			final String prefix = ess.getPermissionsHandler().getPrefix(this).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
+			final String suffix = ess.getPermissionsHandler().getSuffix(this).replace('&', '§').replace("{WORLDNAME}", this.getWorld().getName());
+
+			nickname.insert(0, prefix);
+			nickname.append(suffix);
+			if (suffix.length() < 2 || !suffix.substring(suffix.length() - 2, suffix.length() - 1).equals("§"))
+			{
+				nickname.append("§f");
+			}
 		}
 
 		return nickname.toString();

Essentials/src/com/earth2me/essentials/Util.java

@@ -216,21 +216,21 @@ public class Util
 		return c.getTimeInMillis();
 	}
 
-	public static Location getSafeDestination(Location loc) throws Exception
+	public static Location getSafeDestination(final Location loc) throws Exception
 	{
 		if (loc == null || loc.getWorld() == null)
 		{
 			throw new Exception(Util.i18n("destinationNotSet"));
 		}
-		World world = loc.getWorld();
+		final World world = loc.getWorld();
-		double x = Math.floor(loc.getX()) + 0.5;
+		int x = loc.getBlockX();
-		double y = Math.floor(loc.getY());
+		int y = loc.getBlockY();
-		double z = Math.floor(loc.getZ()) + 0.5;
+		int z = loc.getBlockZ();
 
 		while (isBlockAboveAir(world, x, y, z))
 		{
-			y -= 1.0D;
+			y -= 1;
-			if (y < 0.0D)
+			if (y < 0)
 			{
 				throw new Exception(Util.i18n("holeInFloor"));
 			}
@@ -238,33 +238,33 @@ public class Util
 
 		while (isBlockUnsafe(world, x, y, z))
 		{
-			y += 1.0D;
+			y += 1;
-			if (y >= 110.0D)
+			if (y >= 127)
 			{
-				x += 1.0D;
+				x += 1;
 				break;
 			}
 		}
 		while (isBlockUnsafe(world, x, y, z))
 		{
-			y -= 1.0D;
+			y -= 1;
-			if (y <= 1.0D)
+			if (y <= 1)
 			{
-				y = 110.0D;
+				y = 127;
-				x += 1.0D;
+				x += 1;
 			}
 		}
-		return new Location(world, x, y, z, loc.getYaw(), loc.getPitch());
+		return new Location(world, x + 0.5D, y, z + 0.5D, loc.getYaw(), loc.getPitch());
 	}
 
-	private static boolean isBlockAboveAir(World world, double x, double y, double z)
+	private static boolean isBlockAboveAir(final World world, final int x, final int y, final int z)
 	{
-		return world.getBlockAt((int)Math.floor(x), (int)Math.floor(y - 1.0D), (int)Math.floor(z)).getType() == Material.AIR;
+		return world.getBlockAt(x, y - 1, z).getType() == Material.AIR;
 	}
 
-	public static boolean isBlockUnsafe(World world, double x, double y, double z)
+	public static boolean isBlockUnsafe(final World world, final int x, final int y, final int z)
 	{
-		Block below = world.getBlockAt((int)Math.floor(x), (int)Math.floor(y - 1.0D), (int)Math.floor(z));
+		final Block below = world.getBlockAt(x, y - 1, z);
 		if (below.getType() == Material.LAVA || below.getType() == Material.STATIONARY_LAVA)
 		{
 			return true;
@@ -275,8 +275,8 @@ public class Util
 			return true;
 		}
 
-		if ((world.getBlockAt((int)Math.floor(x), (int)Math.floor(y), (int)Math.floor(z)).getType() != Material.AIR)
+		if ((world.getBlockAt(x, y, z).getType() != Material.AIR)
-			|| (world.getBlockAt((int)Math.floor(x), (int)Math.floor(y + 1.0D), (int)Math.floor(z)).getType() != Material.AIR))
+			|| (world.getBlockAt(x, y + 1, z).getType() != Material.AIR))
 		{
 			return true;
 		}
@@ -294,7 +294,7 @@ public class Util
 		return str;
 	}
 
-	public static double roundDouble(double d)
+	public static double roundDouble(final double d)
 	{
 		return Math.round(d * 100.0) / 100.0;
 	}

Essentials/src/com/earth2me/essentials/commands/Commandban.java

@@ -53,6 +53,13 @@ public class Commandban extends EssentialsCommand
 		}
 		player.kickPlayer(banReason);
 		ess.getBans().banByName(player.getName());
-		server.broadcastMessage(Util.format("playerBanned", player.getName(), banReason));
+		for(Player p : server.getOnlinePlayers())
+		{
+			User u = ess.getUser(p);
+			if(u.isAuthorized("essentials.ban.notify"))
+			{
+			p.sendMessage(Util.format("playerBanned", player.getName(), banReason));
+			}
+		}
 	}
 }

Essentials/src/com/earth2me/essentials/commands/Commandhelp.java

@@ -173,7 +173,7 @@ public class Commandhelp extends EssentialsCommand
 			{
 				if (!reported)
 				{
-					logger.log(Level.WARNING, "Error getting help for:" + pluginName, ex);
+					logger.log(Level.WARNING, Util.format("commandHelpFailedForPlugin", pluginName), ex);
 				}
 				reported = true;
 				continue;

Essentials/src/com/earth2me/essentials/commands/Commandlist.java

@@ -102,6 +102,7 @@ public class Commandlist extends EssentialsCommand
 						groupString.append("§7[HIDDEN]§f");
 					}
 					groupString.append(user.getDisplayName());
+					groupString.append("§f");
 				}
 				sender.sendMessage(groupString.toString());
 			}
@@ -142,6 +143,7 @@ public class Commandlist extends EssentialsCommand
 					onlineUsers.append("§7[HIDDEN]§f");
 				}
 				onlineUsers.append(user.getDisplayName());
+				onlineUsers.append("§f");
 			}
 			sender.sendMessage(onlineUsers.toString());
 		}

Essentials/src/com/earth2me/essentials/commands/Commandmute.java

@@ -1,52 +1,52 @@
-package com.earth2me.essentials.commands;
+package com.earth2me.essentials.commands;
-
+
-import org.bukkit.Server;
+import org.bukkit.Server;
-import org.bukkit.command.CommandSender;
+import org.bukkit.command.CommandSender;
-import com.earth2me.essentials.User;
+import com.earth2me.essentials.User;
-import com.earth2me.essentials.Util;
+import com.earth2me.essentials.Util;
-
+
-
+
-public class Commandmute extends EssentialsCommand
+public class Commandmute extends EssentialsCommand
-{
+{
-	public Commandmute()
+	public Commandmute()
-	{
+	{
-		super("mute");
+		super("mute");
-	}
+	}
-
+
-	@Override
+	@Override
-	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
+	public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
-	{
+	{
-		if (args.length < 1)
+		if (args.length < 1)
-		{
+		{
-			throw new NotEnoughArgumentsException();
+			throw new NotEnoughArgumentsException();
-		}
+		}
-
+
-		User p = getPlayer(server, args, 0, true);
+		User p = getPlayer(server, args, 0, true);
-		if (!p.isMuted() && p.isAuthorized("essentials.mute.exempt"))
+		if (!p.isMuted() && p.isAuthorized("essentials.mute.exempt"))
-		{
+		{
-			sender.sendMessage(Util.i18n("muteExempt"));
+			sender.sendMessage(Util.i18n("muteExempt"));
-			return;
+			return;
-		}
+		}
-		long muteTimestamp = 0;
+		long muteTimestamp = 0;
-		if (args.length > 1)
+		if (args.length > 1)
-		{
+		{
-			String time = getFinalArg(args, 1);
+			String time = getFinalArg(args, 1);
-			muteTimestamp = Util.parseDateDiff(time, true);
+			muteTimestamp = Util.parseDateDiff(time, true);
-		}
+		}
-		p.setMuteTimeout(muteTimestamp);
+		p.setMuteTimeout(muteTimestamp);
-		charge(sender);
+		charge(sender);
-		boolean muted = p.toggleMuted();
+		boolean muted = p.toggleMuted();
-		sender.sendMessage(
+		sender.sendMessage(
-				muted
+				muted
-				? (muteTimestamp > 0
+				? (muteTimestamp > 0
-				   ? Util.format("mutedPlayerFor", p.getDisplayName(), Util.formatDateDiff(muteTimestamp))
+				   ? Util.format("mutedPlayerFor", p.getDisplayName(), Util.formatDateDiff(muteTimestamp))
-				   : Util.format("mutedPlayer", p.getDisplayName()))
+				   : Util.format("mutedPlayer", p.getDisplayName()))
-				: Util.format("unmutedPlayer", p.getDisplayName()));
+				: Util.format("unmutedPlayer", p.getDisplayName()));
-		p.sendMessage(
+		p.sendMessage(
-				muted
+				muted
-				? (muteTimestamp > 0
+				? (muteTimestamp > 0
-				   ? Util.format("playerMutedFor", Util.formatDateDiff(muteTimestamp))
+				   ? Util.format("playerMutedFor", Util.formatDateDiff(muteTimestamp))
-				   : Util.i18n("playerMuted"))
+				   : Util.i18n("playerMuted"))
-				: Util.i18n("playerUnmuted"));
+				: Util.i18n("playerUnmuted"));
-	}
+	}
-}
+}

Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java

@@ -164,7 +164,7 @@ public class Commandspawnmob extends EssentialsCommand
 						changeMobData(mobMount.name, spawnedMount, mountData, user);
 					}
 				}
-				user.sendMessage(args[1] + " " + mob.name.toLowerCase() + mob.suffix + Util.i18n("spawned"));
+				user.sendMessage(args[1] + " " + mob.name.toLowerCase() + mob.suffix + " " + Util.i18n("spawned"));
 			}
 			catch (MobException e1)
 			{

Essentials/src/com/earth2me/essentials/commands/Commandunlimited.java

@@ -56,7 +56,7 @@ public class Commandunlimited extends EssentialsCommand
 		}
 
 		final ItemStack stack = ess.getItemDb().get(args[0], 1);
-		stack.setAmount(stack.getType().getMaxStackSize());
+		stack.setAmount(Math.min(stack.getType().getMaxStackSize(), 2));
 
 		String itemname = stack.getType().toString().toLowerCase().replace("_", "");
 		if (!user.isAuthorized("essentials.unlimited.item-all")

Essentials/src/com/earth2me/essentials/signs/SignPlayerListener.java

@@ -28,6 +28,10 @@ public class SignPlayerListener extends PlayerListener
 		}
 
 		final Block block = event.getClickedBlock();
+		if (block == null)
+		{
+			return;
+		}
 		final int mat = block.getTypeId();
 		if (mat == Material.SIGN_POST.getId() || mat == Material.WALL_SIGN.getId())
 		{

Essentials/src/com/earth2me/essentials/signs/SignProtection.java

@@ -9,6 +9,7 @@ import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -157,7 +158,7 @@ public class SignProtection extends EssentialsSign
 				return SignProtectionState.ALLOWED;
 			}
 		}
-		if (sign.getLine(3).substring(2).equalsIgnoreCase(username))
+		if (ChatColor.stripColor(sign.getLine(3)).equalsIgnoreCase(username))
 		{
 			return SignProtectionState.OWNER;
 		}

Essentials/src/com/earth2me/essentials/signs/SignTrade.java

@@ -98,9 +98,14 @@ public class SignTrade extends EssentialsSign
 		if (split.length == 2 && amountNeeded)
 		{
 			final Double money = getMoney(split[0]);
-			final Double amount = getDoublePositive(split[1]);
+			Double amount = getDoublePositive(split[1]);
 			if (money != null && amount != null)
 			{
+				amount -= amount % money;
+				if (amount < 0.01 || money < 0.01)
+				{
+					throw new SignException(Util.i18n("moreThanZero"));
+				}
 				sign.setLine(index, Util.formatCurrency(money, ess) + ":" + Util.formatCurrency(amount, ess).substring(1));
 				return;
 			}

Essentials/src/config.yml

@@ -37,6 +37,11 @@ nickname-prefix: '~'
 # Disable this if you have any other plugin, that modifies the displayname of a user.
 change-displayname: true
 
+# Adds the prefix and suffix to the displayname of the player, so it will be displayed in messages and lists.
+# The prefix/suffix can be set using Permissions, Group Manager or PermissionsEx.
+# The value of change-displayname (above) has to be true.
+add-prefix-suffix: false
+
 # The delay, in seconds, required between /home, /tp, etc.
 teleport-cooldown: 0
 
@@ -117,7 +122,8 @@ disabled-commands:
 # Restricted commands have been removed.
 # Now we have a whitelist, all commands not on this list are only available to ops.
 # These will have NO EFFECT if you have Permissions installed!
-# These are here only if you want something simpler than Permissions.
+# They are here only if you want something simpler than Permissions.
+# These are the permissions without the "essentials." part.
 player-commands:
   - afk
   - back
@@ -127,6 +133,7 @@ player-commands:
   - compass
   - depth
   - getpos
+  - geoip.show
   - help
   - helpop
   - home
@@ -143,13 +150,31 @@ player-commands:
   - nick
   - pay
   - ping
+  - portal
   - powertool
+  - protect
   - r
   - rules
   - seen
   - sell
   - sethome
   - setxmpp
+  - signs.create.protection
+  - signs.create.trade
+  - signs.break.protection
+  - signs.break.trade
+  - signs.use.balance
+  - signs.use.buy
+  - signs.use.disposal
+  - signs.use.free
+  - signs.use.heal
+  - signs.use.mail
+  - signs.use.protection
+  - signs.use.sell
+  - signs.use.time
+  - signs.use.trade
+  - signs.use.warp
+  - signs.use.weather
   - spawn
   - suicide
   - tpa
@@ -157,6 +182,7 @@ player-commands:
   - tpahere
   - tpdeny
   - warp
+  - warp.list
   - world
   - worth
   - xmpp

Essentials/src/messages.properties

@@ -29,7 +29,8 @@ canTalkAgain = \u00a77You can talk again
 cantFindGeoIpDB = Can''t find GeoIP database!
 cantReadGeoIpDB = Failed to read GeoIP database!
 cantSpawnItem = \u00a7cYou are not allowed to spawn the item {0}
-commandFailed = Command {0} failed: 
+commandFailed = Command {0} failed:
+commandHelpFailedForPlugin = Error getting help for: {0} 
 commandNotLoaded = \u00a7cCommand {0} is improperly loaded.
 compassBearing = \u00a77Bearing:  {0} ({1} degrees).
 configFileMoveError = Failed to move config.yml to backup location.
@@ -190,7 +191,7 @@ noKitPermission = \u00a7cYou need the \u00a7c{0}\u00a7c permission to use that k
 noKits = \u00a77There are no kits available yet
 noMail = You do not have any mail
 noMailSendPerm = \u00a7cYou do not have the \u00a7fessentials.mail.send\u00a7c permission.
-noMotd = \u00a7cThere is no message of the day."
+noMotd = \u00a7cThere is no message of the day.
 noNewMail = \u00a77You have no new mail.
 noPendingRequest = You do not have a pending request.
 noPlacePermission = \u00a7cYou do not have permission to place a block near that sign.
@@ -219,7 +220,7 @@ playerMuted = \u00a77You have been muted
 playerMutedFor = \u00a77You have been muted for {0}
 playerNeverOnServer = \u00a7cPlayer {0} was never on this server.
 playerNotFound = \u00a7cPlayer not found.
-playerUnmuted = "\u00a77You have been unmuted"
+playerUnmuted = \u00a77You have been unmuted
 pong = Pong!
 possibleWorlds = \u00a77Possible worlds are the numbers 0 through {0}.
 powerToolAir = Command can''t be attached to air.

Essentials/src/messages_da.properties

@@ -31,7 +31,8 @@ canTalkAgain = \u00a77Du kan snakke igen
 cantFindGeoIpDB = Kan ikke finde GeoIP database!
 cantReadGeoIpDB = Fejl ved l\u00e6sning af GeoIP database!
 cantSpawnItem = \u00a7cDu er ikke tilladt at spawne elementet {0}
-commandFailed = Kommando {0} fejlede: 
+commandFailed = Kommando {0} fejlede:
+commandHelpFailedForPlugin=Fejl ved at f\u00e5 hj\u00e6lp til: {0} 
 commandNotLoaded = \u00a7cCommand {0} er ikke indl\u00e6st korrekt.
 compassBearing = \u00a77B\u00e6rer:  {0} ({1} grader).
 configFileMoveError = Kunne ikke flytte config.yml til backup placering.
@@ -192,7 +193,7 @@ noKitPermission = \u00a7cDu har brug for \u00a7c{0}\u00a7c tilladelsen for at br
 noKits = \u00a77Der er ikke nogen pakker tilg\u00e6ngelig endnu
 noMail = Du har ikke noget post
 noMailSendPerm = \u00a7cDu har ikke \u00a7fessentials.mail.send\u00a7c tilladelsen.
-noMotd = \u00a7cDer er ikke nogen besked for dagen."
+noMotd = \u00a7cDer er ikke nogen besked for dagen.
 noNewMail = \u00a77Du har ingen ny post.
 noPendingRequest = Du har ikke en ventende anmodning.
 noPlacePermission = \u00a7cYou do not have permission to place a block near that sign.
@@ -221,7 +222,7 @@ playerMuted = \u00a77You have been muted
 playerMutedFor = \u00a77You have been muted for {0}
 playerNeverOnServer = \u00a7cSpiller {0} var aldrig p\u00e5 denne server.
 playerNotFound = \u00a7cSpiller ikke fundet.
-playerUnmuted = "\u00a77You have been unmuted"
+playerUnmuted = \u00a77You have been unmuted
 pong = Pong!
 possibleWorlds = \u00a77Mulige verdener er numrene 0 igennem {0}.
 powerToolAir = Kommando kan ikke blive tildelt luft.

Essentials/src/messages_de.properties

@@ -29,7 +29,8 @@ canTalkAgain = \u00a77Du kannst wieder sprechen.
 cantFindGeoIpDB = Kann GeoIP-Datenbank nicht finden!
 cantReadGeoIpDB = Fehler beim Einlesen der GeoIP-Datenbank!
 cantSpawnItem = \u00a7cDu darfst {0} nicht erzeugen.
-commandFailed = Befehl {0} scheiterte: 
+commandFailed = Befehl {0} scheiterte:
+commandHelpFailedForPlugin=Fehler beim Abrufen der Hilfe f\u00fcr: {0} 
 commandNotLoaded = \u00a7cBefehl {0} ist nicht richtig geladen.
 compassBearing = \u00a77Peilung:  {0} ({1} Grad).
 configFileMoveError = Verschieben von config.yml zu einer Sicherheitskopie gescheitert.
@@ -168,7 +169,7 @@ month = Monat
 months = Monate
 moreThanZero = Anzahl muss gr\u00f6sser als 0 sein.
 msgFormat = \u00a77[{0}\u00a77 -> {1}\u00a77] \u00a7f{2}
-muteExempt = \u00a7cYou may not mute that player.
+muteExempt = \u00a7cDu darfst diesen Spieler nicht stumm machen.
 mutedPlayer = Player {0} ist nun stumm.
 mutedPlayerFor = Player {0} ist nun stumm f\u00fcr {1}.
 mutedUserSpeaks = {0} versuchte zu sprechen, aber ist stumm geschalt.
@@ -190,7 +191,7 @@ noKitPermission = \u00a7cDu brauchst die Berechtigung \u00a7c{0}\u00a7c um diese
 noKits = \u00a77Es sind keine Ausr\u00fcstungen verf\u00fcgbar.
 noMail = Du hast keine Nachrichten
 noMailSendPerm = \u00a7cDu hast die Rechte \u00a7fessentials.mail.send\u00a7c nicht.
-noMotd = \u00a7cEs existiert keine Willkommensnachricht."
+noMotd = \u00a7cEs existiert keine Willkommensnachricht.
 noNewMail = \u00a77Du hast keine Nachrichten.
 noPendingRequest = Du hast keine Teleportierungsanfragen.
 noPlacePermission = \u00a7cDu hast keine Rechte, einen Block in der N\u00e4he des Schildes zu platzieren.
@@ -215,11 +216,11 @@ playerInJail = \u00a7cSpieler ist bereits in Gef\u00e4ngnis {0}.
 playerJailed = \u00a77Spieler {0} eingesperrt.
 playerJailedFor =  \u00a77Spieler {0} eingesperrt f\u00fcr {1}.
 playerKicked = \u00a7cSpieler {0} rausgeworfen: {1}
-playerMuted = \u00a77You have been muted
+playerMuted = \u00a77Du bist jetzt stumm.
-playerMutedFor = \u00a77You have been muted for {0}
+playerMutedFor = \u00a77Du bist jetzt stumm f\u00fcr {0}.
 playerNeverOnServer = \u00a7cSpieler {0} war niemals auf diesem Server.
 playerNotFound = \u00a7cSpieler nicht gefunden.
-playerUnmuted = "\u00a77You have been unmuted"
+playerUnmuted = \u00a77Du bist nicht mehr stumm.
 pong = Pong!
 possibleWorlds = \u00a77M\u00f6gliche Welten sind nummeriet von 0 bis {0}.
 powerToolAir = Befehl kann nicht mit Luft verbunden werden.
@@ -325,4 +326,4 @@ year = Jahr
 years = Jahre
 youAreHealed = \u00a77Du wurdest geheilt.
 youHaveNewMail = \u00a7cDu hast {0} Nachrichten!\u00a7f Schreibe \u00a77/mail read\u00a7f um deine Nachrichten anzuzeigen.
-invalidCharge = \u00a7cUng\u00fcltige Verf\u00fcgung.
+invalidCharge = \u00a7cUng\u00fcltige Verf\u00fcgung.

Essentials/src/messages_en.properties

@@ -29,7 +29,8 @@ canTalkAgain = \u00a77You can talk again
 cantFindGeoIpDB = Can''t find GeoIP database!
 cantReadGeoIpDB = Failed to read GeoIP database!
 cantSpawnItem = \u00a7cYou are not allowed to spawn the item {0}
-commandFailed = Command {0} failed: 
+commandFailed = Command {0} failed:
+commandHelpFailedForPlugin=Error getting help for: {0}  
 commandNotLoaded = \u00a7cCommand {0} is improperly loaded.
 compassBearing = \u00a77Bearing:  {0} ({1} degrees).
 configFileMoveError = Failed to move config.yml to backup location.
@@ -190,7 +191,7 @@ noKitPermission = \u00a7cYou need the \u00a7c{0}\u00a7c permission to use that k
 noKits = \u00a77There are no kits available yet
 noMail = You do not have any mail
 noMailSendPerm = \u00a7cYou do not have the \u00a7fessentials.mail.send\u00a7c permission.
-noMotd = \u00a7cThere is no message of the day."
+noMotd = \u00a7cThere is no message of the day.
 noNewMail = \u00a77You have no new mail.
 noPendingRequest = You do not have a pending request.
 noPlacePermission = \u00a7cYou do not have permission to place a block near that sign.
@@ -219,7 +220,7 @@ playerMuted = \u00a77You have been muted
 playerMutedFor = \u00a77You have been muted for {0}
 playerNeverOnServer = \u00a7cPlayer {0} was never on this server.
 playerNotFound = \u00a7cPlayer not found.
-playerUnmuted = "\u00a77You have been unmuted"
+playerUnmuted = \u00a77You have been unmuted
 pong = Pong!
 possibleWorlds = \u00a77Possible worlds are the numbers 0 through {0}.
 powerToolAir = Command can''t be attached to air.

Essentials/src/messages_fr.properties

@@ -29,7 +29,8 @@ canTalkAgain = \u00a77Vous pouvez de nouveau parler.
 cantFindGeoIpDB = N''arrive pas \u00e0 trouver la base de donn\u00e9es GeoIP!
 cantReadGeoIpDB = Echec de la lecture de la base de donn\u00e9s GeoIP!
 cantSpawnItem = \u00a7cVous n''avez pas le droit de faire apparaitre {0}
-commandFailed = \u00c9chec de la commande {0}: 
+commandFailed = \u00c9chec de la commande {0}:
+commandHelpFailedForPlugin=Erreur d'obtention d'aider \u00e0: {0} 
 commandNotLoaded = \u00a7cLa commande {0} a \u00e9t\u00e9 mal charg\u00e9e.
 compassBearing = \u00a77Orientation: {0} ({1} degr\u00e9s).
 configFileMoveError = \u00c9chec du d\u00e9placement de config.yml vers l''emplacement de backup.
@@ -219,7 +220,7 @@ playerMuted = \u00a77You have been muted
 playerMutedFor = \u00a77You have been muted for {0}
 playerNeverOnServer = \u00a7cLe joueur {0} n''a jamais \u00e9t\u00e9 sur le serveur.
 playerNotFound = \u00a7cLe joueur est introuvable.
-playerUnmuted = "\u00a77You have been unmuted"
+playerUnmuted = \u00a77You have been unmuted
 pong = Pong!
 possibleWorlds = \u00a77Les mondes possibles sont les nombres 0 par {0}.
 powerToolAir = La commande ne peut pas \u00eatre attach\u00e9e \u00e0 l''air.

Essentials/src/messages_nl.properties

@@ -2,46 +2,47 @@
 # Single quotes have to be doubled: ''
 # Translations start here
 # by Geertje123
-addedToAccount = \u00a7a{0} is aan je bankrekening toegevoegd.
+addedToAccount = \u00a7a{0} is gestort op je account.
-addedToOthersAccount = \u00a7a{0} is toegevoegd aan {1} rekening
+addedToOthersAccount = \u00a7a{0} is overgemaakt naar {1}''s rekening
 alertBroke = gebroken:
 alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} bij: {3}
 alertPlaced = geplaatst:
 alertUsed = gebruikt:
-backAfterDeath = \u00a77Gebruik de /back command om terug te keren naar het punt waar je dood ging.
+backAfterDeath = \u00a77Gebruik het /back command om terug te keren naar je sterfplaats.
-backUsageMsg = \u00a77Bezig met terugkeren naar vorige locatie.
+backUsageMsg = \u00a77Naar de vorige locatie aan het gaan.
 backupFinished = Backup voltooid
-backupStarted = Backup wordt nu gemaakt
+backupStarted = Backup gestart
 balance = \u00a77Saldo: {0}
 balanceTop = \u00a77 Top {0} saldi
-banIpAddress = \u00a77Verboden IP-adres
+banIpAddress = \u00a77Verbannen IP-adres
-banExempt = \u00a77Je kunt niet verbieden die speler.
+banExempt = \u00a77Je kunt deze speler niet verbannen.
 bannedIpsFileError = Fout bij het lezen van banned-ips.txt
 bannedIpsFileNotFound = banned-ips.txt werd niet gevonden
 bannedPlayersFileError = Fout bij het lezen van banned-players.txt
 bannedPlayersFileNotFound = banned-players.txt werd niet gevonden
-bigTreeFailure = \u00a7cCre\u00ebren van grote boom fout gegaan. Probeer het opnieuw op gras of dirt.
+bigTreeFailure = \u00a7cMaken van een grote boom is mislukt. Probeer het opnieuw op gras of dirt.
-bigTreeSuccess =  \u00a77Grote boom gespawnd.
+bigTreeSuccess =  \u00a77Grote boom gemaakt.
 broadcast = [\u00a7cBroadcast\u00a7f]\u00a7a {0}
 buildAlert = \u00a7cJe bent niet bevoegd om te bouwen
 bukkitFormatChanged = Bukkit versie formaat veranderd. Versie niet nagekeken.
-burnMsg = \u00a77Je hebt voor {1} seconden {0} in de fik gezet.
+burnMsg = \u00a77Je hebt {0} voor {1} seconde(n) in de fik gezet.
 canTalkAgain = \u00a77Je kan weer praten.
 cantFindGeoIpDB = De GeoIP database kon niet gevonden worden!
 cantReadGeoIpDB = Fout bij het lezen van de GeoIP database!
 cantSpawnItem = \u00a7cJe bent niet bevoegd om {0} te spawnen.
-commandFailed = Opdracht {0} mislukt: 
+commandFailed = Opdracht {0} mislukt:
+commandHelpFailedForPlugin=Fout bij het \u200b\u200bkrijgen van hulp voor: {0} 
 commandNotLoaded = \u00a7cOpdracht {0} is fout geladen.
 compassBearing = \u00a77Ligging:  {0} ({1} graden).
 configFileMoveError = Het verplaatsen van config.yml naar de backup locatie is mislukt.
 configFileRenameError = Fout bij het hernoemen van de tijdelijke map naar config.yml
-connectedPlayers = Verbonden spelers: 
+connectedPlayers = Spelers online: 
 connectionFailed = Fout bij het verbinden.
 cooldownWithMessage = \u00a7cAfkoeltijd: {0}
-corruptNodeInConfig = \u00a74Waarschuwing: Het configuratie bestand bevat een fout {0}.
+corruptNodeInConfig = \u00a74Waarschuwing: Het configuratiebestand bevat een fout {0}.
-couldNotFindTemplate = Het sjabloon kon niet gevonden worden {0}
+couldNotFindTemplate = Het sjabloon kon niet worden gevonden {0}
-creatingConfigFromTemplate = Bezig met aanmaken van config vanaf sjabloon: {0}
+creatingConfigFromTemplate = Bezig met aanmaken van een config vanaf sjabloon: {0}
-creatingEmptyConfig = Bezig met lege config aanmaken: {0}
+creatingEmptyConfig = Bezig met een lege config aanmaken: {0}
 creatingPortal = Bezig met cre\u00ebren van portal bij {0},{1},{2}.
 day = dag
 days = dagen
@@ -49,10 +50,10 @@ defaultBanReason = De Ban Hamer heeft gesproken!
 deleteFileError = Het bestand kon niet verwijderd worden: {0}
 deleteJail = \u00a77Gevangenis {0} is verwijderd.
 deleteWarp = \u00a77Warp {0} is verwijderd.
-deniedAccessCommand = {0} werd de toegang geweigerd tot de opdracht.
+deniedAccessCommand = {0} was de toegang verboden tot het commando.
-dependancyDownloaded = [Essentials] Dependancy {0} downloaded successfully.
+dependancyDownloaded = [Essentials] Afhankelijkheid {0} succesvol gedownload.
-dependancyException = [Essentials] An error occured when trying to download a dependacy
+dependancyException = [Essentials] Er is een fout opgetreden bij het downloaden van de afhankelijkheid
-dependancyNotFound = [Essentials] A required dependancy was not found, downloading now.
+dependancyNotFound = [Essentials] Een afhankelijkheid is niet gevonden. Start downloaden.
 depth = \u00a77Je zit op zeeniveau.
 depthAboveSea = \u00a77Je zit {0} blok(ken) boven zeeniveau.
 depthBelowSea = \u00a77Je zit {0} blok(ken) onder zeeniveau.
@@ -61,15 +62,15 @@ disableUnlimited = \u00a77Oneindig plaatsen van {0} uitgeschakeld voor {1}.
 disabled = uitgeschakeld
 dontMoveMessage = \u00a77Beginnen met teleporteren in {0}. Niet bewegen.
 downloadingGeoIp = Bezig met downloaden van GeoIP database ... Dit kan een tijdje duren (country: 0.6 MB, city: 20MB)
-duplicatedUserdata = Verdubbelde userdata: {0} en {1}.
+duplicatedUserdata = Dubbele userdata: {0} en {1}.
 emptyWorldName = Set Home: Naam van wereld is leeg.
-enableUnlimited = \u00a77Oneindig van {0} gegeven aan {1}.
+enableUnlimited = \u00a77Oneindig aantal {0} aan {1} gegeven.
 enabled = ingeschakeld
 errorCallingCommand = Fout bij het aanroepen van de opdracht /{0}
 errorWithMessage = \u00a7cFout: {0}
-essentialsReload = \u00a77Essentials herlaadde {0}
+essentialsReload = \u00a77Essentials is herladen {0}
-extinguish = \u00a77Je hebt jezelf uitgeblust.
+extinguish = \u00a77Je hebt jezelf geblust.
-extinguishOthers = \u00a77Je hebt {0} uitgeblust.
+extinguishOthers = \u00a77Je hebt {0} geblust.
 failedToCloseConfig = Fout bij het sluiten van config {0}
 failedToCreateConfig = Fout tijdens het aanmaken van config {0}
 failedToWriteConfig = Fout bij het cre\u00ebren van config {0}
@@ -78,9 +79,9 @@ foreverAlone = \u00a7cJe hebt niemand waarnaar je kan reageren.
 freedMemory = {0} MB gelost.
 gcchunks =  chunks,
 gcentities =  entities
-gcfree = Free memory: {0} MB
+gcfree = Vrij geheugen: {0} MB
 gcmax = Maximaal geheugen: {0} MB
-gctotal = Allocated memory: {0} MB
+gctotal = Gealloceerd geheugen: {0} MB
 generatingPortal = \u00a77Uitgangs portal aan het cre\u00ebren.
 geoIpUrlEmpty = GeoIP download url is leeg.
 geoIpUrlInvalid = GeoIP download url is ongeldig.
@@ -89,9 +90,9 @@ godDisabledFor = uitgeschakeld voor {0}
 godEnabledFor = ingeschakeld voor {0}
 godMode = \u00a77God mode {0}.
 haveBeenReleased = \u00a77Je bent bevrijdt
-heal = \u00a77Je bent gehealed.
+heal = \u00a77Je bent genezen.
-healOther = \u00a77Je healde {0}.
+healOther = \u00a77Je geneezde {0}.
-helpConsole = type ?, Om help vanaf de console te bekijken.
+helpConsole = type ? om de consolehelp weer te geven.
 helpOp = \u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1}
 helpPages = Pagina \u00a7c{0}\u00a7f van de \u00a7c{1}\u00a7f:
 holeInFloor = Gat in de vloer
@@ -126,14 +127,14 @@ itemNotEnough3 = \u00a77/sell itemname -1 zorgt ervoor dat ze allemaal behalve 1
 itemSellAir = Je wilde serieus lucht verkopen? Plaats een voorwerp in je hand.
 itemSold = \u00a77Verkocht voor \u00a7c {0} \u00a77 ({1} voorwerpen voor {2} per stuk)
 itemSoldConsole = {0} verkocht {1} voor \u00a77 {2} \u00a77 ({3} voorwerpen voor {4} per stuk)
-itemSpawn = \u00a77Geven van {0} van de {1}
+itemSpawn = \u00a77Geeft {0} {1}
 itemsCsvNotLoaded = De item kunnen niet geladen worden.csv.
 jailMessage = \u00a7cYou do the crime, you do the time.
 jailNotExist = Die gevangenis bestaat niet.
 jailSet = \u00a77Gevangenis {0} is ingesteld
 jumpError = Dat zou je computers hersenen beschadigen.
 kickDefault = Gekicked van de server
-kickExempt = \u00a77Je kunt niet schoppen die speler.
+kickExempt = \u00a77Je kunt die speler niet schoppen.
 kill = \u00a77Jij doodde {0}.
 kitError = \u00a7cEr zijn geen geldige kits.
 kitError2 = \u00a7cDie kit bestaat niet of is verkeerde beschreven.
@@ -167,9 +168,9 @@ moneySentTo = \u00a7a{0} is verzonden naar {1}
 moneyTaken = {0} van je bankrekening afgehaald.
 month = maand
 months = maanden
-moreThanZero = Aantal moet groter zijn dan 0.
+moreThanZero = Het aantal moet groter zijn dan 0.
 msgFormat = \u00a77[{0}\u00a77 -> {1}\u00a77] \u00a7f{2}
-muteExempt = \u00a7cYou may not mute that player.
+muteExempt = \u00a7cJe kan deze speler niet muten.
 mutedPlayer = Speler {0} gemute.
 mutedPlayerFor = Speler {0} is gemute voor {1}.
 mutedUserSpeaks = {0} probeerde te praten, maar is gemute.
@@ -191,10 +192,10 @@ noKitPermission = \u00a7cJe hebt de \u00a7c{0}\u00a7c toestemming nodig om die k
 noKits = \u00a77Er zijn nog geen kits beschikbaar
 noMail = Je hebt geen berichten
 noMailSendPerm = \u00a7cJe hebt de \u00a7fessentials.mail.send\u00a7c toestemming niet.
-noMotd = \u00a7cEr is geen bericht van de dag."
+noMotd = \u00a7cEr is geen bericht van de dag.
 noNewMail = \u00a77Je hebt geen nieuwe berichten.
 noPendingRequest = Je hebt geen aanvragen.
-noPlacePermission = \u00a7cYou do not have permission to place a block near that sign.
+noPlacePermission = \u00a7cJe hebt geen toestemming om een blok naast die sign te plaatsen.
 noRules = \u00a7cEr zijn nog geen regels gegeven.
 noWarpsDefined = Geen warps gedefinieerd
 none = geen
@@ -205,29 +206,29 @@ notRecommendedBukkit = De Bukkit versie is niet de aangeraden build voor Essenti
 notSupportedYet = Nog niet ondersteund.
 now = nu
 numberRequired = Er moet daar een nummer, grapjas.
-onlyDayNight = /time oondersteund alleen day/night.
+onlyDayNight = /time ondersteund alleen day/night.
 onlyPlayers = Alleen in-game spelers kunnen {0} gebruiken.
 onlySunStorm = /weather only supports sun/storm.
 parseError = Fout bij ontleding {0} op regel {1}
 pendingTeleportCancelled = \u00a7cAangevraagde teleportatie afgelast.
-permissionsError = Vermisde Permissions/GroupManager; chat prefixes/suffixes worden uitgeschakeld.
+permissionsError = Permissions/GroupManager ontbreekt; chat prefixes/suffixes worden uitgeschakeld.
 playerBanned = \u00a7cSpeler {0} is geband: {1}
 playerInJail = \u00a7cSpeler zit al in de gevangenis {0}.
 playerJailed = \u00a77Speler {0} is in de gevangenis gezet.
 playerJailedFor =  \u00a77Speler {0} is in de gevangenis gezet voor {1}.
 playerKicked = \u00a7cPlayer {0} kicked: {1}
-playerMuted = \u00a77You have been muted
+playerMuted = \u00a77Je kreeg het zwijgen opgelegd.
-playerMutedFor = \u00a77You have been muted for {0}
+playerMutedFor = \u00a77Je kreeg het zwijgen opgelegd voor {0}
 playerNeverOnServer = \u00a7cSpeler {0} is nooit op deze server geweest.
 playerNotFound = \u00a7cSpeler niet gevonden.
-playerUnmuted = "\u00a77You have been unmuted"
+playerUnmuted = \u00a77Speler mag weer praten
 pong = Pong!
 possibleWorlds = \u00a77Mogelijk zijn de werelden de nummer 0 tot en met {0}.
-powerToolAir = Command kan niet worden bevestigd aan de lucht.
+powerToolAir = Command kan niet worden bevestigd aan lucht.
 powerToolAttach = Command toegewezen aan {0}
 powerToolRemove = Command verwijderd van {0}
-protectionOwner = \u00a76[EssentialsProtect] Bescherming eigenaar: {0}
+protectionOwner = \u00a76[EssentialsProtect] Beschermingeigenaar: {0}
-questionFormat = \u00a77[Question]\u00a7f {0}
+questionFormat = \u00a77[Vraag]\u00a7f {0}
 reloadAllPlugins = \u00a77Alle plugins zijn herladen.
 requestAccepted = \u00a77Teleporteer aanvraag geaccepteerd.
 requestDenied = \u00a77Teleporteer aanvraag geweigerd.
@@ -262,7 +263,7 @@ teleportationEnabled = \u00a77Teleportatie ingeschakeld.
 teleporting = \u00a77Bezig met teleporteren...
 teleportingPortal = \u00a77Bezig met teleporteren via de portal.
 tempBanned = Tijdelijk geband voor {0}
-tempbanExempt = \u00a77You may not tempban that player
+tempbanExempt = \u00a77Je mag deze speler niet een tempban geven
 thunder =  Je {0} onweert de wereld
 thunderDuration = Je {0} onweert de wereld voor {1} seconde.
 timeBeforeHeal = Afkoeltijd tot de volgende heal: {0}
@@ -278,15 +279,15 @@ typeTpdeny = \u00a77Om te weigeren, type \u00a7c/tpdeny\u00a77.
 typeWorldName = \u00a77Je kan ook de exacte naam van de wereld typen.
 unableToSpawnMob = De mob kan niet gespawned worden.
 unableToSpawnMob = Mob kon niet gespawnd worden.
-unbannedIP = IP adres unbanned.
+unbannedIP = IP adres ontbannen.
-unbannedPlayer = Speler unbanned.
+unbannedPlayer = Speler ontbannen.
 unignorePlayer = Je negeert {0} niet meer.
 unknownItemId = Onbekend voorwerp id: {0}
 unknownItemInList = Onbekend voorwerp {0} in {1} lijst.
 unknownItemName = Onbekende voorwerp naam: {0}
 unlimitedItemPermission = \u00a7cOnbevoegd om oneindig {0} te hebben.
 unlimitedItems = Oneindige voorwerpen:
-unmutedPlayer = Speler {0} ge-unmute.
+unmutedPlayer = Speler {0} mag weer spreken.
 upgradingFilesError = Fout tijdens het upgraden van de bestanden
 userCreatedPortal = {0} gebruikte een portal en maakte een uitgangs portal.
 userDoesNotExist = Speler {0} bestaat niet.
@@ -324,5 +325,5 @@ worthMeta = \u00a77Stapel {0} met een metadata van {1} met waarde \u00a7c{2}\u00
 worthSet = Waarde ingesteld
 year = jaar
 years = jaren
-youAreHealed = \u00a77Je bent gehealed.
+youAreHealed = \u00a77Je bent genezen.
-youHaveNewMail = \u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken.
+youHaveNewMail = \u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken.

Essentials/src/plugin.yml

@@ -1,353 +1,356 @@
-# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
+# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
-name: Essentials
+name: Essentials
-main: com.earth2me.essentials.Essentials
+main: com.earth2me.essentials.Essentials
-# Note to developers: This next line cannot change, or the automatic versioning system will break.
+# Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: TeamCity
-website: http://www.earth2me.net:8001/
+website: http://www.earth2me.net:8001/
-description: Provides an essential, core set of commands for Bukkit.
+description: Provides an essential, core set of commands for Bukkit.
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
-commands:
+commands:
-  afk:
+  afk:
-    description: Marks you as away-from-keyboard.
+    description: Marks you as away-from-keyboard.
-    usage: /<command>
+    usage: /<command>
-    aliases: [eafk]
+    aliases: [eafk]
-  antioch:
+  antioch:
-    description: 'A little surprise for operators.'
+    description: 'A little surprise for operators.'
-    usage: /<command>
+    usage: /<command>
-    aliases: [eantioch]
+    aliases: [eantioch]
-  back:
+  back:
-    description: Teleports you to your location prior to tp/spawn/warp.
+    description: Teleports you to your location prior to tp/spawn/warp.
-    usage: /<command>
+    usage: /<command>
-    aliases: [eback]
+    aliases: [eback]
-  backup:
+  backup:
-    description: Runs the backup command
+    description: Runs the backup command
-    usage: /<command>
+    usage: /<command>
-    aliases: [ebackup]
+    aliases: [ebackup]
-  balance:
+  balance:
-    description: States the current balance of a player.
+    description: States the current balance of a player.
-    usage: /<command> <player>
+    usage: /<command> <player>
-    aliases: [bal,emoney,ebalance,ebal]
+    aliases: [bal,emoney,ebalance,ebal]
-  balancetop:
+  balancetop:
-    description: Gets the top x balance values. (max 10)
+    description: Gets the top x balance values. (max 10)
-    usage: /<command> <max>
+    usage: /<command> <max>
-    aliases: [baltop,ebaltop,ebalancetop]
+    aliases: [baltop,ebaltop,ebalancetop]
-  ban:
+  ban:
-    description: Bans a player.
+    description: Bans a player.
-    usage: /<command> [player] <reason>
+    usage: /<command> [player] <reason>
-    aliases: [eban]
+    aliases: [eban]
-  banip:
+  banip:
-    description: Bans an IP address.
+    description: Bans an IP address.
-    usage: /<command> [address]
+    usage: /<command> [address]
-    aliases: [ebanip]
+    aliases: [ebanip]
-  broadcast:
+  broadcast:
-    description: Broadcasts a message to the entire server.
+    description: Broadcasts a message to the entire server.
-    usage: /<command> [msg]
+    usage: /<command> [msg]
-    aliases: [ebroadcast,bcast]
+    aliases: [ebroadcast,bcast,ebcast]
-  bigtree:
+  bigtree:
-    description: Spawn a big tree where you are looking.
+    description: Spawn a big tree where you are looking.
-    usage: /<command> [tree|redwood]
+    usage: /<command> [tree|redwood]
-    aliases: [ebigtree]
+    aliases: [ebigtree]
-  burn:
+  burn:
-    description: Set a player on fire.
+    description: Set a player on fire.
-    usage: /<command> [player] [seconds]
+    usage: /<command> [player] [seconds]
-    aliases: [eburn]
+    aliases: [eburn]
-  clearinventory:
+  clearinventory:
-    description: Clear all items in your inventory.
+    description: Clear all items in your inventory.
-    usage: /<command>
+    usage: /<command>
-    aliases: [ci,eci,eclearinventory]
+    aliases: [ci,eci,eclearinventory]
-  compass:
+  compass:
-    description: Describes your current bearing.
+    description: Describes your current bearing.
-    usage: /<command>
+    usage: /<command>
-    aliases: [ecompass]
+    aliases: [ecompass]
-  deljail:
+  deljail:
-    description: Removes a jail
+    description: Removes a jail
-    usage: /<command> [jailname]
+    usage: /<command> [jailname]
-    aliases: [edeljail]
+    aliases: [edeljail]
-  delwarp:
+  delwarp:
-    description: Deletes the specified warp.
+    description: Deletes the specified warp.
-    usage: /<command> [warp]
+    usage: /<command> [warp]
-    aliases: [edelwarp,remwarp,rmwarp]
+    aliases: [edelwarp,remwarp,rmwarp,eremwarp,ermwarp]
-  depth:
+  depth:
-    description: States current depth, relative to sea level.
+    description: States current depth, relative to sea level.
-    usage: /depth
+    usage: /depth
-    aliases: [edepth]
+    aliases: [edepth]
-  eco:
+  eco:
-    description: Manages the server economy.
+    description: Manages the server economy.
-    usage: /<command> [give|take|reset] [player] [amount]
+    usage: /<command> [give|take|reset] [player] [amount]
-    aliases: economy
+    aliases: economy
-  essentials:
+  essentials:
-    description: Reloads essentials.
+    description: Reloads essentials.
-    usage: /<command>
+    usage: /<command>
-  ext:
+  ext:
-    description: Extinguish players.
+    description: Extinguish players.
-    usage: /<command> <player>
+    usage: /<command> <player>
-    aliases: [extinguish,eext,eextinguish]
+    aliases: [extinguish,eext,eextinguish]
-  fireball:
+  fireball:
-    description: Throw a fireball.
+    description: Throw a fireball.
-    usage: /<command>
+    usage: /<command>
-    aliases: [efireball]
+    aliases: [efireball]
-  getpos:
+  getpos:
-    description: Get your current coordinates.
+    description: Get your current coordinates.
-    usage: /<command>
+    usage: /<command>
-    aliases: [coords,egetpos]
+    aliases: [coords,egetpos]
-  gc:
+  gc:
-    description: Reports garbage collection info; useful to developers.
+    description: Reports garbage collection info; useful to developers.
-    usage: /<command>
+    usage: /<command>
-    aliases: [mem,memory,egc]
+    aliases: [mem,memory,egc,emem,ememory]
-  give:
+  give:
-    description: Give a player an item.
+    description: Give a player an item.
-    usage: /<command> [player] [item|numeric] <amount>
+    usage: /<command> [player] [item|numeric] <amount>
-    aliases: [egive]
+    aliases: [egive]
-  god:
+  god:
-    description: Enables your godly powers.
+    description: Enables your godly powers.
-    usage: /<command>
+    usage: /<command>
-    aliases: [tgm,godmode,egod]
+    aliases: [tgm,godmode,egod,egodmode,etgm]
-  heal:
+  heal:
-    description: Heals you or the given player.
+    description: Heals you or the given player.
-    usage: /<command> <player>
+    usage: /<command> <player>
-    aliases: [eheal]
+    aliases: [eheal]
-  help:
+  help:
-    description: Views a list of available commands.
+    description: Views a list of available commands.
-    usage: /<command> [search term] [page]
+    usage: /<command> [search term] [page]
-    aliases: [ehelp]
+    aliases: [ehelp]
-  helpop:
+  helpop:
-    description: Request help from online operators.
+    description: Request help from online operators.
-    usage: /<command> [message]
+    usage: /<command> [message]
-  home:
+  home:
-    description: Teleport to your home.
+    description: Teleport to your home.
-    usage: /<command> <player>
+    usage: /<command> <player>
-    aliases: [ehome]
+    aliases: [ehome]
-  ignore:
+  ignore:
-    description: Ignore other players.
+    description: Ignore other players.
-    usage: /<command> <player>
+    usage: /<command> <player>
-    aliases: [eignore]
+    aliases: [eignore]
-  info:
+  info:
-    description: Shows information set by the server owner
+    description: Shows information set by the server owner
-    usage: /<command> [chapter] [page]
+    usage: /<command> [chapter] [page]
-    aliases: [ifo,einfo,eabout,news]
+    aliases: [ifo,einfo,eabout,news,enews,eifo]
-  invsee:
+  invsee:
-    description: See the inventory of other players.
+    description: See the inventory of other players.
-    usage: /<command> <player>
+    usage: /<command> <player>
-    aliases: [einvsee]
+    aliases: [einvsee]
-  item:
+  item:
-    description: Spawn an item.
+    description: Spawn an item.
-    usage: /<command> [item|numeric] <amount>
+    usage: /<command> [item|numeric] <amount>
-    aliases: [i,eitem]
+    aliases: [i,eitem]
-  jails:
+  jails:
-    description: List all jails.
+    description: List all jails.
-    usage: /<command>
+    usage: /<command>
-    aliases: [ejails]
+    aliases: [ejails]
-  jump:
+  jump:
-    description: Jumps to the nearest block in the line of sight.
+    description: Jumps to the nearest block in the line of sight.
-    usage: /<command>
+    usage: /<command>
-    aliases: [j,ejump]
+    aliases: [j,ejump]
-  kick:
+  kick:
-    description: Kicks a specified player with a reason.
+    description: Kicks a specified player with a reason.
-    usage: /<command> <player> <reason>
+    usage: /<command> <player> <reason>
-    aliases: [ekick]
+    aliases: [ekick]
-  kickall:
+  kickall:
-    description: Kicks all players off the server except the issuer.
+    description: Kicks all players off the server except the issuer.
-    usage: /<command> <reason>
+    usage: /<command> <reason>
-    aliases: [ekickall]
+    aliases: [ekickall]
-  kit:
+  kit:
-    description: Obtains the specified kit or views all available kits.
+    description: Obtains the specified kit or views all available kits.
-    usage: /<command> <kit>
+    usage: /<command> <kit>
-  kill:
+    aliases: [ekit,kits]
-    description: Kills specified player.
+  kill:
-    usage: /<command> <player>
+    description: Kills specified player.
-    aliases: [ekill]
+    usage: /<command> <player>
-  list:
+    aliases: [ekill]
-    description: List all online players.
+  list:
-    usage: /<command>
+    description: List all online players.
-    aliases: [playerlist,who,online,elist]
+    usage: /<command>
-  lightning:
+    aliases: [playerlist,who,online,elist,ewho,eplayerlist,eonline]
-    description: The power of Thor. Strike at cursor or player.
+  lightning:
-    usage: /<command> [player]
+    description: The power of Thor. Strike at cursor or player.
-    aliases: [strike,elightning,estrike]
+    usage: /<command> [player]
-  mail:
+    aliases: [strike,elightning,estrike]
-    description: Manages inter-player, intra-server mail.
+  mail:
-    usage: /<command> [read|clear|send [to] [message]]
+    description: Manages inter-player, intra-server mail.
-    aliases: [email]
+    usage: /<command> [read|clear|send [to] [message]]
-  me:
+    aliases: [email]
-    description: Describes an action in the context of the player.
+  me:
-    usage: /<command> [description]
+    description: Describes an action in the context of the player.
-    aliases: [eme]
+    usage: /<command> [description]
-  motd:
+    aliases: [eme]
-    description: Views the Message Of The Day.
+  motd:
-    usage: /<command>
+    description: Views the Message Of The Day.
-    aliases: [emotd]
+    usage: /<command>
-  msg:
+    aliases: [emotd]
-    description: Sends a private message to the specified player.
+  msg:
-    usage: /<command> <to> <message>
+    description: Sends a private message to the specified player.
-    aliases: [m,t,emsg,tell]
+    usage: /<command> <to> <message>
-  mute:
+    aliases: [m,t,emsg,tell,etell,whisper,ewhisper]
-    description: Mutes or unmutes a player.
+  mute:
-    usage: /<command> [player] <datediff>
+    description: Mutes or unmutes a player.
-    aliases: [emute]
+    usage: /<command> [player] <datediff>
-  nick:
+    aliases: [emute]
-    description: Change your nickname or that of another player.
+  nick:
-    usage: /<command> <player> [nickname|off]
+    description: Change your nickname or that of another player.
-    aliases: [enick]
+    usage: /<command> <player> [nickname|off]
-  nuke:
+    aliases: [enick]
-    description: May death rain upon them.
+  nuke:
-    usage: /<command> <player>
+    description: May death rain upon them.
-    aliases: [enuke]
+    usage: /<command> <player>
-  pay:
+    aliases: [enuke]
-    description: Pays another player from your balance
+  pay:
-    usage: /<command> [player] [amount]
+    description: Pays another player from your balance
-    aliases: [epay]
+    usage: /<command> [player] [amount]
-  ping:
+    aliases: [epay]
-    description: Pong!
+  ping:
-    usage: /<command>
+    description: Pong!
-    aliases: [pong,eping]
+    usage: /<command>
-  powertool:
+    aliases: [pong,eping,epong]
-    description: Assigns a command to the item in hand, {player} will be replaced by the name of the player that you click.
+  powertool:
-    usage: /<command> [command] <arguments>
+    description: Assigns a command to the item in hand, {player} will be replaced by the name of the player that you click.
-    aliases: [pt,epowertool,ept]
+    usage: /<command> [command] <arguments>
-  r:
+    aliases: [pt,epowertool,ept]
-    description: Quickly reply to the last player to message you.
+  r:
-    usage: /<command> [message]
+    description: Quickly reply to the last player to message you.
-    aliases: [er,reply,ereply]
+    usage: /<command> [message]
-  realname:
+    aliases: [er,reply,ereply]
-    description: Displays the username of a user based on nickname.
+  realname:
-    usage: /<command> [nickname]
+    description: Displays the username of a user based on nickname.
-    aliases: [erealname]
+    usage: /<command> [nickname]
-  reloadall:
+    aliases: [erealname]
-    description: Reloads all plugins.
+  reloadall:
-    usage: /<command>
+    description: Reloads all plugins.
-    aliases: [rel,ereloadall,ereload,erel]
+    usage: /<command>
-  rules:
+    aliases: [rel,ereloadall,ereload,erel]
-    description: Views the server rules.
+  rules:
-    usage: /<command>
+    description: Views the server rules.
-    aliases: [erules]
+    usage: /<command>
-  seen:
+    aliases: [erules]
-    description: Shows the last logout time of a player
+  seen:
-    usage: /<command> [playername]
+    description: Shows the last logout time of a player
-    aliases: [eseen]
+    usage: /<command> [playername]
-  sell:
+    aliases: [eseen]
-    description: Sells the item currently in your hand.
+  sell:
-    usage: /<command> [itemname|id|hand|inventory|blocks] [-][amount]
+    description: Sells the item currently in your hand.
-    aliases: [esell]
+    usage: /<command> [itemname|id|hand|inventory|blocks] [-][amount]
-  sethome:
+    aliases: [esell]
-    description: Set your home to your current location.
+  sethome:
-    usage: /<command>
+    description: Set your home to your current location.
-    aliases: [esethome]
+    usage: /<command>
-  setjail:
+    aliases: [esethome]
-    description: Creates a jail where you specified named [jailname]
+  setjail:
-    usage: /<command> [jailname]
+    description: Creates a jail where you specified named [jailname]
-    aliases: [esetjail]
+    usage: /<command> [jailname]
-  setwarp:
+    aliases: [esetjail]
-    description: Creates a new warp.
+  setwarp:
-    usage: /<command> [warp]
+    description: Creates a new warp.
-    aliases: [createwarp,esetwarp]
+    usage: /<command> [warp]
-  setworth:
+    aliases: [createwarp,esetwarp]
-    description: Set the sell value of an item.
+  setworth:
-    usage: /<command> [itemname|id] [price]
+    description: Set the sell value of an item.
-    aliases: [esetworth]
+    usage: /<command> [itemname|id] [price]
-  socialspy:
+    aliases: [esetworth]
-    description: Toggles if you can see msg/mail commands in chat.
+  socialspy:
-    usage: /<command>
+    description: Toggles if you can see msg/mail commands in chat.
-    aliases: [esocialspy]
+    usage: /<command>
-  spawner:
+    aliases: [esocialspy]
-    description: Change the mob type of a spawner
+  spawner:
-    usage: /<command> [mob]
+    description: Change the mob type of a spawner
-    aliases: [espawner]
+    usage: /<command> [mob]
-  spawnmob:
+    aliases: [espawner]
-    description: Spawns a mob.
+  spawnmob:
-    usage: /<command> [mob]<:data><,mount<:data>> <amount>
+    description: Spawns a mob.
-    aliases: [espawnmob]
+    usage: /<command> [mob]<:data><,mount<:data>> <amount>
-  suicide:
+    aliases: [espawnmob]
-    description: Causes you to perish.
+  suicide:
-    usage: /<command>
+    description: Causes you to perish.
-    aliases: [esuicide]
+    usage: /<command>
-  tempban:
+    aliases: [esuicide]
-    description: Temporary ban a user.
+  tempban:
-    usage: /<command> [playername] [datediff]
+    description: Temporary ban a user.
-    aliases: [etempban]
+    usage: /<command> [playername] [datediff]
-  thunder:
+    aliases: [etempban]
-    description: Enable/disable thunder.
+  thunder:
-    usage: /<command> <true/false> [duration]
+    description: Enable/disable thunder.
-    aliases: [ethunder]
+    usage: /<command> <true/false> [duration]
-  time:
+    aliases: [ethunder]
-    description: Change the time to day or night of the player (default) or world (essentials.time.world permission).
+  time:
-    usage: /<command> [day|night|reset] <playername>
+    description: Change the time to day or night of the player (default) or world (essentials.time.world permission).
-    aliases: [etime]
+    usage: /<command> [day|night|reset] <playername>
-  togglejail:
+    aliases: [etime]
-    description: Prevents a player from interacting with the world and teleports him/her to the the jail specified
+  togglejail:
-    usage: /<command> [player] [jailname] <datediff>
+    description: Prevents a player from interacting with the world and teleports him/her to the the jail specified
-    aliases: [tjail,etogglejail]
+    usage: /<command> [player] [jailname] <datediff>
-  top:
+    aliases: [tjail,etogglejail]
-    description: Teleport to the highest block at your current position.
+  top:
-    usage: /<command>
+    description: Teleport to the highest block at your current position.
-    aliases: [etop]
+    usage: /<command>
-  tp:
+    aliases: [etop]
-    description: Teleport to a player.
+  tp:
-    usage: /<command> [player]
+    description: Teleport to a player.
-    aliases: [etp]
+    usage: /<command> [player]
-  tpa:
+    aliases: [etp]
-    description: Request to teleport to the specified player.
+  tpa:
-    usage: /<command> <player>
+    description: Request to teleport to the specified player.
-  tpaccept:
+    usage: /<command> <player>
-    description: Accepts a teleport request.
+  tpaccept:
-    usage: /<command>
+    description: Accepts a teleport request.
-  tpahere:
+    usage: /<command>
-    description: Request that the specified player teleport to you.
+    aliases: [tpyes]
-    usage: /<command> <player>
+  tpahere:
-  tpall:
+    description: Request that the specified player teleport to you.
-    description: Teleport all online players to another player.
+    usage: /<command> <player>
-    usage: /<command> <player>
+  tpall:
-  tpdeny:
+    description: Teleport all online players to another player.
-    description: Reject a teleport request.
+    usage: /<command> <player>
-    usage: /<command>
+  tpdeny:
-  tphere:
+    description: Reject a teleport request.
-    description: Teleport a player to you.
+    usage: /<command>
-    usage: /<command> [player]
+    aliases: [tpno]
-    aliases: [s]
+  tphere:
-  tpo:
+    description: Teleport a player to you.
-    description: Teleport override for tptoggle.
+    usage: /<command> [player]
-    usage: /<command> <player>
+    aliases: [s]
-  tpohere:
+  tpo:
-    description: Teleport here override for tptoggle.
+    description: Teleport override for tptoggle.
-    usage: /<command> <player>
+    usage: /<command> <player>
-  tppos:
+  tpohere:
-    description: Teleport to coordinates.
+    description: Teleport here override for tptoggle.
-    usage: /<command> <x> <y> <z>
+    usage: /<command> <player>
-  tptoggle:
+  tppos:
-    description: Blocks all forms of teleportation.
+    description: Teleport to coordinates.
-    usage: /<command>
+    usage: /<command> <x> <y> <z>
-  tree:
+  tptoggle:
-    description: Spawn a tree where you are looking.
+    description: Blocks all forms of teleportation.
-    usage: /<command> [tree|birch|redwood]
+    usage: /<command>
-    aliases: [etree]
+  tree:
-  unban:
+    description: Spawn a tree where you are looking.
-    description: Unbans the specified player.
+    usage: /<command> [tree|birch|redwood]
-    usage: /<command> [player]
+    aliases: [etree]
-    aliases: [pardon,eunban]
+  unban:
-  unbanip:
+    description: Unbans the specified player.
-    description: Unbans the specified IP address.
+    usage: /<command> [player]
-    usage: /<command> [address]
+    aliases: [pardon,eunban]
-    aliases: [eunbanip,pardonip]
+  unbanip:
-  unlimited:
+    description: Unbans the specified IP address.
-    description: Allows the unlimited placing of items.
+    usage: /<command> [address]
-    usage: /<command> [list|item] <player>
+    aliases: [eunbanip,pardonip]
-    aliases: [eunlimited]
+  unlimited:
-  warp:
+    description: Allows the unlimited placing of items.
-    description: List all warps or warp to the specified location.
+    usage: /<command> [list|item] <player>
-    usage: /<command> <warp> <player>
+    aliases: [eunlimited,ul,eul]
-    aliases: [ewarp]
+  warp:
-  weather:
+    description: List all warps or warp to the specified location.
-    description: Setting the weather.
+    usage: /<command> <warp> <player>
-    usage: /<command> <storm/sun> [duration]
+    aliases: [ewarp,warps]
-    aliases: [sky,sun,storm,eweather]
+  weather:
-  whois:
+    description: Setting the weather.
-    description: Determine the username behind a nickname.
+    usage: /<command> <storm/sun> [duration]
-    usage: /<command> [nickname]
+    aliases: [sky,sun,storm,eweather,esky,esun,estorm]
-    aliases: [ewhois]
+  whois:
-  world:
+    description: Determine the username behind a nickname.
-    description: Switch between worlds.
+    usage: /<command> [nickname]
-    usage: /<command> [world]
+    aliases: [ewhois]
-    aliases: [eworld]
+  world:
-  worth:
+    description: Switch between worlds.
-    description: Calculates the worth of items in hand or as specified.
+    usage: /<command> [world]
-    usage: /<command> <item> <amount>
+    aliases: [eworld]
+  worth:
+    description: Calculates the worth of items in hand or as specified.
+    usage: /<command> <item> <amount>
     aliases: [eworth]

Essentials/src/worth.yml

@@ -1,199 +1,199 @@
-worth:
+worth:
-    stonebutton:
+    stonebutton:
-        '0': 7.0
+        '0': 7.0
-    wood: 1.0
+    wood: 1.0
-    arrow: 10.0
+    arrow: 10.0
-    diamondpickaxe: 1000.0
+    diamondpickaxe: 1000.0
-    rawfish: 5.0
+    rawfish: 5.0
-    minecart: 20.0
+    minecart: 20.0
-    leatherchestplate: 40.0
+    leatherchestplate: 40.0
-    storageminecart: 35.0
+    storageminecart: 35.0
-    leaves:
+    leaves:
-        '0': 0.0
+        '0': 0.0
-    feather: 3.0
+    feather: 3.0
-    goldchestplate: 600.0
+    goldchestplate: 600.0
-    mushroomsoup: 30.0
+    mushroomsoup: 30.0
-    bread: 20.0
+    bread: 20.0
-    stationarywater:
+    stationarywater:
-        '0': 1.0
+        '0': 1.0
-    workbench: 20.0
+    workbench: 20.0
-    stonehoe: 40.0
+    stonehoe: 40.0
-    brownmushroom: 2.0
+    brownmushroom: 2.0
-    wool:
+    wool:
-        '0': 8.0
+        '0': 8.0
-    mossycobblestone: 90.0
+    mossycobblestone: 90.0
-    diamondhoe: 600.0
+    diamondhoe: 600.0
-    woodsword: 10.0
+    woodsword: 10.0
-    torch:
+    torch:
-        '0': 1.0
+        '0': 1.0
-    grass: 1.0
+    grass: 1.0
-    poweredminecart: 30.0
+    poweredminecart: 30.0
-    snowball: 1.0
+    snowball: 1.0
-    goldenapple: 500.0
+    goldenapple: 500.0
-    leatherleggings: 20.0
+    leatherleggings: 20.0
-    log:
+    log:
-        '0': 2.0
+        '0': 2.0
-    diamondaxe: 1000.0
+    diamondaxe: 1000.0
-    slimeball: 50.0
+    slimeball: 50.0
-    fence: 10.0
+    fence: 10.0
-    stonespade: 40.0
+    stonespade: 40.0
-    claybrick: 10.0
+    claybrick: 10.0
-    noteblock: 40.0
+    noteblock: 40.0
-    ironaxe: 60.0
+    ironaxe: 60.0
-    coalore: 15.0
+    coalore: 15.0
-    clayball: 8.0
+    clayball: 8.0
-    fishingrod: 25.0
+    fishingrod: 25.0
-    ironhoe: 60.0
+    ironhoe: 60.0
-    goldrecord: 950.0
+    goldrecord: 950.0
-    ironpickaxe: 80.0
+    ironpickaxe: 80.0
-    irondoor: 35.0
+    irondoor: 35.0
-    bucket: 10.0
+    bucket: 10.0
-    redrose: 2.0
+    redrose: 2.0
-    grilledpork: 6.0
+    grilledpork: 6.0
-    gravel: 1.0
+    gravel: 1.0
-    wooddoor: 30.0
+    wooddoor: 30.0
-    chainmailhelmet: 40.0
+    chainmailhelmet: 40.0
-    ironchestplate: 300.0
+    ironchestplate: 300.0
-    diamondblock: 1500.0
+    diamondblock: 1500.0
-    diamondhelmet: 1500.0
+    diamondhelmet: 1500.0
-    goldhelmet: 300.0
+    goldhelmet: 300.0
-    redstonetorchon:
+    redstonetorchon:
-        '0': 10.0
+        '0': 10.0
-    ironspade: 40.0
+    ironspade: 40.0
-    furnace:
+    furnace:
-        '0': 10.0
+        '0': 10.0
-    ironsword: 60.0
+    ironsword: 60.0
-    dispenser:
+    dispenser:
-        '0': 9.0
+        '0': 9.0
-    woodaxe: 10.0
+    woodaxe: 10.0
-    seeds: 5.0
+    seeds: 5.0
-    painting: 50.0
+    painting: 50.0
-    woodplate:
+    woodplate:
-        '0': 10.0
+        '0': 10.0
-    redstoneore: 30.0
+    redstoneore: 30.0
-    diamondspade: 350.0
+    diamondspade: 350.0
-    waterbucket: 10.0
+    waterbucket: 10.0
-    water:
+    water:
-        '0': 1.0
+        '0': 1.0
-    bedrock: 1000.0
+    bedrock: 1000.0
-    irondoorblock:
+    irondoorblock:
-        '0': 15.0
+        '0': 15.0
-    goldhoe: 200.0
+    goldhoe: 200.0
-    sand: 1.0
+    sand: 1.0
-    goldsword: 200.0
+    goldsword: 200.0
-    stoneaxe: 40.0
+    stoneaxe: 40.0
-    bookshelf: 20.0
+    bookshelf: 20.0
-    ironblock: 160.0
+    ironblock: 160.0
-    jackolantern:
+    jackolantern:
-        '0': 60.0
+        '0': 60.0
-    boat: 5.0
+    boat: 5.0
-    diamondchestplate: 3000.0
+    diamondchestplate: 3000.0
-    redstonewire:
+    redstonewire:
-        '0': 7.0
+        '0': 7.0
-    redmushroom: 2.0
+    redmushroom: 2.0
-    string: 5.0
+    string: 5.0
-    stoneplate:
+    stoneplate:
-        '0': 10.0
+        '0': 10.0
-    wallsign:
+    wallsign:
-        '0': 1.0
+        '0': 1.0
-    cactus:
+    cactus:
-        '0': 10.0
+        '0': 10.0
-    sulphur: 19.0
+    sulphur: 19.0
-    rails:
+    rails:
-        '0': 40.0
+        '0': 40.0
-    ironore: 18.0
+    ironore: 18.0
-    leatherhelmet: 20.0
+    leatherhelmet: 20.0
-    stone: 2.0
+    stone: 2.0
-    egg: 1.0
+    egg: 1.0
-    diamondore: 200.0
+    diamondore: 200.0
-    woodhoe: 10.0
+    woodhoe: 10.0
-    goldleggings: 400.0
+    goldleggings: 400.0
-    chainmailleggings: 50.0
+    chainmailleggings: 50.0
-    yellowflower: 2.0
+    yellowflower: 2.0
-    ironhelmet: 120.0
+    ironhelmet: 120.0
-    obsidian: 130.0
+    obsidian: 130.0
-    dirt: 1.0
+    dirt: 1.0
-    leather: 10.0
+    leather: 10.0
-    leatherboots: 17.0
+    leatherboots: 17.0
-    lever:
+    lever:
-        '0': 7.0
+        '0': 7.0
-    cobblestone: 1.0
+    cobblestone: 1.0
-    cake: 100.0
+    cake: 100.0
-    woodstairs:
+    woodstairs:
-        '0': 8.0
+        '0': 8.0
-    ironingot: 20.0
+    ironingot: 20.0
-    goldore: 45.0
+    goldore: 45.0
-    pumpkin:
+    pumpkin:
-        '0': 50.0
+        '0': 50.0
-    bed: 25.0
+    bed: 25.0
-    watch: 100.0
+    watch: 100.0
-    ironleggings: 250.0
+    ironleggings: 250.0
-    sign: 10.0
+    sign: 10.0
-    doublestep:
+    doublestep:
-        '0': 3.0
+        '0': 3.0
-    woodpickaxe: 10.0
+    woodpickaxe: 10.0
-    stonepickaxe: 40.0
+    stonepickaxe: 40.0
-    chainmailboots: 30.0
+    chainmailboots: 30.0
-    diamondleggings: 2200.0
+    diamondleggings: 2200.0
-    cookedfish: 20.0
+    cookedfish: 20.0
-    saddle: 100.0
+    saddle: 100.0
-    cobblestonestairs:
+    cobblestonestairs:
-        '0': 22.0
+        '0': 22.0
-    tnt: 10000.0
+    tnt: 10000.0
-    glowingredstoneore: 30.0
+    glowingredstoneore: 30.0
-    apple: 10.0
+    apple: 10.0
-    woodspade: 10.0
+    woodspade: 10.0
-    goldingot: 50.0
+    goldingot: 50.0
-    diode: 10.0
+    diode: 10.0
-    soil:
+    soil:
-        '0': 3.0
+        '0': 3.0
-    clay: 3.0
+    clay: 3.0
-    goldblock: 400.0
+    goldblock: 400.0
-    stick: 1.0
+    stick: 1.0
-    paper: 30.0
+    paper: 30.0
-    brick: 40.0
+    brick: 40.0
-    stationarylava:
+    stationarylava:
-        '0': 1.0
+        '0': 1.0
-    chest: 15.0
+    chest: 15.0
-    sandstone: 5.0
+    sandstone: 5.0
-    goldpickaxe: 300.0
+    goldpickaxe: 300.0
-    compass: 50.0
+    compass: 50.0
-    sugarcane: 10.0
+    sugarcane: 10.0
-    diamondsword: 700.0
+    diamondsword: 700.0
-    goldboots: 250.0
+    goldboots: 250.0
-    sponge: 80.0
+    sponge: 80.0
-    stonesword: 40.0
+    stonesword: 40.0
-    coal:
+    coal:
-        '0': 3.0
+        '0': 3.0
-    goldaxe: 300.0
+    goldaxe: 300.0
-    bone: 10.0
+    bone: 10.0
-    diamond: 230.0
+    diamond: 230.0
-    glass: 10.0
+    glass: 10.0
-    goldspade: 220.0
+    goldspade: 220.0
-    lapisblock: 500.0
+    lapisblock: 500.0
-    lavabucket: 30.0
+    lavabucket: 30.0
-    wheat: 9.0
+    wheat: 9.0
-    ladder:
+    ladder:
-        '0': 10.0
+        '0': 10.0
-    sugarcaneblock:
+    sugarcaneblock:
-        '0': 15.0
+        '0': 15.0
-    bowl: 6.0
+    bowl: 6.0
-    chainmailchestplate: 40.0
+    chainmailchestplate: 40.0
-    sapling:
+    sapling:
-        '0': 2.0
+        '0': 2.0
-    diamondboots: 1500.0
+    diamondboots: 1500.0
-    lapisore: 100.0
+    lapisore: 100.0
-    lava:
+    lava:
-        '0': 1.0
+        '0': 1.0
-    milkbucket: 15.0
+    milkbucket: 15.0
-    redstone: 1.0
+    redstone: 1.0
-    greenrecord: 1000.0
+    greenrecord: 1000.0
-    inksack:
+    inksack:
-        '0': 10.0
+        '0': 10.0
-    glowstonedust: 11.0
+    glowstonedust: 11.0
-    book: 35.0
+    book: 35.0
-    bow: 75.0
+    bow: 75.0
-    ironboots: 50.0
+    ironboots: 50.0
-    step:
+    step:
-        '0': 3.0
+        '0': 3.0
-    sugar: 5.0
+    sugar: 5.0

Essentials/workdir/server.log

@@ -1,264 +0,0 @@
-2011-02-28 16:56:00 [INFO] Starting minecraft server version Beta 1.3
-2011-02-28 16:56:00 [INFO] Loading properties
-2011-02-28 16:56:00 [WARNING] server.properties does not exist
-2011-02-28 16:56:00 [INFO] Generating new properties file
-2011-02-28 16:56:00 [INFO] Starting Minecraft server on *:25565
-2011-02-28 16:56:00 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3)
-2011-02-28 16:56:00 [WARNING] Failed to load ban list: java.io.FileNotFoundException: banned-players.txt (The system cannot find the file specified)
-2011-02-28 16:56:00 [WARNING] Failed to load ip ban list: java.io.FileNotFoundException: banned-ips.txt (The system cannot find the file specified)
-2011-02-28 16:56:00 [WARNING] Failed to load ops: java.io.FileNotFoundException: ops.txt (The system cannot find the file specified)
-2011-02-28 16:56:00 [WARNING] Failed to load white-list: java.io.FileNotFoundException: white-list.txt (The system cannot find the file specified)
-2011-02-28 16:56:00 [INFO] Preparing level "world"
-2011-02-28 16:56:00 [INFO] Preparing start region
-2011-02-28 16:56:01 [INFO] <20>eLoaded Essentials build TeamCity maintained by Zenexer, ementalo, Aelux, and Brettflan
-2011-02-28 16:56:02 [INFO] Preparing spawn area: 4%
-2011-02-28 16:56:03 [INFO] Preparing spawn area: 8%
-2011-02-28 16:56:04 [INFO] Preparing spawn area: 20%
-2011-02-28 16:56:05 [INFO] Preparing spawn area: 32%
-2011-02-28 16:56:06 [INFO] Preparing spawn area: 40%
-2011-02-28 16:56:07 [INFO] Preparing spawn area: 48%
-2011-02-28 16:56:08 [INFO] Starting minecraft server version Beta 1.3
-2011-02-28 16:56:08 [INFO] Loading properties
-2011-02-28 16:56:08 [INFO] Starting Minecraft server on *:25565
-2011-02-28 16:56:08 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3)
-2011-02-28 16:56:09 [INFO] Preparing level "world"
-2011-02-28 16:56:09 [INFO] Preparing start region
-2011-02-28 16:56:10 [INFO] <20>eLoaded Essentials build TeamCity maintained by Zenexer, ementalo, Aelux, and Brettflan
-2011-02-28 16:56:10 [INFO] Preparing spawn area: 4%
-2011-02-28 16:56:10 [INFO] Should update an existing player with the same name, rather than creating a new player
-2011-02-28 16:56:11 [INFO] Starting minecraft server version Beta 1.3
-2011-02-28 16:56:11 [INFO] >
-2011-02-28 16:56:11 [INFO] Preparing spawn area: 8%
-2011-02-28 16:57:39 [INFO] Starting minecraft server version Beta 1.3
-2011-02-28 16:57:39 [INFO] Loading properties
-2011-02-28 16:57:39 [INFO] Starting Minecraft server on *:25565
-2011-02-28 16:57:39 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3)
-2011-02-28 16:57:39 [INFO] Preparing level "world"
-2011-02-28 16:57:39 [INFO] Preparing start region
-2011-02-28 16:57:41 [INFO] <20>eLoaded Essentials build TeamCity maintained by Zenexer, ementalo, Aelux, and Brettflan
-2011-02-28 16:57:41 [INFO] Preparing spawn area: 4%
-2011-02-28 16:57:42 [INFO] Preparing spawn area: 8%
-2011-02-28 16:57:43 [INFO] Preparing spawn area: 16%
-2011-02-28 16:57:44 [INFO] Preparing spawn area: 24%
-2011-02-28 16:57:45 [INFO] Preparing spawn area: 24%
-2011-02-28 16:57:48 [INFO] Starting minecraft server version Beta 1.3
-2011-02-28 16:57:48 [INFO] Loading properties
-2011-02-28 16:57:48 [INFO] Starting Minecraft server on *:25565
-2011-02-28 16:57:48 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3)
-2011-02-28 16:57:49 [INFO] Preparing level "world"
-2011-02-28 16:57:49 [INFO] Preparing start region
-2011-02-28 16:57:50 [INFO] <20>eLoaded Essentials build TeamCity maintained by Zenexer, ementalo, Aelux, and Brettflan
-2011-02-28 16:57:50 [INFO] Preparing spawn area: 8%
-2011-02-28 16:57:51 [INFO] >
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] Starting minecraft server version Beta 1.3
-2011-02-28 16:57:51 [INFO] Preparing spawn area: 12%
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:51 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:52 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:53 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:54 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:55 [INFO] 
-2011-02-28 16:57:56 [INFO] 
-2011-02-28 16:57:56 [INFO] 
-2011-02-28 16:57:56 [INFO] 
-2011-02-28 16:57:56 [INFO] 
-2011-02-28 16:59:07 [INFO] Starting minecraft server version Beta 1.3
-2011-02-28 16:59:07 [INFO] Loading properties
-2011-02-28 16:59:07 [INFO] Starting Minecraft server on *:25565
-2011-02-28 16:59:07 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3)
-2011-02-28 16:59:07 [INFO] Preparing level "world"
-2011-02-28 16:59:07 [INFO] Preparing start region
-2011-02-28 16:59:08 [INFO] Done (0.060s)! For help, type "help" or "?"
-2011-02-28 16:59:08 [INFO] Stopping server
-2011-02-28 16:59:08 [INFO] Saving chunks
-2011-02-28 16:59:09 [INFO] Starting minecraft server version Beta 1.3
-2011-02-28 16:59:09 [INFO] Loading properties
-2011-02-28 16:59:09 [INFO] Starting Minecraft server on *:25565
-2011-02-28 16:59:09 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3)
-2011-02-28 16:59:09 [INFO] Preparing level "world"
-2011-02-28 16:59:09 [INFO] Preparing start region
-2011-02-28 16:59:10 [INFO] Done (0.011s)! For help, type "help" or "?"
-2011-02-28 16:59:10 [INFO] Stopping server
-2011-02-28 16:59:10 [INFO] Saving chunks

Essentials/workdir/server.properties

@@ -1,13 +0,0 @@
-#Minecraft server properties
-#Mon Feb 28 16:56:01 EST 2011
-level-name=world
-hellworld=false
-spawn-monsters=true
-online-mode=true
-spawn-animals=true
-max-players=20
-server-ip=
-pvp=true
-server-port=25565
-white-list=false
-spawn-protection=16

Essentials/workdir/userdata/TestPlayer1.yml

@@ -1,2 +0,0 @@
-home: [1.0, 2.0, 3.0, 4.0, 5.0, world]
-money: 75.5

EssentialsChat/build.xml

@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [ <!ENTITY buildinc SYSTEM "../build.inc.xml"> ]>
+<!DOCTYPE project [ <!ENTITY buildinc SYSTEM "../build.inc.xml"> ]>
-<!-- You may freely edit this file. See commented blocks below for -->
+<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
+<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
+<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
+<!-- in the project's Project Properties dialog box.-->
-<project name="EssentialsChat" default="default" basedir=".">
+<project name="EssentialsChat" default="default" basedir=".">
-    <description>Builds, tests, and runs the project EssentialsChat.</description>
+    <description>Builds, tests, and runs the project EssentialsChat.</description>
-    <import file="nbproject/build-impl.xml"/>
+    <import file="nbproject/build-impl.xml"/>
-	&buildinc;
+	&buildinc;
-    <!--
+    <!--
-
+
-    There exist several targets which are by default empty and which can be 
+    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
+    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
+    before and after some main targets. They are: 
-
+
-      -pre-init:                 called before initialization of project properties
+      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
+      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
+      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
+      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
+      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
+      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
+      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
+      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
+      -post-clean:               called after cleaning build products
-
+
-    (Targets beginning with '-' are not intended to be called on their own.)
+    (Targets beginning with '-' are not intended to be called on their own.)
-
+
-    Example of inserting an obfuscator after compilation could look like this:
+    Example of inserting an obfuscator after compilation could look like this:
-
+
-        <target name="-post-compile">
+        <target name="-post-compile">
-            <obfuscate>
+            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
+                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
+            </obfuscate>
-        </target>
+        </target>
-
+
-    For list of available properties check the imported 
+    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-
+
-    Another way to customize the build is by overriding existing main targets.
+    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
+    The targets of interest are: 
-
+
-      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
+      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
+      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
+      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
+      test-report:              JUnit report generation
-
+
-    An example of overriding the target for project execution could look like this:
+    An example of overriding the target for project execution could look like this:
-
+
-        <target name="run" depends="EssentialsChat-impl.jar">
+        <target name="run" depends="EssentialsChat-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
+            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
+                <arg file="${dist.jar}"/>
-            </exec>
+            </exec>
-        </target>
+        </target>
-
+
-    Notice that the overridden target depends on the jar target and not only on 
+    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
+    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
+    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-    -->
+    -->
-</project>
+</project>

EssentialsChat/nbproject/project.properties

@@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 application.title=EssentialsChat
-application.vendor=Paul
+application.vendor=
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -28,7 +63,7 @@ endorsed.classpath=
 excludes=
 file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
 includes=**
-jar.compress=false
+jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
     ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
@@ -37,8 +72,8 @@ javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.5
+javac.source=1.6
-javac.target=1.5
+javac.target=1.6
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
@@ -58,7 +93,7 @@ javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
 meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
+mkdist.disabled=true
 platform.active=default_platform
 project.Essentials=../Essentials
 reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar

EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java

@@ -101,7 +101,7 @@ public class EssentialsChatPlayerListener extends PlayerListener
 			{
 				continue;
 			}
-			if (!u.isAuthorized("essentials.chat.spy"))
+			if (!u.equals(user) && !u.isAuthorized("essentials.chat.spy"))
 			{
 				final Location l = u.getLocation();
 				final int dx = x - l.getBlockX();

EssentialsGeoIP/nbproject/project.properties

@@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 application.title=EssentialsGeoIP
-application.vendor=snowleo
+application.vendor=
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -28,7 +63,7 @@ endorsed.classpath=
 excludes=
 file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
 includes=**
-jar.compress=false
+jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
     ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
@@ -60,7 +95,7 @@ javadoc.windowtitle=
 main.class=
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
+mkdist.disabled=true
 platform.active=default_platform
 project.Essentials=../Essentials
 reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar

EssentialsGroupBridge/build.xml

@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
+<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
+<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
+<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
+<!-- in the project's Project Properties dialog box.-->
-<project name="EssentialsGroupBridge" default="default" basedir=".">
+<project name="EssentialsGroupBridge" default="default" basedir=".">
-    <description>Builds, tests, and runs the project EssentialsGroupBridge.</description>
+    <description>Builds, tests, and runs the project EssentialsGroupBridge.</description>
-    <import file="nbproject/build-impl.xml"/>
+    <import file="nbproject/build-impl.xml"/>
-    <!--
+    <!--
-
+
-    There exist several targets which are by default empty and which can be 
+    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
+    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
+    before and after some main targets. They are: 
-
+
-      -pre-init:                 called before initialization of project properties
+      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
+      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
+      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
+      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
+      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
+      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
+      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
+      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
+      -post-clean:               called after cleaning build products
-
+
-    (Targets beginning with '-' are not intended to be called on their own.)
+    (Targets beginning with '-' are not intended to be called on their own.)
-
+
-    Example of inserting an obfuscator after compilation could look like this:
+    Example of inserting an obfuscator after compilation could look like this:
-
+
-        <target name="-post-compile">
+        <target name="-post-compile">
-            <obfuscate>
+            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
+                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
+            </obfuscate>
-        </target>
+        </target>
-
+
-    For list of available properties check the imported 
+    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-
+
-    Another way to customize the build is by overriding existing main targets.
+    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
+    The targets of interest are: 
-
+
-      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
+      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
+      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
+      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
+      test-report:              JUnit report generation
-
+
-    An example of overriding the target for project execution could look like this:
+    An example of overriding the target for project execution could look like this:
-
+
-        <target name="run" depends="EssentialsGroupBridge-impl.jar">
+        <target name="run" depends="EssentialsGroupBridge-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
+            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
+                <arg file="${dist.jar}"/>
-            </exec>
+            </exec>
-        </target>
+        </target>
-
+
-    Notice that the overridden target depends on the jar target and not only on 
+    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
+    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
+    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-    -->
+    -->
-</project>
+</project>

EssentialsGroupBridge/nbproject/project.properties

@@ -1,78 +1,90 @@
-annotation.processing.enabled=true
+annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
+annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
+annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=EssentialsGroupBridge
+application.title=EssentialsGroupBridge
-application.vendor=gabrielcouto
+application.vendor=gabrielcouto
-build.classes.dir=${build.dir}/classes
+build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
+build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
+# This directory is removed when the project is cleaned:
-build.dir=build
+build.dir=build
-build.generated.dir=${build.dir}/generated
+build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
+build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
+# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
+build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
+build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
+build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
+# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
+#debug.transport=dt_socket
-debug.classpath=\
+debug.classpath=\
-    ${run.classpath}
+    ${run.classpath}
-debug.test.classpath=\
+debug.test.classpath=\
-    ${run.test.classpath}
+    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
+# This directory is removed when the project is cleaned:
-dist.dir=dist
+dist.dir=dist
-dist.jar=${dist.dir}/EssentialsGroupBridge.jar
+dist.jar=${dist.dir}/EssentialsGroupBridge.jar
-dist.javadoc.dir=${dist.dir}/javadoc
+dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
+endorsed.classpath=
-excludes=
+excludes=
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
+file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
-file.reference.Permissions.jar=..\\lib\\Permissions.jar
+file.reference.Permissions.jar=..\\lib\\Permissions.jar
-includes=**
+includes=**
-jar.compress=false
+jar.archive.disabled=${jnlp.enabled}
-javac.classpath=\
+jar.compress=true
-    ${reference.EssentialsGroupManager.jar}:\
+jar.index=${jnlp.enabled}
-    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
+javac.classpath=\
-    ${file.reference.Permissions.jar}
+    ${reference.EssentialsGroupManager.jar}:\
-# Space-separated list of extra javac options
+    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
-javac.compilerargs=
+    ${file.reference.Permissions.jar}
-javac.deprecation=false
+# Space-separated list of extra javac options
-javac.processorpath=\
+javac.compilerargs=
-    ${javac.classpath}
+javac.deprecation=false
-javac.source=1.6
+javac.processorpath=\
-javac.target=1.6
+    ${javac.classpath}
-javac.test.classpath=\
+javac.source=1.6
-    ${javac.classpath}:\
+javac.target=1.6
-    ${build.classes.dir}
+javac.test.classpath=\
-javac.test.processorpath=\
+    ${javac.classpath}:\
-    ${javac.test.classpath}
+    ${build.classes.dir}
-javadoc.additionalparam=
+javac.test.processorpath=\
-javadoc.author=false
+    ${javac.test.classpath}
-javadoc.encoding=${source.encoding}
+javadoc.additionalparam=
-javadoc.noindex=false
+javadoc.author=false
-javadoc.nonavbar=false
+javadoc.encoding=${source.encoding}
-javadoc.notree=false
+javadoc.noindex=false
-javadoc.private=false
+javadoc.nonavbar=false
-javadoc.splitindex=true
+javadoc.notree=false
-javadoc.use=true
+javadoc.private=false
-javadoc.version=false
+javadoc.splitindex=true
-javadoc.windowtitle=
+javadoc.use=true
-main.class=
+javadoc.version=false
-manifest.file=manifest.mf
+javadoc.windowtitle=
-meta.inf.dir=${src.dir}/META-INF
+jnlp.codebase.type=no.codebase
-platform.active=default_platform
+jnlp.descriptor=application
-project.EssentialsGroupManager=../EssentialsGroupManager
+jnlp.enabled=false
-reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
+jnlp.mixed.code=default
-run.classpath=\
+jnlp.offline-allowed=false
-    ${javac.classpath}:\
+jnlp.signed=false
-    ${build.classes.dir}
+jnlp.signing=
-# Space-separated list of JVM arguments used when running the project
+jnlp.signing.alias=
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+jnlp.signing.keystore=
-# or test-sys-prop.name=value to set system properties for unit tests):
+main.class=
-run.jvmargs=
+manifest.file=manifest.mf
-run.test.classpath=\
+meta.inf.dir=${src.dir}/META-INF
-    ${javac.test.classpath}:\
+mkdist.disabled=true
-    ${build.test.classes.dir}
+platform.active=default_platform
-source.encoding=UTF-8
+project.EssentialsGroupManager=../EssentialsGroupManager
-src.dir=src
+reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
-test.src.dir=test
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test

EssentialsGroupBridge/nbproject/project.xml

@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
+<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
+    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
+    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>EssentialsGroupBridge</name>
+            <name>EssentialsGroupBridge</name>
-            <source-roots>
+            <source-roots>
-                <root id="src.dir"/>
+                <root id="src.dir"/>
-            </source-roots>
+            </source-roots>
-            <test-roots>
+            <test-roots>
-                <root id="test.src.dir"/>
+                <root id="test.src.dir"/>
-            </test-roots>
+            </test-roots>
-        </data>
+        </data>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
+            <reference>
-                <foreign-project>EssentialsGroupManager</foreign-project>
+                <foreign-project>EssentialsGroupManager</foreign-project>
-                <artifact-type>jar</artifact-type>
+                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
+                <script>build.xml</script>
-                <target>jar</target>
+                <target>jar</target>
-                <clean-target>clean</clean-target>
+                <clean-target>clean</clean-target>
-                <id>jar</id>
+                <id>jar</id>
-            </reference>
+            </reference>
-        </references>
+        </references>
-    </configuration>
+    </configuration>
-</project>
+</project>

EssentialsGroupBridge/src/com/nijikokun/bukkit/Permissions/Permissions.java

@@ -3,7 +3,6 @@ package com.nijikokun.bukkit.Permissions;
 import com.nijiko.Misc;
 import com.nijiko.configuration.DefaultConfiguration;
 import com.nijiko.permissions.PermissionHandler;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.permissions.NijikoPermissionsProxy;
@@ -56,10 +55,6 @@ public class Permissions extends JavaPlugin {
 
     @Override
     public void onEnable() {
-		if (!Thread.currentThread().getStackTrace()[5].getMethodName().equals("loadPlugin")) {
-			Logger.getLogger("Minecraft").log(Level.SEVERE, "Another plugin is trying to enable Permissions manually. Don't do this! It's probably "
-					+ Thread.currentThread().getStackTrace()[5].getClassName());
-		}
         Server = this.getServer();
         PluginDescriptionFile pdfFile = this.getDescription();
 

EssentialsGroupManager/build.xml

@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
+<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
+<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
+<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
+<!-- in the project's Project Properties dialog box.-->
-<project name="EssentialsGroupManager" default="default" basedir=".">
+<project name="EssentialsGroupManager" default="default" basedir=".">
-    <description>Builds, tests, and runs the project EssentialsGroupManager.</description>
+    <description>Builds, tests, and runs the project EssentialsGroupManager.</description>
-    <import file="nbproject/build-impl.xml"/>
+    <import file="nbproject/build-impl.xml"/>
-    <!--
+    <!--
-
+
-    There exist several targets which are by default empty and which can be 
+    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
+    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
+    before and after some main targets. They are: 
-
+
-      -pre-init:                 called before initialization of project properties
+      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
+      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
+      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
+      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
+      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
+      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
+      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
+      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
+      -post-clean:               called after cleaning build products
-
+
-    (Targets beginning with '-' are not intended to be called on their own.)
+    (Targets beginning with '-' are not intended to be called on their own.)
-
+
-    Example of inserting an obfuscator after compilation could look like this:
+    Example of inserting an obfuscator after compilation could look like this:
-
+
-        <target name="-post-compile">
+        <target name="-post-compile">
-            <obfuscate>
+            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
+                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
+            </obfuscate>
-        </target>
+        </target>
-
+
-    For list of available properties check the imported 
+    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-
+
-    Another way to customize the build is by overriding existing main targets.
+    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
+    The targets of interest are: 
-
+
-      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
+      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
+      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
+      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
+      test-report:              JUnit report generation
-
+
-    An example of overriding the target for project execution could look like this:
+    An example of overriding the target for project execution could look like this:
-
+
-        <target name="run" depends="EssentialsGroupManager-impl.jar">
+        <target name="run" depends="EssentialsGroupManager-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
+            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
+                <arg file="${dist.jar}"/>
-            </exec>
+            </exec>
-        </target>
+        </target>
-
+
-    Notice that the overridden target depends on the jar target and not only on 
+    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
+    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
+    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-    -->
+    -->
-</project>
+</project>

EssentialsGroupManager/nbproject/project.properties

@@ -1,73 +1,74 @@
-annotation.processing.enabled=true
+annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
+annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
+annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=EssentialsGroupManager
+application.title=EssentialsGroupManager
-application.vendor=gabrielcouto
+application.vendor=gabrielcouto
-build.classes.dir=${build.dir}/classes
+build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
+build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
+# This directory is removed when the project is cleaned:
-build.dir=build
+build.dir=build
-build.generated.dir=${build.dir}/generated
+build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
+build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
+# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
+build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
+build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
+build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
+# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
+#debug.transport=dt_socket
-debug.classpath=\
+debug.classpath=\
-    ${run.classpath}
+    ${run.classpath}
-debug.test.classpath=\
+debug.test.classpath=\
-    ${run.test.classpath}
+    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
+# This directory is removed when the project is cleaned:
-dist.dir=dist
+dist.dir=dist
-dist.jar=${dist.dir}/EssentialsGroupManager.jar
+dist.jar=${dist.dir}/EssentialsGroupManager.jar
-dist.javadoc.dir=${dist.dir}/javadoc
+dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
+endorsed.classpath=
-excludes=
+excludes=
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
+file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
-includes=**
+includes=**
-jar.compress=false
+jar.compress=true
-javac.classpath=\
+javac.classpath=\
-    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}
+    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}
-# Space-separated list of extra javac options
+# Space-separated list of extra javac options
-javac.compilerargs=
+javac.compilerargs=
-javac.deprecation=false
+javac.deprecation=false
-javac.processorpath=\
+javac.processorpath=\
-    ${javac.classpath}
+    ${javac.classpath}
-javac.source=1.6
+javac.source=1.6
-javac.target=1.6
+javac.target=1.6
-javac.test.classpath=\
+javac.test.classpath=\
-    ${javac.classpath}:\
+    ${javac.classpath}:\
-    ${build.classes.dir}
+    ${build.classes.dir}
-javac.test.processorpath=\
+javac.test.processorpath=\
-    ${javac.test.classpath}
+    ${javac.test.classpath}
-javadoc.additionalparam=
+javadoc.additionalparam=
-javadoc.author=false
+javadoc.author=false
-javadoc.encoding=${source.encoding}
+javadoc.encoding=${source.encoding}
-javadoc.noindex=false
+javadoc.noindex=false
-javadoc.nonavbar=false
+javadoc.nonavbar=false
-javadoc.notree=false
+javadoc.notree=false
-javadoc.private=false
+javadoc.private=false
-javadoc.splitindex=true
+javadoc.splitindex=true
-javadoc.use=true
+javadoc.use=true
-javadoc.version=false
+javadoc.version=false
-javadoc.windowtitle=
+javadoc.windowtitle=
-main.class=
+main.class=
-manifest.file=manifest.mf
+manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
+meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
+mkdist.disabled=true
-run.classpath=\
+platform.active=default_platform
-    ${javac.classpath}:\
+run.classpath=\
-    ${build.classes.dir}
+    ${javac.classpath}:\
-# Space-separated list of JVM arguments used when running the project
+    ${build.classes.dir}
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# Space-separated list of JVM arguments used when running the project
-# or test-sys-prop.name=value to set system properties for unit tests):
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-run.jvmargs=
+# or test-sys-prop.name=value to set system properties for unit tests):
-run.test.classpath=\
+run.jvmargs=
-    ${javac.test.classpath}:\
+run.test.classpath=\
-    ${build.test.classes.dir}
+    ${javac.test.classpath}:\
-source.encoding=UTF-8
+    ${build.test.classes.dir}
-src.dir=src
+source.encoding=UTF-8
-test.src.dir=test
+src.dir=src
+test.src.dir=test

EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java

@@ -65,10 +65,6 @@ public class GroupManager extends JavaPlugin {
 
     @Override
     public void onEnable() {
-		if (!Thread.currentThread().getStackTrace()[5].getMethodName().equals("loadPlugin")) {
-			logger.log(Level.SEVERE, "Another plugin is trying to enable GroupManager manually. Don't do this! It's probably "
-					+ Thread.currentThread().getStackTrace()[5].getClassName());
-		}
         GroupManager.logger.setUseParentHandlers(false);
         ch = new GMLoggerHandler();
         GroupManager.logger.addHandler(ch);

EssentialsPermissionsCommands/nbproject/project.properties

@@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 application.title=EssentialsPermissionsCommands
-application.vendor=snowleo
+application.vendor=
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -29,7 +64,9 @@ excludes=
 file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
 file.reference.Permissions3.jar=../lib/Permissions3.jar
 includes=**
-jar.compress=false
+jar.archive.disabled=${jnlp.enabled}
+jar.compress=true
+jar.index=${jnlp.enabled}
 javac.classpath=\
     ${reference.Essentials.jar}:\
     ${file.reference.Permissions3.jar}:\
@@ -57,10 +94,19 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
+jnlp.codebase.type=no.codebase
+jnlp.descriptor=application
+jnlp.enabled=false
+jnlp.mixed.code=default
+jnlp.offline-allowed=false
+jnlp.signed=false
+jnlp.signing=
+jnlp.signing.alias=
+jnlp.signing.keystore=
 main.class=
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
+mkdist.disabled=true
 platform.active=default_platform
 project.Essentials=../Essentials
 reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar

EssentialsProtect/MANIFEST.MF

@@ -1,2 +1,2 @@
-Manifest-Version: 1.0
+Manifest-Version: 1.0
-Class-Path: ../lib/mysql.jar ../lib/sqlite.jar
+Class-Path: ../lib/mysql.jar ../lib/sqlite.jar

EssentialsProtect/build.xml

@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [ <!ENTITY buildinc SYSTEM "../build.inc.xml"> ]>
+<!DOCTYPE project [ <!ENTITY buildinc SYSTEM "../build.inc.xml"> ]>
-<!-- You may freely edit this file. See commented blocks below for -->
+<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
+<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
+<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
+<!-- in the project's Project Properties dialog box.-->
-<project name="EssentialsProtect" default="default" basedir=".">
+<project name="EssentialsProtect" default="default" basedir=".">
-	<description>Builds, tests, and runs the project EssentialsProtect.</description>
+	<description>Builds, tests, and runs the project EssentialsProtect.</description>
-	<import file="nbproject/build-impl.xml"/>
+	<import file="nbproject/build-impl.xml"/>
-    <!--
+    <!--
-
+
-    There exist several targets which are by default empty and which can be 
+    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
+    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
+    before and after some main targets. They are: 
-
+
-      -pre-init:                 called before initialization of project properties
+      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
+      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
+      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
+      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
+      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
+      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
+      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
+      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
+      -post-clean:               called after cleaning build products
-
+
-    (Targets beginning with '-' are not intended to be called on their own.)
+    (Targets beginning with '-' are not intended to be called on their own.)
-
+
-    Example of inserting an obfuscator after compilation could look like this:
+    Example of inserting an obfuscator after compilation could look like this:
-
+
-        <target name="-post-compile">
+        <target name="-post-compile">
-            <obfuscate>
+            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
+                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
+            </obfuscate>
-        </target>
+        </target>
-
+
-    For list of available properties check the imported 
+    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-
+
-    Another way to customize the build is by overriding existing main targets.
+    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
+    The targets of interest are: 
-
+
-      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
+      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
+      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
+      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
+      test-report:              JUnit report generation
-
+
-    An example of overriding the target for project execution could look like this:
+    An example of overriding the target for project execution could look like this:
-
+
-        <target name="run" depends="EssentialsProtect-impl.jar">
+        <target name="run" depends="EssentialsProtect-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
+            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
+                <arg file="${dist.jar}"/>
-            </exec>
+            </exec>
-        </target>
+        </target>
-
+
-    Notice that the overridden target depends on the jar target and not only on 
+    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
+    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
+    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-    -->
+    -->
-	<target name="-post-jar">
+	<target name="-post-jar">
-	    <jar jarfile="${dist.dir}/EssentialsProtect.jar">
+	    <jar jarfile="${dist.dir}/EssentialsProtect.jar">
-	      <zipfileset src="${dist.jar}" excludes="META-INF/*" />
+	      <zipfileset src="${dist.jar}" excludes="META-INF/*" />
-	      <zipfileset src="../lib/c3p0-0.9.1.2.jar" excludes="META-INF/*" />
+	      <zipfileset src="../lib/c3p0-0.9.1.2.jar" excludes="META-INF/*" />
-	      <manifest>
+	      <manifest>
-	        <attribute name="Classpath" value="EssentialsProtect.jar"/>
+	        <attribute name="Classpath" value="EssentialsProtect.jar"/>
-	      </manifest>
+	      </manifest>
-	    </jar>
+	    </jar>
-	  </target>
+	  </target>
-</project>
+</project>

EssentialsProtect/nbproject/project.properties

@@ -1,87 +1,123 @@
-annotation.processing.enabled=true
+annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
+annotation.processing.enabled.in.editor=false
-annotation.processing.run.all.processors=true
+annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=EssentialsProtect
+application.title=EssentialsProtect
-application.vendor=devhome
+application.vendor=
-build.classes.dir=${build.dir}/classes
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
-build.classes.excludes=**/*.java,**/*.form
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
-# This directory is removed when the project is cleaned:
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
-build.dir=build
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
-build.generated.dir=${build.dir}/generated
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
-build.generated.sources.dir=${build.dir}/generated-sources
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
-# Only compile against the classpath explicitly listed here:
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
-build.sysclasspath=ignore
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
-build.test.classes.dir=${build.dir}/test/classes
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
-build.test.results.dir=${build.dir}/test/results
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
-# Uncomment to specify the preferred debugger connection transport:
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
-#debug.transport=dt_socket
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
-debug.classpath=\
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
-    ${run.classpath}
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
-debug.test.classpath=\
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
-    ${run.test.classpath}
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
-# This directory is removed when the project is cleaned:
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
-dist.dir=dist
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
-dist.jar=${dist.dir}/original-EssentialsProtect.jar
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
-dist.javadoc.dir=${dist.dir}/javadoc
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
-endorsed.classpath=
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
-excludes=
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
-file.reference.c3p0-0.9.1.2.jar=..\\lib\\c3p0-0.9.1.2.jar
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
-file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
-includes=**
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
-jar.archive.disabled=${jnlp.enabled}
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
-jar.compress=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
-jar.index=${jnlp.enabled}
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
-javac.classpath=\
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
-    ${reference.Essentials.jar}:\
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
-    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
-    ${file.reference.c3p0-0.9.1.2.jar}
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
-# Space-separated list of extra javac options
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
-javac.compilerargs=
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
-javac.deprecation=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
-javac.processorpath=\
+build.classes.dir=${build.dir}/classes
-    ${javac.classpath}
+build.classes.excludes=**/*.java,**/*.form
-javac.source=1.5
+# This directory is removed when the project is cleaned:
-javac.target=1.5
+build.dir=build
-javac.test.classpath=\
+build.generated.dir=${build.dir}/generated
-    ${javac.classpath}:\
+build.generated.sources.dir=${build.dir}/generated-sources
-    ${build.classes.dir}:\
+# Only compile against the classpath explicitly listed here:
-    ${libs.junit.classpath}:\
+build.sysclasspath=ignore
-    ${libs.junit_4.classpath}
+build.test.classes.dir=${build.dir}/test/classes
-javac.test.processorpath=\
+build.test.results.dir=${build.dir}/test/results
-    ${javac.test.classpath}
+# Uncomment to specify the preferred debugger connection transport:
-javadoc.additionalparam=
+#debug.transport=dt_socket
-javadoc.author=false
+debug.classpath=\
-javadoc.encoding=${source.encoding}
+    ${run.classpath}
-javadoc.noindex=false
+debug.test.classpath=\
-javadoc.nonavbar=false
+    ${run.test.classpath}
-javadoc.notree=false
+# This directory is removed when the project is cleaned:
-javadoc.private=false
+dist.dir=dist
-javadoc.splitindex=true
+dist.jar=${dist.dir}/original-EssentialsProtect.jar
-javadoc.use=true
+dist.javadoc.dir=${dist.dir}/javadoc
-javadoc.version=false
+endorsed.classpath=
-javadoc.windowtitle=
+excludes=
-jnlp.codebase.type=no.codebase
+file.reference.c3p0-0.9.1.2.jar=..\\lib\\c3p0-0.9.1.2.jar
-jnlp.descriptor=application
+file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
-jnlp.enabled=false
+includes=**
-jnlp.mixed.code=defaut
+jar.archive.disabled=${jnlp.enabled}
-jnlp.offline-allowed=false
+jar.compress=true
-jnlp.signed=false
+jar.index=${jnlp.enabled}
-manifest.file=manifest.mf
+javac.classpath=\
-meta.inf.dir=${src.dir}/META-INF
+    ${reference.Essentials.jar}:\
-platform.active=default_platform
+    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
-project.Essentials=../Essentials
+    ${file.reference.c3p0-0.9.1.2.jar}
-reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
+# Space-separated list of extra javac options
-run.classpath=\
+javac.compilerargs=
-    ${javac.classpath}:\
+javac.deprecation=false
-    ${build.classes.dir}
+javac.processorpath=\
-# Space-separated list of JVM arguments used when running the project
+    ${javac.classpath}
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+javac.source=1.6
-# or test-sys-prop.name=value to set system properties for unit tests):
+javac.target=1.6
-run.jvmargs=
+javac.test.classpath=\
-run.test.classpath=\
+    ${javac.classpath}:\
-    ${javac.test.classpath}:\
+    ${build.classes.dir}:\
-    ${build.test.classes.dir}
+    ${libs.junit.classpath}:\
-source.encoding=UTF-8
+    ${libs.junit_4.classpath}
-src.dir=src
+javac.test.processorpath=\
-test.src.dir=test
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+jnlp.codebase.type=no.codebase
+jnlp.descriptor=application
+jnlp.enabled=false
+jnlp.mixed.code=defaut
+jnlp.offline-allowed=false
+jnlp.signed=false
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=true
+platform.active=default_platform
+project.Essentials=../Essentials
+reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test

EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java

@@ -1,348 +1,348 @@
-package com.earth2me.essentials.protect;
+package com.earth2me.essentials.protect;
-
+
-import com.earth2me.essentials.EssentialsBlockListener;
+import com.earth2me.essentials.EssentialsBlockListener;
-import com.earth2me.essentials.IEssentials;
+import com.earth2me.essentials.IEssentials;
-import com.earth2me.essentials.User;
+import com.earth2me.essentials.User;
-import java.util.HashSet;
+import java.util.HashSet;
-import java.util.Set;
+import java.util.Set;
-import net.minecraft.server.ChunkPosition;
+import net.minecraft.server.ChunkPosition;
-import net.minecraft.server.Packet60Explosion;
+import net.minecraft.server.Packet60Explosion;
-import org.bukkit.Location;
+import org.bukkit.Location;
-import org.bukkit.Material;
+import org.bukkit.Material;
-import org.bukkit.block.Block;
+import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.craftbukkit.CraftWorld;
+import org.bukkit.craftbukkit.CraftWorld;
-import org.bukkit.craftbukkit.entity.CraftFireball;
+import org.bukkit.craftbukkit.entity.CraftFireball;
-import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
-import org.bukkit.craftbukkit.entity.CraftTNTPrimed;
+import org.bukkit.craftbukkit.entity.CraftTNTPrimed;
-import org.bukkit.entity.Creeper;
+import org.bukkit.entity.Creeper;
-import org.bukkit.entity.Entity;
+import org.bukkit.entity.Entity;
-import org.bukkit.entity.Fireball;
+import org.bukkit.entity.Fireball;
-import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
+import org.bukkit.entity.Player;
-import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.TNTPrimed;
-import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.entity.EntityDamageByBlockEvent;
+import org.bukkit.event.entity.EntityDamageByBlockEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageByProjectileEvent;
+import org.bukkit.event.entity.EntityDamageByProjectileEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.entity.EntityListener;
+import org.bukkit.event.entity.EntityListener;
-import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.entity.EntityTargetEvent;
-import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
+import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
-import org.bukkit.event.entity.ExplosionPrimeEvent;
+import org.bukkit.event.entity.ExplosionPrimeEvent;
-
+
-
+
-public class EssentialsProtectEntityListener extends EntityListener
+public class EssentialsProtectEntityListener extends EntityListener
-{
+{
-	private final transient IProtect prot;
+	private final transient IProtect prot;
-	private final transient IEssentials ess;
+	private final transient IEssentials ess;
-
+
-	public EssentialsProtectEntityListener(final IProtect prot)
+	public EssentialsProtectEntityListener(final IProtect prot)
-	{
+	{
-		this.prot = prot;
+		this.prot = prot;
-		this.ess = prot.getEssentials();
+		this.ess = prot.getEssentials();
-	}
+	}
-
+
-	@Override
+	@Override
-	public void onEntityDamage(EntityDamageEvent event)
+	public void onEntityDamage(EntityDamageEvent event)
-	{
+	{
-		if (event.isCancelled())
+		if (event.isCancelled())
-		{
+		{
-			return;
+			return;
-		}
+		}
-		final Entity target = event.getEntity();
+		final Entity target = event.getEntity();
-		final User user = ess.getUser(target);
+		final User user = ess.getUser(target);
-		if (event instanceof EntityDamageByBlockEvent)
+		if (event instanceof EntityDamageByBlockEvent)
-		{
+		{
-			final DamageCause cause = event.getCause();
+			final DamageCause cause = event.getCause();
-
+
-			if (prot.getSettingBool(ProtectConfig.disable_contactdmg)
+			if (prot.getSettingBool(ProtectConfig.disable_contactdmg)
-				&& cause == DamageCause.CONTACT
+				&& cause == DamageCause.CONTACT
-				&& !(target instanceof Player
+				&& !(target instanceof Player
-					 && user.isAuthorized("essentials.protect.damage.contact")
+					 && user.isAuthorized("essentials.protect.damage.contact")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-			if (prot.getSettingBool(ProtectConfig.disable_lavadmg)
+			if (prot.getSettingBool(ProtectConfig.disable_lavadmg)
-				&& cause == DamageCause.LAVA
+				&& cause == DamageCause.LAVA
-				&& !(target instanceof Player
+				&& !(target instanceof Player
-					 && user.isAuthorized("essentials.protect.damage.lava")
+					 && user.isAuthorized("essentials.protect.damage.lava")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-			if (prot.getSettingBool(ProtectConfig.prevent_tnt_explosion)
+			if (prot.getSettingBool(ProtectConfig.prevent_tnt_explosion)
-				&& cause == DamageCause.BLOCK_EXPLOSION
+				&& cause == DamageCause.BLOCK_EXPLOSION
-				&& !(target instanceof Player
+				&& !(target instanceof Player
-					 && user.isAuthorized("essentials.protect.damage.tnt")
+					 && user.isAuthorized("essentials.protect.damage.tnt")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-		}
+		}
-
+
-		if (event instanceof EntityDamageByEntityEvent)
+		if (event instanceof EntityDamageByEntityEvent)
-		{
+		{
-			final EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event;
+			final EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event;
-			final Entity eAttack = edEvent.getDamager();
+			final Entity eAttack = edEvent.getDamager();
-			final User attacker = ess.getUser(eAttack);
+			final User attacker = ess.getUser(eAttack);
-
+
-			// PVP Settings
+			// PVP Settings
-			if (target instanceof Player && eAttack instanceof Player
+			if (target instanceof Player && eAttack instanceof Player
-				&& prot.getSettingBool(ProtectConfig.disable_pvp)
+				&& prot.getSettingBool(ProtectConfig.disable_pvp)
-				&& (!user.isAuthorized("essentials.protect.pvp") || !attacker.isAuthorized("essentials.protect.pvp")))
+				&& (!user.isAuthorized("essentials.protect.pvp") || !attacker.isAuthorized("essentials.protect.pvp")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-			
+			
-			//Creeper explode prevention
+			//Creeper explode prevention
-			if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_explosion)
+			if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_explosion)
-				&& !(target instanceof Player
+				&& !(target instanceof Player
-					 && user.isAuthorized("essentials.protect.damage.creeper")
+					 && user.isAuthorized("essentials.protect.damage.creeper")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-
+
-			if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_playerdmg)
+			if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_playerdmg)
-				&& !(target instanceof Player
+				&& !(target instanceof Player
-					 && user.isAuthorized("essentials.protect.damage.creeper")
+					 && user.isAuthorized("essentials.protect.damage.creeper")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-			
+			
-			if (eAttack instanceof Fireball && prot.getSettingBool(ProtectConfig.prevent_fireball_playerdmg)
+			if (eAttack instanceof Fireball && prot.getSettingBool(ProtectConfig.prevent_fireball_playerdmg)
-				&& !(target instanceof Player
+				&& !(target instanceof Player
-					 && user.isAuthorized("essentials.protect.damage.fireball")
+					 && user.isAuthorized("essentials.protect.damage.fireball")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-			
+			
-			if (eAttack instanceof TNTPrimed && prot.getSettingBool(ProtectConfig.prevent_tnt_playerdmg)
+			if (eAttack instanceof TNTPrimed && prot.getSettingBool(ProtectConfig.prevent_tnt_playerdmg)
-				&& !(target instanceof Player
+				&& !(target instanceof Player
-					 && user.isAuthorized("essentials.protect.damage.tnt")
+					 && user.isAuthorized("essentials.protect.damage.tnt")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-		}
+		}
-
+
-		if (event instanceof EntityDamageByProjectileEvent
+		if (event instanceof EntityDamageByProjectileEvent
-			&& target instanceof Player
+			&& target instanceof Player
-			&& prot.getSettingBool(ProtectConfig.disable_projectiles)
+			&& prot.getSettingBool(ProtectConfig.disable_projectiles)
-			&& !(user.isAuthorized("essentials.protect.damage.projectiles")
+			&& !(user.isAuthorized("essentials.protect.damage.projectiles")
-				 && !user.isAuthorized("essentials.protect.damage.disable")))
+				 && !user.isAuthorized("essentials.protect.damage.disable")))
-		{
+		{
-			event.setCancelled(true);
+			event.setCancelled(true);
-			((EntityDamageByProjectileEvent)event).setBounce(true);
+			((EntityDamageByProjectileEvent)event).setBounce(true);
-			return;
+			return;
-		}
+		}
-
+
-		final DamageCause cause = event.getCause();
+		final DamageCause cause = event.getCause();
-		if (target instanceof Player)
+		if (target instanceof Player)
-		{
+		{
-			if (cause == DamageCause.FALL
+			if (cause == DamageCause.FALL
-				&& prot.getSettingBool(ProtectConfig.disable_fall)
+				&& prot.getSettingBool(ProtectConfig.disable_fall)
-				&& !(user.isAuthorized("essentials.protect.damage.fall")
+				&& !(user.isAuthorized("essentials.protect.damage.fall")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-
+
-			if (cause == DamageCause.SUFFOCATION
+			if (cause == DamageCause.SUFFOCATION
-				&& prot.getSettingBool(ProtectConfig.disable_suffocate)
+				&& prot.getSettingBool(ProtectConfig.disable_suffocate)
-				&& !(user.isAuthorized("essentials.protect.damage.suffocation")
+				&& !(user.isAuthorized("essentials.protect.damage.suffocation")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-			if ((cause == DamageCause.FIRE
+			if ((cause == DamageCause.FIRE
-				 || cause == DamageCause.FIRE_TICK)
+				 || cause == DamageCause.FIRE_TICK)
-				&& prot.getSettingBool(ProtectConfig.disable_firedmg)
+				&& prot.getSettingBool(ProtectConfig.disable_firedmg)
-				&& !(user.isAuthorized("essentials.protect.damage.fire")
+				&& !(user.isAuthorized("essentials.protect.damage.fire")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-			if (cause == DamageCause.DROWNING
+			if (cause == DamageCause.DROWNING
-				&& prot.getSettingBool(ProtectConfig.disable_drown)
+				&& prot.getSettingBool(ProtectConfig.disable_drown)
-				&& !(user.isAuthorized("essentials.protect.damage.drowning")
+				&& !(user.isAuthorized("essentials.protect.damage.drowning")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-			if (cause == DamageCause.LIGHTNING
+			if (cause == DamageCause.LIGHTNING
-				&& prot.getSettingBool(ProtectConfig.disable_lightning)
+				&& prot.getSettingBool(ProtectConfig.disable_lightning)
-				&& !(user.isAuthorized("essentials.protect.damage.lightning")
+				&& !(user.isAuthorized("essentials.protect.damage.lightning")
-					 && !user.isAuthorized("essentials.protect.damage.disable")))
+					 && !user.isAuthorized("essentials.protect.damage.disable")))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-		}
+		}
-	}
+	}
-
+
-	@Override
+	@Override
-	public void onEntityExplode(EntityExplodeEvent event)
+	public void onEntityExplode(EntityExplodeEvent event)
-	{
+	{
-		if (event.isCancelled())
+		if (event.isCancelled())
-		{
+		{
-			return;
+			return;
-		}
+		}
-		final int maxHeight = ess.getSettings().getProtectCreeperMaxHeight();
+		final int maxHeight = ess.getSettings().getProtectCreeperMaxHeight();
-		//Nicccccccccce plaaacccccccccce..
+		//Nicccccccccce plaaacccccccccce..
-		if (event.getEntity() instanceof LivingEntity
+		if (event.getEntity() instanceof LivingEntity
-			&& (prot.getSettingBool(ProtectConfig.prevent_creeper_explosion)
+			&& (prot.getSettingBool(ProtectConfig.prevent_creeper_explosion)
-				|| prot.getSettingBool(ProtectConfig.prevent_creeper_blockdmg)
+				|| prot.getSettingBool(ProtectConfig.prevent_creeper_blockdmg)
-				|| (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight)))
+				|| (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight)))
-		{
+		{
-			final Set<ChunkPosition> set = new HashSet<ChunkPosition>(event.blockList().size());
+			final Set<ChunkPosition> set = new HashSet<ChunkPosition>(event.blockList().size());
-			final Player[] players = ess.getServer().getOnlinePlayers();
+			final Player[] players = ess.getServer().getOnlinePlayers();
-			final Set<ChunkPosition> blocksUnderPlayers = new HashSet<ChunkPosition>(players.length);
+			final Set<ChunkPosition> blocksUnderPlayers = new HashSet<ChunkPosition>(players.length);
-			final Location loc = event.getLocation();
+			final Location loc = event.getLocation();
-			for (Player player : players)
+			for (Player player : players)
-			{
+			{
-				if (player.getWorld().equals(loc.getWorld()))
+				if (player.getWorld().equals(loc.getWorld()))
-				{
+				{
-					blocksUnderPlayers.add(
+					blocksUnderPlayers.add(
-							new ChunkPosition(
+							new ChunkPosition(
-							player.getLocation().getBlockX(),
+							player.getLocation().getBlockX(),
-							player.getLocation().getBlockY() - 1,
+							player.getLocation().getBlockY() - 1,
-							player.getLocation().getBlockZ()));
+							player.getLocation().getBlockZ()));
-				}
+				}
-			}
+			}
-			ChunkPosition cp;
+			ChunkPosition cp;
-			for (Block block : event.blockList())
+			for (Block block : event.blockList())
-			{
+			{
-				cp = new ChunkPosition(block.getX(), block.getY(), block.getZ());
+				cp = new ChunkPosition(block.getX(), block.getY(), block.getZ());
-				if (!blocksUnderPlayers.contains(cp))
+				if (!blocksUnderPlayers.contains(cp))
-				{
+				{
-					set.add(cp);
+					set.add(cp);
-				}
+				}
-			}
+			}
-
+
-			((CraftServer)ess.getServer()).getHandle().sendPacketNearby(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension,
+			((CraftServer)ess.getServer()).getHandle().sendPacketNearby(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension,
-														  new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));
+														  new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set));
-			event.setCancelled(true);
+			event.setCancelled(true);
-			return;
+			return;
-		}
+		}
-		else if (event.getEntity() instanceof CraftTNTPrimed
+		else if (event.getEntity() instanceof CraftTNTPrimed
-				 && prot.getSettingBool(ProtectConfig.prevent_tnt_explosion))
+				 && prot.getSettingBool(ProtectConfig.prevent_tnt_explosion))
-		{
+		{
-			event.setCancelled(true);
+			event.setCancelled(true);
-			return;
+			return;
-		}
+		}
-		else if (event.getEntity() instanceof CraftFireball
+		else if (event.getEntity() instanceof CraftFireball
-				 && prot.getSettingBool(ProtectConfig.prevent_fireball_explosion))
+				 && prot.getSettingBool(ProtectConfig.prevent_fireball_explosion))
-		{
+		{
-			event.setCancelled(true);
+			event.setCancelled(true);
-			return;
+			return;
-		}
+		}
-		// This code will prevent explosions near protected rails, signs or protected chests
+		// This code will prevent explosions near protected rails, signs or protected chests
-		// TODO: Use protect db instead of this code
+		// TODO: Use protect db instead of this code
-
+
-		for (Block block : event.blockList())
+		for (Block block : event.blockList())
-		{
+		{
-			if ((block.getType() == Material.RAILS || block.getRelative(BlockFace.UP).getType() == Material.RAILS)
+			if ((block.getType() == Material.RAILS || block.getRelative(BlockFace.UP).getType() == Material.RAILS)
-				&& prot.getSettingBool(ProtectConfig.protect_rails))
+				&& prot.getSettingBool(ProtectConfig.protect_rails))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-			if ((block.getType() == Material.WALL_SIGN
+			if ((block.getType() == Material.WALL_SIGN
-				 || block.getRelative(BlockFace.NORTH).getType() == Material.WALL_SIGN
+				 || block.getRelative(BlockFace.NORTH).getType() == Material.WALL_SIGN
-				 || block.getRelative(BlockFace.EAST).getType() == Material.WALL_SIGN
+				 || block.getRelative(BlockFace.EAST).getType() == Material.WALL_SIGN
-				 || block.getRelative(BlockFace.SOUTH).getType() == Material.WALL_SIGN
+				 || block.getRelative(BlockFace.SOUTH).getType() == Material.WALL_SIGN
-				 || block.getRelative(BlockFace.WEST).getType() == Material.WALL_SIGN
+				 || block.getRelative(BlockFace.WEST).getType() == Material.WALL_SIGN
-				 || block.getType() == Material.SIGN_POST
+				 || block.getType() == Material.SIGN_POST
-				 || block.getRelative(BlockFace.UP).getType() == Material.SIGN_POST)
+				 || block.getRelative(BlockFace.UP).getType() == Material.SIGN_POST)
-				&& prot.getSettingBool(ProtectConfig.protect_signs))
+				&& prot.getSettingBool(ProtectConfig.protect_signs))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}
+			}
-			/*if (EssentialsBlockListener.protectedBlocks.contains(block.getType())
+			/*if (EssentialsBlockListener.protectedBlocks.contains(block.getType())
-				&& EssentialsBlockListener.isBlockProtected(block))
+				&& EssentialsBlockListener.isBlockProtected(block))
-			{
+			{
-				event.setCancelled(true);
+				event.setCancelled(true);
-				return;
+				return;
-			}*/
+			}*/
-		}
+		}
-	}
+	}
-
+
-	@Override
+	@Override
-	public void onCreatureSpawn(final CreatureSpawnEvent event)
+	public void onCreatureSpawn(final CreatureSpawnEvent event)
-	{
+	{
-		if (event.getEntity() instanceof CraftPlayer)
+		if (event.getEntity() instanceof CraftPlayer)
-		{
+		{
-			return;
+			return;
-		}
+		}
-		if (event.isCancelled())
+		if (event.isCancelled())
-		{
+		{
-			return;
+			return;
-		}
+		}
-		final String creatureName = event.getCreatureType().toString().toLowerCase();
+		final String creatureName = event.getCreatureType().toString().toLowerCase();
-		if (creatureName == null || creatureName.isEmpty())
+		if (creatureName == null || creatureName.isEmpty())
-		{
+		{
-			return;
+			return;
-		}
+		}
-		if (ess.getSettings().getProtectPreventSpawn(creatureName))
+		if (ess.getSettings().getProtectPreventSpawn(creatureName))
-		{
+		{
-			event.setCancelled(true);
+			event.setCancelled(true);
-		}
+		}
-	}
+	}
-
+
-	@Override
+	@Override
-	public void onEntityTarget(final EntityTargetEvent event)
+	public void onEntityTarget(final EntityTargetEvent event)
-	{
+	{
-		if (event.isCancelled())
+		if (event.isCancelled())
-		{
+		{
-			return;
+			return;
-		}
+		}
-		if (!(event.getTarget() instanceof Player))
+		if (!(event.getTarget() instanceof Player))
-		{
+		{
-			return;
+			return;
-		}
+		}
-		final User user = ess.getUser(event.getTarget());
+		final User user = ess.getUser(event.getTarget());
-		if ((event.getReason() == TargetReason.CLOSEST_PLAYER
+		if ((event.getReason() == TargetReason.CLOSEST_PLAYER
-			 || event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY
+			 || event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY
-			 || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET
+			 || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET
-			 || event.getReason() == TargetReason.RANDOM_TARGET
+			 || event.getReason() == TargetReason.RANDOM_TARGET
-			 || event.getReason() == TargetReason.TARGET_ATTACKED_OWNER
+			 || event.getReason() == TargetReason.TARGET_ATTACKED_OWNER
-			 || event.getReason() == TargetReason.OWNER_ATTACKED_TARGET)
+			 || event.getReason() == TargetReason.OWNER_ATTACKED_TARGET)
-			&& prot.getSettingBool(ProtectConfig.prevent_entitytarget)
+			&& prot.getSettingBool(ProtectConfig.prevent_entitytarget)
-			&& !user.isAuthorized("essentials.protect.entitytarget.bypass"))
+			&& !user.isAuthorized("essentials.protect.entitytarget.bypass"))
-		{
+		{
-			event.setCancelled(true);
+			event.setCancelled(true);
-			return;
+			return;
-		}
+		}
-	}
+	}
-
+
-	@Override
+	@Override
-	public void onExplosionPrime(ExplosionPrimeEvent event)
+	public void onExplosionPrime(ExplosionPrimeEvent event)
-	{
+	{
-		if (event.getEntity() instanceof CraftFireball
+		if (event.getEntity() instanceof CraftFireball
-				 && prot.getSettingBool(ProtectConfig.prevent_fireball_fire))
+				 && prot.getSettingBool(ProtectConfig.prevent_fireball_fire))
-		{
+		{
-			event.setFire(false);
+			event.setFire(false);
-		}
+		}
-	}
+	}
-}
+}

EssentialsProtect/src/plugin.yml

@@ -1,9 +1,9 @@
-# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
+# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
-name: EssentialsProtect
+name: EssentialsProtect
-main: com.earth2me.essentials.protect.EssentialsProtect
+main: com.earth2me.essentials.protect.EssentialsProtect
-# Note to developers: This next line cannot change, or the automatic versioning system will break.
+# Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: TeamCity
-website: http://www.earth2me.net:8001/
+website: http://www.earth2me.net:8001/
-description: Provides protection for various parts of the world.
+description: Provides protection for various parts of the world.
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
 depend: [Essentials]

EssentialsSpawn/build.xml

@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [ <!ENTITY buildinc SYSTEM "../build.inc.xml"> ]>
+<!DOCTYPE project [ <!ENTITY buildinc SYSTEM "../build.inc.xml"> ]>
-<!-- You may freely edit this file. See commented blocks below for -->
+<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
+<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
-<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- By default, only the Clean and Build commands use this build script. -->
-<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
-<!-- the Compile on Save feature is turned off for the project. -->
+<!-- the Compile on Save feature is turned off for the project. -->
-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
-<!-- in the project's Project Properties dialog box.-->
+<!-- in the project's Project Properties dialog box.-->
-<project name="EssentialsSpawn" default="default" basedir=".">
+<project name="EssentialsSpawn" default="default" basedir=".">
-  <description>Builds, tests, and runs the project EssentialsSpawn.</description>
+  <description>Builds, tests, and runs the project EssentialsSpawn.</description>
-  <import file="nbproject/build-impl.xml"/>
+  <import file="nbproject/build-impl.xml"/>
-	&buildinc;
+	&buildinc;
-    <!--
+    <!--
-
+
-    There exist several targets which are by default empty and which can be 
+    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
+    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
+    before and after some main targets. They are: 
-
+
-      -pre-init:                 called before initialization of project properties
+      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
+      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
+      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
+      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
+      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
+      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
+      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
+      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
+      -post-clean:               called after cleaning build products
-
+
-    (Targets beginning with '-' are not intended to be called on their own.)
+    (Targets beginning with '-' are not intended to be called on their own.)
-
+
-    Example of inserting an obfuscator after compilation could look like this:
+    Example of inserting an obfuscator after compilation could look like this:
-
+
-        <target name="-post-compile">
+        <target name="-post-compile">
-            <obfuscate>
+            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
+                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
+            </obfuscate>
-        </target>
+        </target>
-
+
-    For list of available properties check the imported 
+    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-
+
-    Another way to customize the build is by overriding existing main targets.
+    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
+    The targets of interest are: 
-
+
-      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
+      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
+      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
+      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
+      test-report:              JUnit report generation
-
+
-    An example of overriding the target for project execution could look like this:
+    An example of overriding the target for project execution could look like this:
-
+
-        <target name="run" depends="EssentialsSpawn-impl.jar">
+        <target name="run" depends="EssentialsSpawn-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
+            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
+                <arg file="${dist.jar}"/>
-            </exec>
+            </exec>
-        </target>
+        </target>
-
+
-    Notice that the overridden target depends on the jar target and not only on 
+    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
+    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
+    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
+    nbproject/build-impl.xml file. 
-
+
-    -->
+    -->
-</project>
+</project>

EssentialsSpawn/nbproject/project.properties

@@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 application.title=EssentialsSpawn
-application.vendor=Paul
+application.vendor=
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -28,7 +63,7 @@ endorsed.classpath=
 excludes=
 file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
 includes=**
-jar.compress=false
+jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
     ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
@@ -37,8 +72,8 @@ javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}
-javac.source=1.5
+javac.source=1.6
-javac.target=1.5
+javac.target=1.6
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
@@ -58,7 +93,7 @@ javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
 meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
+mkdist.disabled=true
 platform.active=default_platform
 project.Essentials=../Essentials
 reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar

EssentialsSpawn/src/plugin.yml

@@ -1,16 +1,16 @@
-# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
+# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
-name: EssentialsSpawn
+name: EssentialsSpawn
-main: com.earth2me.essentials.spawn.EssentialsSpawn
+main: com.earth2me.essentials.spawn.EssentialsSpawn
-# Note to developers: This next line cannot change, or the automatic versioning system will break.
+# Note to developers: This next line cannot change, or the automatic versioning system will break.
-version: TeamCity
+version: TeamCity
-website: http://www.earth2me.net:8001/
+website: http://www.earth2me.net:8001/
-description: Provides spawn control commands, utilizing Essentials.
+description: Provides spawn control commands, utilizing Essentials.
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
-depend: [Essentials]
+depend: [Essentials]
-commands:
+commands:
-  setspawn:
+  setspawn:
-    description: Set the spawnpoint to your current position.
+    description: Set the spawnpoint to your current position.
-    usage: /<command> <group>
+    usage: /<command> <group>
-  spawn:
+  spawn:
-    description: Teleport to the spawnpoint.
+    description: Teleport to the spawnpoint.
     usage: /<command>

EssentialsXMPP/nbproject/project.properties

@@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
 application.title=EssentialsXMPP
-application.vendor=snowleo
+application.vendor=
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -29,7 +64,9 @@ excludes=
 file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
 file.reference.smack-3.2.0.jar=../lib/smack-3.2.0.jar
 includes=**
-jar.compress=false
+jar.archive.disabled=${jnlp.enabled}
+jar.compress=true
+jar.index=${jnlp.enabled}
 javac.classpath=\
     ${reference.Essentials.jar}:\
     ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\
@@ -59,10 +96,19 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
+jnlp.codebase.type=no.codebase
+jnlp.descriptor=application
+jnlp.enabled=false
+jnlp.mixed.code=default
+jnlp.offline-allowed=false
+jnlp.signed=false
+jnlp.signing=
+jnlp.signing.alias=
+jnlp.signing.keystore=
 main.class=
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
+mkdist.disabled=true
 platform.active=default_platform
 project.Essentials=../Essentials
 reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar

README.markdown

@@ -11,7 +11,10 @@ Recommended NetBeans plugins:
 * Git
 * PMD & FindBugs ( http://kenai.com/projects/sqe/pages/Home )
 
-In the root folder of the repository is a file called settings.zip. It contains the code guidelines settings. Open the preferences of NetBeans and import the zip file. Use "Source > Format" before each commit please.
+You don't need to import settings.zip anymore, since the format guidelines have been added to the project properties.
+
+Windows users, please read this: http://help.github.com/line-endings/
+The default line ending is LF.
 
 To build all jars, select the BuildAll project and build that. You'll find all jars inside the dist/lib folder of the BuildAll project.
 

build.inc.xml

@@ -1,7 +1,7 @@
-<target name="-post-jar">
+<target name="-post-jar">
-	<jar destfile="${dist.jar}" update="true">
+	<jar destfile="${dist.jar}" update="true">
-		<manifest>
+		<manifest>
-			<attribute name="Classpath" value="Essentials.jar"/>
+			<attribute name="Classpath" value="Essentials.jar"/>
-		</manifest>
+		</manifest>
-	</jar>
+	</jar>
-</target>
+</target>

lib/nblibraries.properties

@@ -1,12 +1,12 @@
-libs.CopyLibs.classpath=\
+libs.CopyLibs.classpath=\
-    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
+    ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
-libs.junit.classpath=\
+libs.junit.classpath=\
-    ${base}/junit/junit-3.8.2.jar
+    ${base}/junit/junit-3.8.2.jar
-libs.junit.javadoc=\
+libs.junit.javadoc=\
-    ${base}/junit/junit-3.8.2-api.zip
+    ${base}/junit/junit-3.8.2-api.zip
-libs.junit_4.classpath=\
+libs.junit_4.classpath=\
-    ${base}/junit_4/junit-4.5.jar
+    ${base}/junit_4/junit-4.5.jar
-libs.junit_4.javadoc=\
+libs.junit_4.javadoc=\
-    ${base}/junit_4/junit-4.5-api.zip
+    ${base}/junit_4/junit-4.5-api.zip
-libs.junit_4.src=\
+libs.junit_4.src=\
-    ${base}/junit_4/junit-4.5-src.jar
+    ${base}/junit_4/junit-4.5-src.jar