summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-09-21 00:54:40 +0100
committerDinnerbone <dinnerbone@dinnerbone.com>2011-09-21 00:54:40 +0100
commit8068859828aef2fef6f0ba2b75e3dfebd6386073 (patch)
tree2c3ffb6e8af843561b868842fcd6acacdd24c1a5 /src/main/java/org
parent78ad4c3f22415813474c375bf1643e249b653d88 (diff)
downloadbukkit-8068859828aef2fef6f0ba2b75e3dfebd6386073.tar
bukkit-8068859828aef2fef6f0ba2b75e3dfebd6386073.tar.gz
bukkit-8068859828aef2fef6f0ba2b75e3dfebd6386073.tar.lz
bukkit-8068859828aef2fef6f0ba2b75e3dfebd6386073.tar.xz
bukkit-8068859828aef2fef6f0ba2b75e3dfebd6386073.zip
hasPermission should return correctly for undefined permissions
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/permissions/PermissibleBase.java2
-rw-r--r--src/main/java/org/bukkit/permissions/Permission.java1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java
index 6bf0e510..88fa82e9 100644
--- a/src/main/java/org/bukkit/permissions/PermissibleBase.java
+++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java
@@ -93,7 +93,7 @@ public class PermissibleBase implements Permissible {
} else if (perm != null) {
return perm.getDefault().getValue(isOp());
} else {
- return false;
+ return Permission.DEFAULT_PERMISSION.getValue(isOp());
}
}
diff --git a/src/main/java/org/bukkit/permissions/Permission.java b/src/main/java/org/bukkit/permissions/Permission.java
index d7c5ba0f..4381e2e4 100644
--- a/src/main/java/org/bukkit/permissions/Permission.java
+++ b/src/main/java/org/bukkit/permissions/Permission.java
@@ -5,7 +5,6 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import java.util.logging.Level;
import org.bukkit.Bukkit;