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

NetherBrick is also not 'Mining' enough for Mining

Browse Source
This commit is contained in:
nossr50 2012-02-20 15:06:16 -08:00
parent b024b45e02
commit 3b9e85e976
3 changed files with 1 additions and 16 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, mvines, mlilypad, 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,
@ -262,7 +262,6 @@ public class LoadProperties {
mcoal = readInteger("Experience.Mining.Coal", 100); mcoal = readInteger("Experience.Mining.Coal", 100);
mstone = readInteger("Experience.Mining.Stone", 30); mstone = readInteger("Experience.Mining.Stone", 30);
msandstone = readInteger("Experience.Mining.Sandstone", 30); msandstone = readInteger("Experience.Mining.Sandstone", 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);

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

@ -233,10 +233,6 @@ public class Mining
case 21: case 21:
xp += LoadProperties.mlapis; xp += LoadProperties.mlapis;
break; break;
//NETHER BRICK
case 112:
xp += LoadProperties.mnetherbrick;
break;
//END STONE //END STONE
case 121: case 121:
xp += LoadProperties.mendstone; xp += LoadProperties.mendstone;
@ -364,14 +360,6 @@ public class Mining
blockProcCheck(block, player); blockProcCheck(block, player);
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 //END STONE
else if(id == 121 && block.getData() != (byte) 5) else if(id == 121 && block.getData() != (byte) 5)
{ {
@ -388,7 +376,6 @@ public class Mining
blockProcCheck(block, player); blockProcCheck(block, player);
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);
if(LoadProperties.spoutEnabled) if(LoadProperties.spoutEnabled)

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

@ -204,7 +204,6 @@ Experience:
Coal: 100 Coal: 100
Diamond: 750 Diamond: 750
Iron: 250 Iron: 250
Nether_Brick: 30
End_Stone: 150 End_Stone: 150
Moss_Stone: 30 Moss_Stone: 30