From a3cf3401bb1834813332c36d395dbb57cddcc162 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 20 Feb 2012 14:58:24 -0800 Subject: [PATCH] Stone Brick isn't 'Mining' enough for Mining Fixes MCCORE-32 --- .../com/gmail/nossr50/config/LoadProperties.java | 3 +-- src/main/java/com/gmail/nossr50/skills/Mining.java | 12 ------------ src/main/resources/config.yml | 1 - 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/LoadProperties.java b/src/main/java/com/gmail/nossr50/config/LoadProperties.java index d25daeb2e..d05800258 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, mstonebrick, + mvines, mlilypad, mnetherbrick, mendstone, mmossstone, levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation, levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair, levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting, @@ -265,7 +265,6 @@ public class LoadProperties { mnetherbrick = readInteger("Experience.Mining.Nether_Brick", 30); mendstone = readInteger("Experience.Mining.End_Stone", 150); mmossstone = readInteger("Experience.Mining.Moss_Stone", 30); - mstonebrick = readInteger("Experience.Mining.Stone_Brick", 30); mfishing = readInteger("Experience.Fishing.Base", 800); diff --git a/src/main/java/com/gmail/nossr50/skills/Mining.java b/src/main/java/com/gmail/nossr50/skills/Mining.java index 1a80504df..46bdc3db4 100644 --- a/src/main/java/com/gmail/nossr50/skills/Mining.java +++ b/src/main/java/com/gmail/nossr50/skills/Mining.java @@ -245,10 +245,6 @@ public class Mining case 48: xp += LoadProperties.mmossstone; break; - //STONE BRICK - case 98: - xp += LoadProperties.mstonebrick; - break; } if(canBeSuperBroken(block)) @@ -392,14 +388,6 @@ public class Mining blockProcCheck(block, player); blockProcCheck(block, player); } - //STONE BRICK - else if(id == 98 && !plugin.misc.blockWatchList.contains(block)) - { - Bukkit.getPluginManager().callEvent(armswing); - xp += LoadProperties.mstonebrick; - blockProcCheck(block, player); - blockProcCheck(block, player); - } if(!plugin.misc.blockWatchList.contains(block) && block.getData() != (byte) 5) PP.addXP(SkillType.MINING, xp, player); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index b9cce4f6d..81adaca24 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -224,7 +224,6 @@ Experience: Nether_Brick: 30 End_Stone: 150 Moss_Stone: 30 - Stone_Brick: 30 # # Settings for Fishing