Merge branch 'master' into release

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

@@ -37,12 +37,13 @@ public class Permissions2Handler implements IPermissionsHandler
 
 	public String getPrefix(final Player base)
 	{
-		return permissionHandler.getGroupPrefix(base.getWorld().getName(), getGroup(base));
+		final String prefix = permissionHandler.getGroupPrefix(base.getWorld().getName(), getGroup(base));
+		return prefix == null ? "" : prefix;
 	}
 
 	public String getSuffix(final Player base)
 	{
-		return permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base));
+		final String suffix = permissionHandler.getGroupSuffix(base.getWorld().getName(), getGroup(base));
+		return suffix == null ? "" : suffix;
 	}
-	
 }

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

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

EssentialsChat/nbproject/project.properties

@@ -27,13 +27,11 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
-file.reference.Factions.jar=../lib/Factions.jar
 includes=**
 jar.compress=false
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\
-    ${file.reference.Factions.jar}
+    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

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

@@ -23,7 +23,6 @@ public class EssentialsChat extends JavaPlugin
 		final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials");
 
 		chatListener = new HashMap<String, IEssentialsChatListener>();
-		//EssentialsChatPlayerListener.checkFactions(pluginManager);
 
 		final EssentialsChatPlayerListener playerListener = new EssentialsChatPlayerListener(getServer(), ess, chatListener);
 		pluginManager.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Highest, this);

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

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