diff --git a/src/de/diddiz/LogBlock/Config.java b/src/de/diddiz/LogBlock/Config.java index 8bb6ba8..fee10ed 100644 --- a/src/de/diddiz/LogBlock/Config.java +++ b/src/de/diddiz/LogBlock/Config.java @@ -22,8 +22,12 @@ public class Config { static boolean logSignTexts; static boolean logExplosions; static boolean logFire; - static boolean logChestAccess; static boolean logLeavesDecay; + static boolean logChestAccess; + static String logTNTExplosionsAs; + static String logCreeperExplosionsAs; + static String logFireAs; + static String logLeavesDecayAs; static boolean usePermissions; static boolean Load(Configuration config) { @@ -65,6 +69,14 @@ public class Config { config.setProperty("logChestAccess", false); if (!keys.contains("logLeavesDecay")) config.setProperty("logLeavesDecay", false); + if (!keys.contains("logTNTExplosionsAs")) + config.setProperty("logTNTExplosionsAs", "TNT"); + if (!keys.contains("logCreeperExplosionsAs")) + config.setProperty("logCreeperExplosionsAs", "Creeper"); + if (!keys.contains("logFireAs")) + config.setProperty("logFireAs", "Fire"); + if (!keys.contains("logLeavesDecayAs")) + config.setProperty("logLeavesDecayAs", "LeavesDecay"); if (!keys.contains("usePermissions")) config.setProperty("usePermissions", false); if (!config.save()){ @@ -87,8 +99,12 @@ public class Config { logSignTexts = config.getBoolean("logSignTexts", false); logExplosions = config.getBoolean("logExplosions", false); logFire = config.getBoolean("logFire", false); - logChestAccess = config.getBoolean("logChestAccess", false); - logLeavesDecay = config.getBoolean("logLeavesDecay", false); + logChestAccess = config.getBoolean("logChestAccess", false); + logLeavesDecay = config.getBoolean("logLeavesDecay", false); + logTNTExplosionsAs = config.getString("logTNTExplosionsAs"); + logCreeperExplosionsAs = config.getString("logCreeperExplosionsAs"); + logFireAs = config.getString("logFireAs"); + logLeavesDecayAs = config.getString("logLeavesDecayAs"); usePermissions = config.getBoolean("usePermissions", false); return true; } diff --git a/src/de/diddiz/LogBlock/LogBlock.java b/src/de/diddiz/LogBlock/LogBlock.java index 7792af3..c89ad0d 100644 --- a/src/de/diddiz/LogBlock/LogBlock.java +++ b/src/de/diddiz/LogBlock/LogBlock.java @@ -298,10 +298,10 @@ public class LogBlock extends JavaPlugin if (!dbm.getTables(null, null, "lb-players", null).next()) { log.log(Level.INFO, "[LogBlock] Crating table players."); state.execute("CREATE TABLE `lb-players` (`playerid` SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT, `playername` varchar(32) NOT NULL DEFAULT '-', PRIMARY KEY (`playerid`), UNIQUE (`playername`))"); - state.execute("INSERT INTO `lb-players` (`playername`) VALUES ('environment');"); if (!dbm.getTables(null, null, "lb-players", null).next()) return false; } + state.execute("INSERT IGNORE INTO `lb-players` (`playername`) VALUES ('" + Config.logTNTExplosionsAs + "'), ('" + Config.logCreeperExplosionsAs + "'), ('" + Config.logFireAs + "'), ('" + Config.logLeavesDecayAs + "')"); for (int i = 0; i < Config.worldNames.size(); i++) { String table = Config.worldTables.get(i); if (!dbm.getTables(null, null, table, null).next()) { @@ -505,7 +505,7 @@ private boolean CheckPermission(Player player, String permission) { public void onBlockBurn(BlockBurnEvent event) { if (!event.isCancelled()) - queueBlock("environment", event.getBlock(), event.getBlock().getTypeId(), 0, event.getBlock().getData()); + queueBlock(Config.logFireAs, event.getBlock(), event.getBlock().getTypeId(), 0, event.getBlock().getData()); } public void onBlockInteract(BlockInteractEvent event) { @@ -519,7 +519,7 @@ private boolean CheckPermission(Player player, String permission) { public void onLeavesDecay(LeavesDecayEvent event) { if (!event.isCancelled()) - queueBlock("environment", event.getBlock(), event.getBlock().getTypeId(), 0, event.getBlock().getData()); + queueBlock(Config.logLeavesDecayAs, event.getBlock(), event.getBlock().getTypeId(), 0, event.getBlock().getData()); } } @@ -527,8 +527,13 @@ private boolean CheckPermission(Player player, String permission) { { public void onEntityExplode(EntityExplodeEvent event) { if (!event.isCancelled()) { + String name; + if (event.getEntity() == null) + name = Config.logTNTExplosionsAs; + else + name = Config.logCreeperExplosionsAs; for (Block block : event.blockList()) - queueBlock("environment", block, block.getTypeId(), 0, block.getData()); + queueBlock(name, block, block.getTypeId(), 0, block.getData()); } } }