diff options
author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-05-30 00:06:18 +0100 |
---|---|---|
committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-05-30 00:06:18 +0100 |
commit | 8c14eb49ef4ab25dad18c8a5ca0d9a3074cd2ed5 (patch) | |
tree | 17eca513c07daa21aee13c812db38bbfde302df7 | |
parent | 50848997470cf3d74abb6405736a908b16fd47d8 (diff) | |
download | craftbukkit-8c14eb49ef4ab25dad18c8a5ca0d9a3074cd2ed5.tar craftbukkit-8c14eb49ef4ab25dad18c8a5ca0d9a3074cd2ed5.tar.gz craftbukkit-8c14eb49ef4ab25dad18c8a5ca0d9a3074cd2ed5.tar.lz craftbukkit-8c14eb49ef4ab25dad18c8a5ca0d9a3074cd2ed5.tar.xz craftbukkit-8c14eb49ef4ab25dad18c8a5ca0d9a3074cd2ed5.zip |
Handle a missed case with our vanilla permissions override
-rw-r--r-- | nms-patches/EntityPlayer.patch | 7 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch index 5e6e053a..7e1e7f52 100644 --- a/nms-patches/EntityPlayer.patch +++ b/nms-patches/EntityPlayer.patch @@ -481,17 +481,20 @@ return true; } else if (!"tell".equals(s) && !"help".equals(s) && !"me".equals(s) && !"trigger".equals(s)) { if (this.server.getPlayerList().isOp(this.getProfile())) { -@@ -781,6 +963,9 @@ +@@ -781,6 +963,12 @@ } else { return true; } + */ ++ if ("@".equals(s)) { ++ return getBukkitEntity().hasPermission("minecraft.command.selector"); ++ } + return true; + // CraftBukkit end } public String w() { -@@ -867,6 +1052,129 @@ +@@ -867,6 +1055,129 @@ } public IChatBaseComponent getPlayerListName() { diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java index d0377466..1c54b7d6 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java @@ -28,6 +28,7 @@ public final class CommandPermissions { DefaultPermissions.registerPermission(PREFIX + "defaultgamemode", "Allows the user to change the default gamemode of the server", PermissionDefault.OP, commands);
DefaultPermissions.registerPermission(PREFIX + "seed", "Allows the user to view the seed of the world", PermissionDefault.OP, commands);
DefaultPermissions.registerPermission(PREFIX + "effect", "Allows the user to add/remove effects on players", PermissionDefault.OP, commands);
+ DefaultPermissions.registerPermission(PREFIX + "selector", "Allows the use of selectors", PermissionDefault.OP, commands);
commands.recalculatePermissibles();
return commands;
|