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

Removed fix for issue #376, since the problem appears to have been fixed on the CraftBukkit side now.

Browse Source 
Also cleaned up the input handlers a bit.
This commit is contained in:
TomyLobo 2011-11-20 01:45:25 +01:00
parent 1194f4448e
commit 71d302c893
2 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/sk89q/worldedit/LocalSession.java
View File

@ -75,7 +75,7 @@ public class LocalSession {
private boolean fastMode = false; private boolean fastMode = false;
private Mask mask; private Mask mask;
private TimeZone timezone = TimeZone.getDefault(); private TimeZone timezone = TimeZone.getDefault();
private Boolean jumptoBlock = true; //private Boolean jumptoBlock = true;
/** /**
* Construct the object. * Construct the object.
@ -684,20 +684,4 @@ public class LocalSession {
public void setMask(Mask mask) { public void setMask(Mask mask) {
this.mask = mask; this.mask = mask;
} }
/**
* This is used as a workaround for a bug.
* It blocks the compass from using the jumpto function after the thru function
*/
public void toggleJumptoBlock() {
this.jumptoBlock = !jumptoBlock;
}
/**
* This is used as a workaround for a bug.
* @return true if the compass's jumpto function can be used again
*/
public Boolean canUseJumpto() {
return jumptoBlock;
}
} }

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

@ -1015,19 +1015,17 @@ 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 if (config.navigationWandMaxDistance <= 0) {
&& config.navigationWandMaxDistance > 0 return false;
&& (player.hasPermission("worldedit.navigation.jumpto.tool")
|| player.hasPermission("worldedit.navigation.jumpto"))) { // TODO: Remove old permission
// Bug workaround
// Blocks this from being used after the thru function
// @TODO do this right or make craftbukkit do it right
if (!session.canUseJumpto()){
session.toggleJumptoBlock();
return true;
} }
WorldVector pos = player.getSolidBlockTrace(config.navigationWandMaxDistance);
if (!player.hasPermission("worldedit.navigation.jumpto.tool")
&& !player.hasPermission("worldedit.navigation.jumpto")) { // TODO: Remove old permission
return false;
}
WorldVector pos = player.getSolidBlockTrace(config.navigationWandMaxDistance);
if (pos != null) { if (pos != null) {
player.findFreePosition(pos); player.findFreePosition(pos);
} else { } else {
@ -1036,6 +1034,8 @@ public class WorldEdit {
return true; return true;
} }
LocalSession session = getSession(player);
Tool tool = session.getTool(player.getItemInHand()); Tool tool = session.getTool(player.getItemInHand());
if (tool != null && tool instanceof DoubleActionTraceTool) { if (tool != null && tool instanceof DoubleActionTraceTool) {
if (tool.canUse(player)) { if (tool.canUse(player)) {
@ -1043,6 +1043,7 @@ public class WorldEdit {
return true; return true;
} }
} }
return false; return false;
} }
@ -1053,33 +1054,33 @@ public class WorldEdit {
* @return * @return
*/ */
public boolean handleRightClick(LocalPlayer player) { public boolean handleRightClick(LocalPlayer player) {
LocalSession session = getSession(player); if (player.getItemInHand() == config.navigationWand) {
if (config.navigationWandMaxDistance <= 0) {
return false;
}
if (!player.hasPermission("worldedit.navigation.thru.tool")
&& !player.hasPermission("worldedit.navigation.thru")) { // TODO: Remove old permission
return false;
}
if (player.getItemInHand() == config.navigationWand
&& config.navigationWandMaxDistance > 0
&& (player.hasPermission("worldedit.navigation.thru.tool")
|| player.hasPermission("worldedit.navigation.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!");
} }
// Bug workaround, so it wont do the Jumpto compass function
// Right after this teleport
if (session.canUseJumpto()) {
session.toggleJumptoBlock();
}
return true; return true;
} }
LocalSession session = getSession(player);
Tool tool = session.getTool(player.getItemInHand()); Tool tool = session.getTool(player.getItemInHand());
if (tool != null && tool instanceof TraceTool) { if (tool != null && tool instanceof TraceTool) {
if (tool.canUse(player)) { if (tool.canUse(player)) {
((TraceTool) tool).actPrimary(server, config, player, session); ((TraceTool) tool).actPrimary(server, config, player, session);
return true; return true;
} }
} }
return false; return false;
} }