From 3b9e85e97694558dfadd660500fb723f7b1bccfa Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 20 Feb 2012 15:06:16 -0800 Subject: [PATCH] NetherBrick is also not 'Mining' enough for Mining --- .../com/gmail/nossr50/config/LoadProperties.java | 3 +-- src/main/java/com/gmail/nossr50/skills/Mining.java | 13 ------------- src/main/resources/config.yml | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/LoadProperties.java b/src/main/java/com/gmail/nossr50/config/LoadProperties.java index d05800258..67f65facd 100644 --- a/src/main/java/com/gmail/nossr50/config/LoadProperties.java +++ b/src/main/java/com/gmail/nossr50/config/LoadProperties.java @@ -72,7 +72,7 @@ public class LoadProperties { keepEnchantsRank3, keepEnchantsRank4, fishingDropChanceTier1, fishingDropChanceTier2, fishingDropChanceTier3, fishingDropChanceTier4, fishingDropChanceTier5, mnetherwart, - mvines, mlilypad, mnetherbrick, mendstone, mmossstone, + mvines, mlilypad, mendstone, mmossstone, levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation, levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair, levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting, @@ -262,7 +262,6 @@ public class LoadProperties { mcoal = readInteger("Experience.Mining.Coal", 100); mstone = readInteger("Experience.Mining.Stone", 30); msandstone = readInteger("Experience.Mining.Sandstone", 30); - mnetherbrick = readInteger("Experience.Mining.Nether_Brick", 30); mendstone = readInteger("Experience.Mining.End_Stone", 150); mmossstone = readInteger("Experience.Mining.Moss_Stone", 30); diff --git a/src/main/java/com/gmail/nossr50/skills/Mining.java b/src/main/java/com/gmail/nossr50/skills/Mining.java index 46bdc3db4..81bf5af46 100644 --- a/src/main/java/com/gmail/nossr50/skills/Mining.java +++ b/src/main/java/com/gmail/nossr50/skills/Mining.java @@ -233,10 +233,6 @@ public class Mining case 21: xp += LoadProperties.mlapis; break; - //NETHER BRICK - case 112: - xp += LoadProperties.mnetherbrick; - break; //END STONE case 121: xp += LoadProperties.mendstone; @@ -364,14 +360,6 @@ public class Mining blockProcCheck(block, player); blockProcCheck(block, player); } - //NETHER BRICK - else if(id == 112 && block.getData() != (byte) 5) - { - Bukkit.getPluginManager().callEvent(armswing); - xp += LoadProperties.mnetherbrick; - blockProcCheck(block, player); - blockProcCheck(block, player); - } //END STONE else if(id == 121 && block.getData() != (byte) 5) { @@ -388,7 +376,6 @@ public class Mining blockProcCheck(block, player); blockProcCheck(block, player); } - if(!plugin.misc.blockWatchList.contains(block) && block.getData() != (byte) 5) PP.addXP(SkillType.MINING, xp, player); if(LoadProperties.spoutEnabled) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 46e649ca6..fbcb09cab 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -204,7 +204,6 @@ Experience: Coal: 100 Diamond: 750 Iron: 250 - Nether_Brick: 30 End_Stone: 150 Moss_Stone: 30