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

Fixed some NPE's for block types not in BlockType.

Browse Source
This commit is contained in:
zml2008 2011-11-02 22:49:56 -07:00
parent 4c05050d73
commit 04803de8b1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sk89q/worldedit/commands/SelectionCommands.java
View File

@ -563,10 +563,11 @@ public class SelectionCommands {
} }
for (Countable<Integer> c : distribution) { for (Countable<Integer> c : distribution) {
BlockType block = BlockType.fromID(c.getID());
String str = String.format("%-7s (%.3f%%) %s #%d", String str = String.format("%-7s (%.3f%%) %s #%d",
String.valueOf(c.getAmount()), String.valueOf(c.getAmount()),
c.getAmount() / (double)size * 100, c.getAmount() / (double)size * 100,
BlockType.fromID(c.getID()).getName(), c.getID()); block == null ? "Unknown" : block.getName(), c.getID());
player.print(str); player.print(str);
if (args.hasFlag('c')) { if (args.hasFlag('c')) {

3
src/main/java/com/sk89q/worldedit/tools/QueryTool.java
View File

@ -38,10 +38,11 @@ public class QueryTool implements BlockTool {
LocalWorld world = clicked.getWorld(); LocalWorld world = clicked.getWorld();
BaseBlock block = (new EditSession(world, 0)).rawGetBlock(clicked); BaseBlock block = (new EditSession(world, 0)).rawGetBlock(clicked);
BlockType type = BlockType.fromID(block.getType());
player.print("\u00A79@" + clicked + ": " + "\u00A7e" player.print("\u00A79@" + clicked + ": " + "\u00A7e"
+ "#" + block.getType() + "\u00A77" + " (" + "#" + block.getType() + "\u00A77" + " ("
+ BlockType.fromID(block.getType()).getName() + ") " + (type == null ? "Unknown" : type.getName()) + ") "
+ "\u00A7f" + "\u00A7f"
+ "[" + block.getData() + "]" + " (" + world.getBlockLightLevel(clicked) + "/" + world.getBlockLightLevel(clicked.add(0, 1, 0)) + ")"); + "[" + block.getData() + "]" + " (" + world.getBlockLightLevel(clicked) + "/" + world.getBlockLightLevel(clicked.add(0, 1, 0)) + ")");