Further fixed permissions.

This commit is contained in:
sk89q 2011-01-04 14:42:44 -08:00
parent b8426317d9
commit fea4be0161

View File

@ -643,7 +643,7 @@ public class WorldEditController {
// Single super pickaxe mode // Single super pickaxe mode
} else if (split[0].equalsIgnoreCase("/single")) { } else if (split[0].equalsIgnoreCase("/single")) {
if (!canUseCommand(player, "//")) { if (!canUseCommand(player, "/")) {
player.printError("You don't have permission for super pickaxe usage."); player.printError("You don't have permission for super pickaxe usage.");
return true; return true;
} }
@ -658,7 +658,7 @@ public class WorldEditController {
} else if (split[0].equalsIgnoreCase("/area") } else if (split[0].equalsIgnoreCase("/area")
|| split[0].equalsIgnoreCase("/recur")) { || split[0].equalsIgnoreCase("/recur")) {
if (!canUseCommand(player, "//")) { if (!canUseCommand(player, "/")) {
player.printError("You don't have permission for super pickaxe usage."); player.printError("You don't have permission for super pickaxe usage.");
return true; return true;
} }
@ -1733,7 +1733,7 @@ public class WorldEditController {
* @param player * @param player
*/ */
public void handleArmSwing(LocalPlayer player) { public void handleArmSwing(LocalPlayer player) {
if (!canUseCommand(player, "//")) if (!canUseCommand(player, "/"))
return; return;
} }
@ -1751,12 +1751,12 @@ public class WorldEditController {
// This prevents needless sessions from being created // This prevents needless sessions from being created
if (!hasSession(player) && !(itemInHand == config.wandItem && if (!hasSession(player) && !(itemInHand == config.wandItem &&
canUseCommand(player, "//pos2"))) { return false; } canUseCommand(player, "/pos2"))) { return false; }
LocalSession session = getSession(player); LocalSession session = getSession(player);
if (itemInHand == config.wandItem && session.isToolControlEnabled() if (itemInHand == config.wandItem && session.isToolControlEnabled()
&& canUseCommand(player, "//pos2")) { && canUseCommand(player, "/pos2")) {
session.setPos2(clicked); session.setPos2(clicked);
try { try {
player.print("Second position set to " + clicked player.print("Second position set to " + clicked
@ -1785,8 +1785,8 @@ public class WorldEditController {
public boolean handleBlockLeftClick(LocalPlayer player, public boolean handleBlockLeftClick(LocalPlayer player,
LocalWorld world, Vector clicked) { LocalWorld world, Vector clicked) {
if (!canUseCommand(player, "//pos1") if (!canUseCommand(player, "/pos1")
&& !canUseCommand(player, "//")) { return false; } && !canUseCommand(player, "/")) { return false; }
LocalSession session = getSession(player); LocalSession session = getSession(player);
@ -1961,10 +1961,10 @@ public class WorldEditController {
*/ */
private boolean canUseCommand(LocalPlayer player, String command) { private boolean canUseCommand(LocalPlayer player, String command) {
// Allow the /worldeditselect permission // Allow the /worldeditselect permission
if (command.equalsIgnoreCase("//pos1") if (command.equalsIgnoreCase("/pos1")
|| command.equalsIgnoreCase("//pos2") || command.equalsIgnoreCase("/pos2")
|| command.equalsIgnoreCase("//hpos1") || command.equalsIgnoreCase("/hpos1")
|| command.equalsIgnoreCase("//hpos2")) { || command.equalsIgnoreCase("/hpos2")) {
return player.hasPermission(command) return player.hasPermission(command)
|| player.hasPermission("worldeditselect") || player.hasPermission("worldeditselect")
|| player.hasPermission("worldedit"); || player.hasPermission("worldedit");