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

Added seperate permissions for jumpto/thru commands and tools

Browse Source
This commit is contained in:
zml2008 2011-11-11 15:39:42 -08:00
parent 0a4cbd435f
commit 256897f473
2 changed files with 15 additions and 4 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

@ -1018,7 +1018,8 @@ public class WorldEdit {
LocalSession session = getSession(player); LocalSession session = getSession(player);
if (player.getItemInHand() == config.navigationWand if (player.getItemInHand() == config.navigationWand
&& config.navigationWandMaxDistance > 0 && config.navigationWandMaxDistance > 0
&& player.hasPermission("worldedit.navigation.jumpto")) { && (player.hasPermission("worldedit.navigation.jumpto.tool")
|| player.hasPermission("worldedit.navigation.jumpto"))) { // TODO: Remove old permission
// Bug workaround // Bug workaround
// Blocks this from being used after the thru function // Blocks this from being used after the thru function
// @TODO do this right or make craftbukkit do it right // @TODO do this right or make craftbukkit do it right
@ -1056,7 +1057,8 @@ public class WorldEdit {
if (player.getItemInHand() == config.navigationWand if (player.getItemInHand() == config.navigationWand
&& config.navigationWandMaxDistance > 0 && config.navigationWandMaxDistance > 0
&& player.hasPermission("worldedit.navigation.thru")) { && (player.hasPermission("worldedit.navigation.thru.tool")
|| player.hasPermission("worldedit.navication.thru"))) { // TODO: Remove old permission
if (!player.passThroughForwardWall(40)) { if (!player.passThroughForwardWall(40)) {
player.printError("Nothing to pass through!"); player.printError("Nothing to pass through!");

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

@ -136,10 +136,14 @@ public class NavigationCommands {
min = 0, min = 0,
max = 0 max = 0
) )
@CommandPermissions("worldedit.navigation.thru") // @CommandPermissions("worldedit.navigation.thru.command") // TODO: Remove old permission
public static void thru(CommandContext args, WorldEdit we, public static void thru(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession) LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException { 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!");
@ -155,11 +159,16 @@ public class NavigationCommands {
min = 0, min = 0,
max = 0 max = 0
) )
@CommandPermissions("worldedit.navigation.jumpto") // @CommandPermissions("worldedit.navigation.jumpto.command") //TODO: Remove old permission
public static void jumpTo(CommandContext args, WorldEdit we, public static void jumpTo(CommandContext args, WorldEdit we,
LocalSession session, LocalPlayer player, EditSession editSession) LocalSession session, LocalPlayer player, EditSession editSession)
throws WorldEditException { 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);