--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/PowerMiner.java 2011/04/25 19:45:54 1389 +++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/PowerMiner.java 2011/05/30 20:25:59 1490 @@ -25,10 +25,16 @@ @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (!sender.isOp()) + if (!sender.isOp()) { + sender.sendMessage("Only ops can use powerminer"); return false; - if (! (sender instanceof Player) ) + } + + if (! (sender instanceof Player) ) { + sender.sendMessage("Only in-game players can use powerminer"); return false; + } + Player p = (Player) sender; if (miners.contains(p.getName())) { @@ -51,6 +57,8 @@ case 2: case 3: return null; //instabreak already drops dirt + case 5: + return null; //instabreak drops wooden plank case 12: return null; //instabreak drops sand case 13: @@ -59,13 +67,34 @@ return new ItemStack(263,1); case 17: return null; //instabreak drops wood + case 18: + return (rand.nextInt(16) == 0) ? new ItemStack(6,1,(short)0, b.getData() ) : null; //leaves has 6.25% chance of dropping sapplings + case 21: //lapis lazuli + int count = rand.nextInt(5) + 4; + return new ItemStack(351,count,(short)0, (byte)4); + case 27: + case 28: + return null; //instabreak drops powered and detector rails + case 54: + return null; //instabreak drops chests case 56: //diamond ore drops diamond return new ItemStack(264,1); + case 58: + return null; //instabreak drops craft tables + case 64: //instabreak drops wooden doors + case 66: + return null; //instabreak drops rails + case 71: //instabreak drops iron doors + return null; case 73: case 74: - return new ItemStack(331,4); //redstone ore (both glowing and non-glowing) drops 4 redstone + return new ItemStack(331,4); //redstone ore (both glowing and non-glowing) drops 4 redstone + case 82: + return null; //instabreak drops clay from clayblock + case 88: + return null; //instabreak drops soul sand default: - return new ItemStack(b.getTypeId(), 1); + return new ItemStack(b.getTypeId(), 1,(short)0, b.getData()); } } @@ -75,13 +104,22 @@ if (! p.isOp() ) return; - if ( miners.contains(p.getName()) ) { - if (p.getItemInHand().getType() == Material.FEATHER) { - event.setInstaBreak(true); + if (p.getItemInHand().getType() == Material.FEATHER) { + if ( miners.contains(p.getName()) ) { Block b = event.getBlock(); + + if (b.getTypeId() == 7) //don't remove bedrock + return; + if (b.getTypeId() == 90) //don't break portal + return; + + event.setInstaBreak(true); + + ItemStack items = getDropItems(b); + if (items != null) { b.getWorld().dropItemNaturally(b.getLocation(), items); }