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

Improved parsing of block pattern/data syntax.

Browse Source
This commit is contained in:
sk89q 2011-02-18 16:24:56 -08:00
parent e94c1d4874
commit 21ca317d2c
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,8 +247,14 @@ public class WorldEdit {
// Allow setting mob spawn type // Allow setting mob spawn type
} else if (blockType == BlockType.MOB_SPAWNER) { } else if (blockType == BlockType.MOB_SPAWNER) {
if (args0.length > 1) { if (args0.length > 1) {
if (!server.isValidMobType(args0[1])) { String mobName = args0[1];
throw new InvalidItemException(arg, "Unknown mob type '" + args0[1] + "'"); if (mobName.length() > 1) {
mobName = mobName.substring(0, 1).toUpperCase()
+ mobName.substring(1);
}
if (!server.isValidMobType(mobName)) {
throw new InvalidItemException(arg, "Unknown mob type '" + mobName + "'");
} }
return new MobSpawnerBlock(data, args0[1]); return new MobSpawnerBlock(data, args0[1]);
} else { } else {
@ -303,20 +309,26 @@ public class WorldEdit {
String[] items = list.split(","); String[] items = list.split(",");
if (list.equals("#clipboard") || list.equals("#copy")) { // Handle special block pattern types
LocalSession session = getSession(player); if (list.charAt(0) == '#') {
CuboidClipboard clipboard; if (list.equals("#clipboard") || list.equals("#copy")) {
LocalSession session = getSession(player);
try { CuboidClipboard clipboard;
clipboard = session.getClipboard();
} catch (EmptyClipboardException e) { try {
player.printError("Copy a selection first with //copy."); clipboard = session.getClipboard();
throw new UnknownItemException("#clipboard"); } catch (EmptyClipboardException e) {
player.printError("Copy a selection first with //copy.");
throw new UnknownItemException("#clipboard");
}
return new ClipboardPattern(clipboard);
} else {
throw new UnknownItemException(list);
} }
return new ClipboardPattern(clipboard);
} }
// If it's only one block, then just return that single one
if (items.length == 1) { if (items.length == 1) {
return new SingleBlockPattern(getBlock(player, items[0])); return new SingleBlockPattern(getBlock(player, items[0]));
} }
@ -327,6 +339,8 @@ public class WorldEdit {
BaseBlock block; BaseBlock block;
double chance; double chance;
// Parse special percentage syntax
if (s.matches("[0-9]+(?:\\.(?:[0-9]+)?)?%.*")) { if (s.matches("[0-9]+(?:\\.(?:[0-9]+)?)?%.*")) {
String[] p = s.split("%"); String[] p = s.split("%");
chance = Double.parseDouble(p[0]); chance = Double.parseDouble(p[0]);