Merge remote-tracking branch 'upstream/master'

plugin.yml

@@ -1,6 +1,6 @@
 name: Vault
 main: net.milkbowl.vault.Vault
-version: 1.2.21-b${BUILD_NUMBER}
+version: 1.2.22-b${BUILD_NUMBER}
 authors: [cereal, Sleaker, mung3r]
 website: http://dev.bukkit.org/server-mods/vault
 load: startup

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.milkbowl.vault</groupId>
 	<artifactId>Vault</artifactId>
-	<version>1.2.21-SNAPSHOT</version>
+	<version>1.2.22-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -11,7 +11,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>craftbukkit</artifactId>
-			<version>1.4.2-R0.2</version>
+			<version>1.4.5-R0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>de.hydrox.bukkit.DroxPerms</groupId>

src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java

@@ -23,7 +23,6 @@ import net.milkbowl.vault.permission.Permission;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.command.ColouredConsoleSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -113,7 +112,7 @@ public class Permission_Permissions3 extends Permission {
 
     @Override
     public boolean has(CommandSender sender, String permission) {
-        if (sender.isOp() || sender instanceof ColouredConsoleSender) {
+        if (sender.isOp() || !(sender instanceof Player)) {
             return true;
         } else {
             return has(((Player) sender).getWorld().getName(), sender.getName(), permission);