Merge pull request #249 from matix931/patch-6

Update src/main/java/com/gmail/nossr50/skills/gathering/Mining.java
This commit is contained in:
nossr50 2012-09-05 21:10:44 -07:00
commit 3314b18318

View File

@ -86,6 +86,12 @@ public class Mining {
} }
break; break;
case EMERALD_ORE:
if (configInstance.getEmeraldDoubleDropsEnabled()) {
Misc.dropItem(location, item);
}
break;
default: default:
if (ModChecks.isCustomMiningBlock(block)) { if (ModChecks.isCustomMiningBlock(block)) {
Misc.dropItem(location, new ItemStack(block.getTypeId(), 1, (short) 0, block.getData())); Misc.dropItem(location, new ItemStack(block.getTypeId(), 1, (short) 0, block.getData()));
@ -195,6 +201,13 @@ public class Mining {
} }
break; break;
case EMERALD_ORE:
if (configInstance.getEmeraldDoubleDropsEnabled()) {
item = new ItemStack(Material.EMERALD);
Misc.dropItem(location, item);
}
break;
default: default:
if (ModChecks.isCustomMiningBlock(block)) { if (ModChecks.isCustomMiningBlock(block)) {
CustomBlock customBlock = ModChecks.getCustomBlock(block); CustomBlock customBlock = ModChecks.getCustomBlock(block);
@ -280,6 +293,10 @@ public class Mining {
xp += Config.getInstance().getMiningXPStone(); xp += Config.getInstance().getMiningXPStone();
break; break;
case EMERALD_ORE:
xp += Config.getInstance().getMiningXPEmeraldOre();
break;
default: default:
if (ModChecks.isCustomMiningBlock(block)) { if (ModChecks.isCustomMiningBlock(block)) {
xp += ModChecks.getCustomBlock(block).getXpGain(); xp += ModChecks.getCustomBlock(block).getXpGain();
@ -367,6 +384,7 @@ public class Mining {
case GOLD_ORE: case GOLD_ORE:
case LAPIS_ORE: case LAPIS_ORE:
case REDSTONE_ORE: case REDSTONE_ORE:
case EMERALD_ORE;
if (tier < 3) { if (tier < 3) {
return; return;
} }