Merge branch 'master' of github.com:mcMMO-Dev/mcMMO

This commit is contained in:
nossr50
2012-05-01 08:48:10 -07:00
6 changed files with 132 additions and 76 deletions

View File

@ -336,6 +336,10 @@ public class Permissions {
return player.hasPermission("mcmmo.ability.blastmining.demolitionsexpertise");
}
public boolean blastMining(Player player) {
return player.hasPermission("mcmmo.ability.blastmining.detonate");
}
/*
* MCMMO.ITEM.*
*/
@ -392,10 +396,6 @@ public class Permissions {
return player.hasPermission("mcmmo.skills.mining");
}
public boolean blastMining(Player player) {
return player.hasPermission("mcmmo.skills.blastmining");
}
public boolean fishing(Player player) {
return player.hasPermission("mcmmo.skills.fishing");
}