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

Improved command detection algorithm, fixed //size.

Browse Source
This commit is contained in:
sk89q 2011-02-21 23:15:19 -08:00
parent 35ae72e8b7
commit ce544da46d
2 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -853,61 +853,63 @@ public class WorldEdit {
}
String searchCmd = split[0].toLowerCase();
if (commands.hasCommand(searchCmd)
|| (config.noDoubleSlash && commands.hasCommand("/" + searchCmd))
|| (searchCmd.length() >= 2 && searchCmd.charAt(0) == '/'
&& commands.hasCommand(searchCmd.substring(1)))) {
if (config.noDoubleSlash && commands.hasCommand("/" + searchCmd)) {
split[0] = "/" + split[0];
} else if (commands.hasCommand(searchCmd.substring(1))) {
split[0] = split[0].substring(1);
}
LocalSession session = getSession(player);
BlockBag blockBag = session.getBlockBag(player);
session.tellVersion(player);
EditSession editSession =
new EditSession(player.getWorld(),
session.getBlockChangeLimit(), blockBag);
editSession.enableQueue();
long start = System.currentTimeMillis();
try {
if (config.logCommands) {
logger.info("WorldEdit: " + player.getName() + ": "
+ StringUtil.joinString(split, " "));
}
Object[] methodArgs = new Object[] {
null, this, session, player, editSession
};
return commands.execute(split, player, methodArgs);
} finally {
session.remember(editSession);
editSession.flushQueue();
if (config.profile) {
long time = System.currentTimeMillis() - start;
int changed = editSession.getBlockChangeCount();
if (time > 0) {
double throughput = changed / (time / 1000.0);
player.printDebug((time / 1000.0) + "s elapsed (history: "
+ changed + " changed; "
+ Math.round(throughput) + " blocks/sec).");
} else {
player.printDebug((time / 1000.0) + "s elapsed.");
}
}
flushBlockBag(player, editSession);
}
// Try to detect the command
if (commands.hasCommand(searchCmd)) {
} else if (config.noDoubleSlash && commands.hasCommand("/" + searchCmd)) {
split[0] = "/" + split[0];
} else if (commands.hasCommand(searchCmd.substring(1))) {
split[0] = split[0].substring(1);
}
// No command found!
if (!commands.hasCommand(split[0])) {
return false;
}
LocalSession session = getSession(player);
BlockBag blockBag = session.getBlockBag(player);
session.tellVersion(player);
// Create an edit session
EditSession editSession =
new EditSession(player.getWorld(),
session.getBlockChangeLimit(), blockBag);
editSession.enableQueue();
return false;
long start = System.currentTimeMillis();
try {
if (config.logCommands) {
logger.info("WorldEdit: " + player.getName() + ": "
+ StringUtil.joinString(split, " "));
}
Object[] methodArgs = new Object[] {
null, this, session, player, editSession
};
return commands.execute(split, player, methodArgs);
} finally {
session.remember(editSession);
editSession.flushQueue();
if (config.profile) {
long time = System.currentTimeMillis() - start;
int changed = editSession.getBlockChangeCount();
if (time > 0) {
double throughput = changed / (time / 1000.0);
player.printDebug((time / 1000.0) + "s elapsed (history: "
+ changed + " changed; "
+ Math.round(throughput) + " blocks/sec).");
} else {
player.printDebug((time / 1000.0) + "s elapsed.");
}
}
flushBlockBag(player, editSession);
}
} catch (NumberFormatException e) {
player.printError("Number expected; string given.");
} catch (IncompleteRegionException e) {

2
src/com/sk89q/worldedit/commands/SelectionCommands.java
View File

@ -425,7 +425,7 @@ public class SelectionCommands {
}
@Command(
aliases = {"/m", "//size"},
aliases = {"/size"},
usage = "",
desc = "Get information about the selection",
min = 0,