Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-07-07 20:14:50 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:essentials/Essentials into essmaster

Browse Source
This commit is contained in:
KHobbits 2011-11-04 11:40:18 +00:00
commit 70d1c7d7d7
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/ISettings.java
View File

@ -136,4 +136,6 @@ public interface ISettings extends IConf
boolean getFreezeAfkPlayers(); boolean getFreezeAfkPlayers();
boolean areDeathMessagesEnabled(); boolean areDeathMessagesEnabled();
public void setDebug(boolean debug);
} }

10
Essentials/src/com/earth2me/essentials/Settings.java
View File

@ -378,10 +378,12 @@ public class Settings implements ISettings
return config.getBoolean("protect.disable.warn-on-build-disallow", false); return config.getBoolean("protect.disable.warn-on-build-disallow", false);
} }
private boolean debug = false;
@Override @Override
public boolean isDebug() public boolean isDebug()
{ {
return config.getBoolean("debug", false); return debug || config.getBoolean("debug", false);
} }
@Override @Override
@ -532,4 +534,10 @@ public class Settings implements ISettings
{ {
return config.getBoolean("death-messages", true); return config.getBoolean("death-messages", true);
} }
@Override
public void setDebug(final boolean debug)
{
this.debug = debug;
}
} }

6
Essentials/src/com/earth2me/essentials/commands/Commandessentials.java
View File

@ -23,6 +23,12 @@ public class Commandessentials extends EssentialsCommand
@Override @Override
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{ {
if (args.length > 0 && args[0].equalsIgnoreCase("debug"))
{
ess.getSettings().setDebug(!ess.getSettings().isDebug());
sender.sendMessage("Essentials " + ess.getDescription().getVersion() + " debug mode " + (ess.getSettings().isDebug() ? "enabled" : "disabled"));
return;
}
final Map<String, Byte> noteMap = new HashMap<String, Byte>(); final Map<String, Byte> noteMap = new HashMap<String, Byte>();
noteMap.put("1F#", (byte)0x0); noteMap.put("1F#", (byte)0x0);
noteMap.put("1G", (byte)0x1); noteMap.put("1G", (byte)0x1);