Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove old navigation perms for jumpto and thru

Browse Source
This commit is contained in:
Wizjany 2012-12-24 01:42:55 -05:00
parent e4771416aa
commit 3f9404560e
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/sk89q/worldedit/WorldEdit.java
View File

@ -1163,8 +1163,7 @@ public class WorldEdit {
return false; return false;
} }
if (!player.hasPermission("worldedit.navigation.jumpto.tool") if (!player.hasPermission("worldedit.navigation.jumpto.tool") ){
&& !player.hasPermission("worldedit.navigation.jumpto")) { // TODO: Remove old permission
return false; return false;
} }
@ -1202,8 +1201,7 @@ public class WorldEdit {
return false; return false;
} }
if (!player.hasPermission("worldedit.navigation.thru.tool") if (!player.hasPermission("worldedit.navigation.thru.tool")) {
&& !player.hasPermission("worldedit.navigation.thru")) { // TODO: Remove old permission
return false; return false;
} }

15
src/main/java/com/sk89q/worldedit/commands/NavigationCommands.java
View File

@ -30,7 +30,6 @@ import com.sk89q.worldedit.LocalPlayer;
import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.LocalSession;
import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.WorldEdit;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.WorldEditPermissionException;
import com.sk89q.worldedit.WorldVector; import com.sk89q.worldedit.WorldVector;
/** /**
@ -144,14 +143,9 @@ public class NavigationCommands {
min = 0, min = 0,
max = 0 max = 0
) )
// @CommandPermissions("worldedit.navigation.thru.command") // TODO: Remove old permission @CommandPermissions("worldedit.navigation.thru.command")
public void thru(CommandContext args, LocalSession session, LocalPlayer player, public void thru(CommandContext args, LocalSession session, LocalPlayer player,
EditSession editSession) throws WorldEditException { EditSession editSession) throws WorldEditException {
if (!(player.hasPermission("worldedit.navigation.thru") ||
player.hasPermission("worldedit.navigation.thru.command"))) {
throw new WorldEditPermissionException();
}
if (player.passThroughForwardWall(6)) { if (player.passThroughForwardWall(6)) {
player.print("Whoosh!"); player.print("Whoosh!");
} else { } else {
@ -166,15 +160,10 @@ public class NavigationCommands {
min = 0, min = 0,
max = 0 max = 0
) )
// @CommandPermissions("worldedit.navigation.jumpto.command") //TODO: Remove old permission @CommandPermissions("worldedit.navigation.jumpto.command")
public void jumpTo(CommandContext args, LocalSession session, LocalPlayer player, public void jumpTo(CommandContext args, LocalSession session, LocalPlayer player,
EditSession editSession) throws WorldEditException { EditSession editSession) throws WorldEditException {
if (!(player.hasPermission("worldedit.navigation.jumpto") ||
player.hasPermission("worldedit.navigation.jumpto.command"))) {
throw new WorldEditPermissionException();
}
WorldVector pos = player.getSolidBlockTrace(300); WorldVector pos = player.getSolidBlockTrace(300);
if (pos != null) { if (pos != null) {
player.findFreePosition(pos); player.findFreePosition(pos);