feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Initializing the consumer before other plugins enables.

Browse Source
This commit is contained in:
Robin Kupper
2011-04-20 22:34:18 +02:00
parent 645a305649
commit 7c39803469
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/de/diddiz/LogBlock/LogBlock.java
View File

@@ -40,6 +40,7 @@ public class LogBlock extends JavaPlugin
private Consumer consumer = null; private Consumer consumer = null;
private Timer timer = null; private Timer timer = null;
private PermissionHandler permissions = null; private PermissionHandler permissions = null;
private boolean errorAtLoading = false;
public Config getConfig() { public Config getConfig() {
return config; return config;
@@ -50,20 +51,15 @@ public class LogBlock extends JavaPlugin
} }
@Override @Override
public void onEnable() { public void onLoad() {
log = getServer().getLogger(); log = getServer().getLogger();
try { try {
config = new Config(this); config = new Config(this);
} catch (Exception ex) { } catch (Exception ex) {
log.log(Level.SEVERE, "[LogBlock] Exception while reading config", ex); log.log(Level.SEVERE, "[LogBlock] Exception while reading config:", ex);
getServer().getPluginManager().disablePlugin(this); errorAtLoading = true;
return; return;
} }
if (getServer().getPluginManager().getPlugin("Permissions") != null) {
permissions = ((Permissions)getServer().getPluginManager().getPlugin("Permissions")).getHandler();
log.info("[LogBlock] Permissions enabled");
} else
log.info("[LogBlock] Permissions plugin not found. Using default permissions.");
File file = new File("lib/mysql-connector-java-bin.jar"); File file = new File("lib/mysql-connector-java-bin.jar");
try { try {
if (!file.exists() || file.length() == 0) { if (!file.exists() || file.length() == 0) {
@@ -74,7 +70,7 @@ public class LogBlock extends JavaPlugin
throw new FileNotFoundException(file.getAbsolutePath() + file.getName()); throw new FileNotFoundException(file.getAbsolutePath() + file.getName());
} catch (Exception e) { } catch (Exception e) {
log.log(Level.SEVERE, "[LogBlock] Error while downloading " + file.getName() + "."); log.log(Level.SEVERE, "[LogBlock] Error while downloading " + file.getName() + ".");
getServer().getPluginManager().disablePlugin(this); errorAtLoading = true;
return; return;
} }
try { try {
@@ -83,23 +79,36 @@ public class LogBlock extends JavaPlugin
conn.close(); conn.close();
} catch (Exception ex) { } catch (Exception ex) {
log.log(Level.SEVERE, "[LogBlock] Exception while checking database connection", ex); log.log(Level.SEVERE, "[LogBlock] Exception while checking database connection", ex);
getServer().getPluginManager().disablePlugin(this); errorAtLoading = true;
return; return;
} }
if (!checkTables()) { if (!checkTables()) {
log.log(Level.SEVERE, "[LogBlock] Errors while checking tables. They may not exist."); log.log(Level.SEVERE, "[LogBlock] Errors while checking tables. They may not exist.");
errorAtLoading = true;
return;
}
consumer = new Consumer(this);
}
@Override
public void onEnable() {
if (errorAtLoading) {
getServer().getPluginManager().disablePlugin(this); getServer().getPluginManager().disablePlugin(this);
return; return;
} }
if (getServer().getPluginManager().getPlugin("Permissions") != null) {
permissions = ((Permissions)getServer().getPluginManager().getPlugin("Permissions")).getHandler();
log.info("[LogBlock] Permissions enabled");
} else
log.info("[LogBlock] Permissions plugin not found. Using default permissions.");
if (config.keepLogDays >= 0) if (config.keepLogDays >= 0)
new Thread(new ClearLog(this)).start(); new Thread(new ClearLog(this)).start();
consumer = new Consumer(this);
LBBlockListener lbBlockListener = new LBBlockListener(this); LBBlockListener lbBlockListener = new LBBlockListener(this);
LBPlayerListener lbPlayerListener = new LBPlayerListener(this); LBPlayerListener lbPlayerListener = new LBPlayerListener(this);
LBEntityListener lbEntityListener = new LBEntityListener(this); LBEntityListener lbEntityListener = new LBEntityListener(this);
PluginManager pm = getServer().getPluginManager(); PluginManager pm = getServer().getPluginManager();
pm.registerEvent(Type.PLAYER_INTERACT, new LBToolPlayerListener(this), Priority.Normal, this); pm.registerEvent(Type.PLAYER_INTERACT, new LBToolPlayerListener(this), Priority.Normal, this);
pm.registerEvent(Type.PLAYER_JOIN, lbPlayerListener, Priority.Normal, this); pm.registerEvent(Type.PLAYER_JOIN, lbPlayerListener, Priority.Monitor, this);
if (config.logBlockCreations) { if (config.logBlockCreations) {
pm.registerEvent(Type.BLOCK_PLACE, lbBlockListener, Priority.Monitor, this); pm.registerEvent(Type.BLOCK_PLACE, lbBlockListener, Priority.Monitor, this);
pm.registerEvent(Type.PLAYER_BUCKET_EMPTY, lbPlayerListener, Priority.Monitor, this); pm.registerEvent(Type.PLAYER_BUCKET_EMPTY, lbPlayerListener, Priority.Monitor, this);