Merge branch 'master' into release

This commit is contained in:
snowleo 2011-07-19 12:09:48 +02:00
commit cf21ecee2e

View File

@ -48,6 +48,7 @@ public class GroupManager extends JavaPlugin {
private boolean validateOnlinePlayer = true; private boolean validateOnlinePlayer = true;
private boolean isReady = false; private boolean isReady = false;
private GMConfiguration config; private GMConfiguration config;
private GMLoggerHandler ch;
public static final Logger logger = Logger.getLogger(GroupManager.class.getName()); public static final Logger logger = Logger.getLogger(GroupManager.class.getName());
@Override @Override
@ -59,6 +60,7 @@ public class GroupManager extends JavaPlugin {
// EXAMPLE: Custom code, here we just output some info so we can check all is well // EXAMPLE: Custom code, here we just output some info so we can check all is well
PluginDescriptionFile pdfFile = this.getDescription(); PluginDescriptionFile pdfFile = this.getDescription();
System.out.println(pdfFile.getName() + " version " + pdfFile.getVersion() + " is disabled!"); System.out.println(pdfFile.getName() + " version " + pdfFile.getVersion() + " is disabled!");
GroupManager.logger.removeHandler(ch);
} }
@Override @Override
@ -68,7 +70,7 @@ public class GroupManager extends JavaPlugin {
+ Thread.currentThread().getStackTrace()[5].getClassName()); + Thread.currentThread().getStackTrace()[5].getClassName());
} }
GroupManager.logger.setUseParentHandlers(false); GroupManager.logger.setUseParentHandlers(false);
GMLoggerHandler ch = new GMLoggerHandler(); ch = new GMLoggerHandler();
GroupManager.logger.addHandler(ch); GroupManager.logger.addHandler(ch);
logger.setLevel(Level.ALL); logger.setLevel(Level.ALL);
if (worldsHolder == null) { if (worldsHolder == null) {