Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 08:39:49 +01:00
Code Issues Projects Releases Wiki Activity

Stone Brick isn't 'Mining' enough for Mining

Browse Source 
Fixes MCCORE-32
This commit is contained in:
nossr50 2012-02-20 14:58:24 -08:00
parent 96be29ef63
commit a3cf3401bb
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/config/LoadProperties.java
View File

@ -72,7 +72,7 @@ public class LoadProperties {
keepEnchantsRank3, keepEnchantsRank4, fishingDropChanceTier1, keepEnchantsRank3, keepEnchantsRank4, fishingDropChanceTier1,
fishingDropChanceTier2, fishingDropChanceTier3, fishingDropChanceTier2, fishingDropChanceTier3,
fishingDropChanceTier4, fishingDropChanceTier5, mnetherwart, fishingDropChanceTier4, fishingDropChanceTier5, mnetherwart,
mvines, mlilypad, mnetherbrick, mendstone, mmossstone, mstonebrick, mvines, mlilypad, mnetherbrick, mendstone, mmossstone,
levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation, levelCapAcrobatics, levelCapArchery, levelCapAxes, levelCapExcavation,
levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair, levelCapFishing, levelCapHerbalism, levelCapMining, levelCapRepair,
levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting, levelCapSwords, levelCapTaming, levelCapUnarmed, levelCapWoodcutting,
@ -265,7 +265,6 @@ public class LoadProperties {
mnetherbrick = readInteger("Experience.Mining.Nether_Brick", 30); mnetherbrick = readInteger("Experience.Mining.Nether_Brick", 30);
mendstone = readInteger("Experience.Mining.End_Stone", 150); mendstone = readInteger("Experience.Mining.End_Stone", 150);
mmossstone = readInteger("Experience.Mining.Moss_Stone", 30); mmossstone = readInteger("Experience.Mining.Moss_Stone", 30);
mstonebrick = readInteger("Experience.Mining.Stone_Brick", 30);
mfishing = readInteger("Experience.Fishing.Base", 800); mfishing = readInteger("Experience.Fishing.Base", 800);

12
src/main/java/com/gmail/nossr50/skills/Mining.java
View File

@ -245,10 +245,6 @@ public class Mining
case 48: case 48:
xp += LoadProperties.mmossstone; xp += LoadProperties.mmossstone;
break; break;
//STONE BRICK
case 98:
xp += LoadProperties.mstonebrick;
break;
} }
if(canBeSuperBroken(block)) if(canBeSuperBroken(block))
@ -392,14 +388,6 @@ public class Mining
blockProcCheck(block, player); blockProcCheck(block, player);
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) if(!plugin.misc.blockWatchList.contains(block) && block.getData() != (byte) 5)
PP.addXP(SkillType.MINING, xp, player); PP.addXP(SkillType.MINING, xp, player);

1
src/main/resources/config.yml
View File

@ -224,7 +224,6 @@ Experience:
Nether_Brick: 30 Nether_Brick: 30
End_Stone: 150 End_Stone: 150
Moss_Stone: 30 Moss_Stone: 30
Stone_Brick: 30
# #
# Settings for Fishing # Settings for Fishing