Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-01 06:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made /thru work better.

Browse Source
This commit is contained in:
sk89q 2010-10-19 20:33:50 -07:00
parent 9124cdd91f
commit ebf5b97451
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/SMWorldEditPlayer.java
View File

@ -86,26 +86,30 @@ public class SMWorldEditPlayer extends WorldEditPlayer {
* @return whether the player was pass through * @return whether the player was pass through
*/ */
public boolean passThroughForwardWall(int range) { public boolean passThroughForwardWall(int range) {
int free = 0; boolean foundNext = false;
int spots = 0; int searchDist = 0;
HitBlox hitBlox = new HitBlox(player, range, 0.2); HitBlox hitBlox = new HitBlox(player, range, 0.2);
Block block; Block block;
free = hitBlox.getLastBlock().getType() == 0 ? 1 : 0;
while ((block = hitBlox.getNextBlock()) != null) { while ((block = hitBlox.getNextBlock()) != null) {
searchDist++;
if (searchDist > 20) {
return false;
}
if (block.getType() == 0) { if (block.getType() == 0) {
free++; if (foundNext) {
if (spots >= 1) { Vector v = new Vector(block.getX(), block.getY() - 1, block.getZ());
Vector v = new Vector(block.getX(), block.getY() + 1, block.getZ());
if (server.getBlockType(v) == 0) { if (server.getBlockType(v) == 0) {
setPosition(v.subtract(0, 1, 0)); setPosition(v.add(0.5, 0, 0.5));
return true; return true;
} }
} }
} else { } else {
free = 0; foundNext = true;
spots++;
} }
} }

2
src/WorldEdit.java
View File

@ -329,7 +329,7 @@ public class WorldEdit {
// Go through a wall // Go through a wall
} else if (split[0].equalsIgnoreCase("/thru")) { } else if (split[0].equalsIgnoreCase("/thru")) {
checkArgs(split, 0, 0, split[0]); checkArgs(split, 0, 0, split[0]);
if (player.passThroughForwardWall(300)) { if (player.passThroughForwardWall(6)) {
player.print("Whoosh!"); player.print("Whoosh!");
} else { } else {
player.printError("No free spot ahead of you found."); player.printError("No free spot ahead of you found.");