Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-27 02:58:03 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
nossr50 2012-02-22 08:30:21 -08:00
commit 802af464cd
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/commands/general/StatsCommand.java → src/main/java/com/gmail/nossr50/commands/general/McstatsCommand.java
View File

@ -16,16 +16,16 @@ import com.gmail.nossr50.datatypes.SkillType;
import com.gmail.nossr50.locale.mcLocale;
import com.gmail.nossr50.skills.Skills;
public class StatsCommand implements CommandExecutor {
public class McstatsCommand implements CommandExecutor {
private final mcMMO plugin;
public StatsCommand(mcMMO instance) {
public McstatsCommand(mcMMO instance) {
this.plugin = instance;
}
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!LoadProperties.statsEnable) {
if (!LoadProperties.mcstatsEnable) {
sender.sendMessage("This command is not enabled.");
return true;
}

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

@ -42,7 +42,7 @@ public class LoadProperties {
xplockEnable, xpbar, xpicon, partybar, xprateEnable, spoutEnabled,
donateMessage, chimaeraWingEnable, xpGainsMobSpawners, myspawnEnable,
mccEnable, mcmmoEnable, partyEnable, inviteEnable, acceptEnable,
whoisEnable, statsEnable, addxpEnable, ptpEnable, mmoeditEnable,
whoisEnable, mcstatsEnable, addxpEnable, ptpEnable, mmoeditEnable,
clearmyspawnEnable, mcgodEnable, mcabilityEnable, mctopEnable,
mcrefreshEnable, aEnable, pEnable, enableMotd, enableMySpawn,
enableCobbleToMossy, useMySQL, toolsLoseDurabilityFromAbilities,
@ -402,7 +402,7 @@ public class LoadProperties {
mcmmoEnable = readBoolean("Commands.mcmmo.Enabled", true);
mccEnable = readBoolean("Commands.mcc.Enabled", true);
mcgodEnable = readBoolean("Commands.mcgod.Enabled", true);
statsEnable = readBoolean("Commands.stats.Enabled", true);
mcstatsEnable = readBoolean("Commands.mcstats.Enabled", true);
mmoeditEnable = readBoolean("Commands.mmoedit.Enabled", true);
ptpEnable = readBoolean("Commands.ptp.Enabled", true);
partyEnable = readBoolean("Commands.party.Enabled", true);

4
src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java
View File

@ -79,7 +79,7 @@ public class mcBlockListener implements Listener
}
//TNT placement checks - needed for Blast Mining
if(block.getTypeId() == 46)
if(block.getTypeId() == 46 && mcPermissions.getInstance().blastmining(player))
{
PlayerProfile PP = Users.getProfile(player);
int skill = PP.getSkillLevel(SkillType.MINING);
@ -157,7 +157,7 @@ public class mcBlockListener implements Listener
*/
//TNT removal checks - needed for Blast Mining
if(block.getTypeId() == 46 && inhand.getTypeId() != 259)
if(block.getTypeId() == 46 && inhand.getTypeId() != 259 && mcPermissions.getInstance().blastmining(player))
{
plugin.misc.tntTracker.remove(block);
}

3
src/main/java/com/gmail/nossr50/listeners/mcEntityListener.java
View File

@ -93,7 +93,8 @@ public class mcEntityListener implements Listener
if(event.getEntity() instanceof Player)
{
Player player = (Player)event.getEntity();
BlastMining.demolitionsExpertise(player, event);
if(mcPermissions.getInstance().blastmining(player))
BlastMining.demolitionsExpertise(player, event);
}
}

2
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -317,7 +317,7 @@ public class mcMMO extends JavaPlugin
if(LoadProperties.mmoeditEnable) getCommand("mmoedit").setExecutor(new MmoeditCommand(this));
getCommand("mmoupdate").setExecutor(new MmoupdateCommand());
if(LoadProperties.myspawnEnable) getCommand("myspawn").setExecutor(new MyspawnCommand());
if(LoadProperties.statsEnable) getCommand("mcstats").setExecutor(new StatsCommand(this));
if(LoadProperties.mcstatsEnable) getCommand("mcstats").setExecutor(new McstatsCommand(this));
if(LoadProperties.whoisEnable) getCommand("whois").setExecutor(new WhoisCommand(this));
if(LoadProperties.xprateEnable) getCommand("xprate").setExecutor(new XprateCommand());