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

Splitted up player environment to 4 subsets

Browse Source
This commit is contained in:
Robin Kupper
2011-03-17 01:31:31 +01:00
parent b0ab117cb9
commit 584280e281
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/de/diddiz/LogBlock/Config.java
View File

@@ -22,8 +22,12 @@ public class Config {
static boolean logSignTexts; static boolean logSignTexts;
static boolean logExplosions; static boolean logExplosions;
static boolean logFire; static boolean logFire;
static boolean logChestAccess;
static boolean logLeavesDecay; static boolean logLeavesDecay;
static boolean logChestAccess;
static String logTNTExplosionsAs;
static String logCreeperExplosionsAs;
static String logFireAs;
static String logLeavesDecayAs;
static boolean usePermissions; static boolean usePermissions;
static boolean Load(Configuration config) { static boolean Load(Configuration config) {
@@ -65,6 +69,14 @@ public class Config {
config.setProperty("logChestAccess", false); config.setProperty("logChestAccess", false);
if (!keys.contains("logLeavesDecay")) if (!keys.contains("logLeavesDecay"))
config.setProperty("logLeavesDecay", false); 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")) if (!keys.contains("usePermissions"))
config.setProperty("usePermissions", false); config.setProperty("usePermissions", false);
if (!config.save()){ if (!config.save()){
@@ -87,8 +99,12 @@ public class Config {
logSignTexts = config.getBoolean("logSignTexts", false); logSignTexts = config.getBoolean("logSignTexts", false);
logExplosions = config.getBoolean("logExplosions", false); logExplosions = config.getBoolean("logExplosions", false);
logFire = config.getBoolean("logFire", false); logFire = config.getBoolean("logFire", false);
logChestAccess = config.getBoolean("logChestAccess", false); logChestAccess = config.getBoolean("logChestAccess", false);
logLeavesDecay = config.getBoolean("logLeavesDecay", 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); usePermissions = config.getBoolean("usePermissions", false);
return true; return true;
} }

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

@@ -298,10 +298,10 @@ public class LogBlock extends JavaPlugin
if (!dbm.getTables(null, null, "lb-players", null).next()) { if (!dbm.getTables(null, null, "lb-players", null).next()) {
log.log(Level.INFO, "[LogBlock] Crating table players."); 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("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()) if (!dbm.getTables(null, null, "lb-players", null).next())
return false; 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++) { for (int i = 0; i < Config.worldNames.size(); i++) {
String table = Config.worldTables.get(i); String table = Config.worldTables.get(i);
if (!dbm.getTables(null, null, table, null).next()) { if (!dbm.getTables(null, null, table, null).next()) {
@@ -505,7 +505,7 @@ private boolean CheckPermission(Player player, String permission) {
public void onBlockBurn(BlockBurnEvent event) { public void onBlockBurn(BlockBurnEvent event) {
if (!event.isCancelled()) 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) { public void onBlockInteract(BlockInteractEvent event) {
@@ -519,7 +519,7 @@ private boolean CheckPermission(Player player, String permission) {
public void onLeavesDecay(LeavesDecayEvent event) { public void onLeavesDecay(LeavesDecayEvent event) {
if (!event.isCancelled()) 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) { public void onEntityExplode(EntityExplodeEvent event) {
if (!event.isCancelled()) { if (!event.isCancelled()) {
String name;
if (event.getEntity() == null)
name = Config.logTNTExplosionsAs;
else
name = Config.logCreeperExplosionsAs;
for (Block block : event.blockList()) for (Block block : event.blockList())
queueBlock("environment", block, block.getTypeId(), 0, block.getData()); queueBlock(name, block, block.getTypeId(), 0, block.getData());
} }
} }
} }