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

Changed the compass so that left click is /jumpto and right click is /thru.

Browse Source
This commit is contained in:
sk89q 2011-03-11 23:38:11 -08:00
parent 5ac8c5adf7
commit 5e536ad302
2 changed files with 13 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/sk89q/worldedit/LocalSession.java
View File

@ -44,14 +44,6 @@ import com.sk89q.worldedit.regions.RegionSelector;
* @author sk89q * @author sk89q
*/ */
public class LocalSession { public class LocalSession {
/**
* List of compass modes.
*/
public enum CompassMode {
JUMPTO,
THRU
}
public static int MAX_HISTORY_SIZE = 15; public static int MAX_HISTORY_SIZE = 15;
private LocalConfiguration config; private LocalConfiguration config;
@ -71,7 +63,6 @@ public class LocalSession {
private boolean useInventory; private boolean useInventory;
private Snapshot snapshot; private Snapshot snapshot;
private String lastScript; private String lastScript;
private CompassMode compassMode = CompassMode.JUMPTO;
private boolean beenToldVersion = false; private boolean beenToldVersion = false;
private boolean hasCUISupport = false; private boolean hasCUISupport = false;
@ -492,24 +483,6 @@ public class LocalSession {
this.lastScript = lastScript; this.lastScript = lastScript;
} }
/**
* Get the compass mode.
*
* @return the compassMode
*/
public CompassMode getCompassMode() {
return compassMode;
}
/**
* Set the compass mode.
*
* @param compassMode the compassMode to set
*/
public void setCompassMode(CompassMode compassMode) {
this.compassMode = compassMode;
}
/** /**
* Tell the player the WorldEdit version. * Tell the player the WorldEdit version.
* *

37
src/com/sk89q/worldedit/WorldEdit.java
View File

@ -30,7 +30,6 @@ import com.sk89q.minecraft.util.commands.MissingNestedCommandException;
import com.sk89q.minecraft.util.commands.UnhandledCommandException; import com.sk89q.minecraft.util.commands.UnhandledCommandException;
import com.sk89q.minecraft.util.commands.WrappedCommandException; import com.sk89q.minecraft.util.commands.WrappedCommandException;
import com.sk89q.util.StringUtil; import com.sk89q.util.StringUtil;
import com.sk89q.worldedit.LocalSession.CompassMode;
import com.sk89q.worldedit.bags.BlockBag; import com.sk89q.worldedit.bags.BlockBag;
import com.sk89q.worldedit.blocks.*; import com.sk89q.worldedit.blocks.*;
import com.sk89q.worldedit.commands.*; import com.sk89q.worldedit.commands.*;
@ -740,24 +739,15 @@ public class WorldEdit {
* @return * @return
*/ */
public boolean handleArmSwing(LocalPlayer player) { public boolean handleArmSwing(LocalPlayer player) {
LocalSession session = getSession(player);
if (player.getItemInHand() == config.navigationWand if (player.getItemInHand() == config.navigationWand
&& config.navigationWandMaxDistance > 0) { && config.navigationWandMaxDistance > 0
CompassMode mode = session.getCompassMode(); && player.hasPermission("worldedit.navigation.jumpto")) {
if (player.hasPermission("worldedit.navigation.jumpto") && mode == CompassMode.JUMPTO) {
WorldVector pos = player.getSolidBlockTrace(config.navigationWandMaxDistance); WorldVector pos = player.getSolidBlockTrace(config.navigationWandMaxDistance);
if (pos != null) { if (pos != null) {
player.findFreePosition(pos); player.findFreePosition(pos);
} else { } else {
player.printError("No block in sight (or too far)!"); player.printError("No block in sight (or too far)!");
} }
} else if (mode == CompassMode.THRU) { // Permission is implied
if (!player.passThroughForwardWall(40)) {
player.printError("Nothing to pass through!");
}
}
} }
return false; return false;
@ -772,26 +762,13 @@ public class WorldEdit {
public boolean handleRightClick(LocalPlayer player) { public boolean handleRightClick(LocalPlayer player) {
LocalSession session = getSession(player); LocalSession session = getSession(player);
if (player.getItemInHand() == config.navigationWand) { if (player.getItemInHand() == config.navigationWand
CompassMode mode = session.getCompassMode(); && config.navigationWandMaxDistance > 0
&& player.hasPermission("worldedit.navigation.thru")) {
if (mode == CompassMode.JUMPTO) { if (!player.passThroughForwardWall(40)) {
if (player.hasPermission("worldedit.navigation.thru")) { player.printError("Nothing to pass through!");
session.setCompassMode(CompassMode.THRU);
player.print("Switched to /thru mode.");
} else {
player.printError("You don't have permission for /thru.");
} }
} else {
if (player.hasPermission("worldedit.navigation.jumpto")) {
session.setCompassMode(CompassMode.JUMPTO);
player.print("Switched to /jumpto mode.");
} else {
player.printError("You don't have permission for /jumpto.");
}
}
return true;
} }
Tool tool = session.getTool(player.getItemInHand()); Tool tool = session.getTool(player.getItemInHand());