From d06cc421609b7d783460ccd1ae3e5cf045cc14df Mon Sep 17 00:00:00 2001 From: Robin Kupper Date: Tue, 6 Sep 2011 20:55:13 +0200 Subject: [PATCH] Added cake logging --- src/de/diddiz/LogBlock/BlockChange.java | 2 ++ src/de/diddiz/LogBlock/Config.java | 8 ++++++-- src/de/diddiz/LogBlock/LBPlayerListener.java | 2 ++ src/de/diddiz/LogBlock/LogBlock.java | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/de/diddiz/LogBlock/BlockChange.java b/src/de/diddiz/LogBlock/BlockChange.java index 617aaa2..9b77ad4 100644 --- a/src/de/diddiz/LogBlock/BlockChange.java +++ b/src/de/diddiz/LogBlock/BlockChange.java @@ -72,6 +72,8 @@ public class BlockChange implements LookupCacheElement msg.append("swiched " + materialName(type)); else if (type == 77) msg.append("pressed " + materialName(type)); + else if (type == 92) + msg.append("ate a piece of " + materialName(type)); } else if (type == 0) msg.append("destroyed " + materialName(replaced, data)); else if (replaced == 0) diff --git a/src/de/diddiz/LogBlock/Config.java b/src/de/diddiz/LogBlock/Config.java index 1d7b1d8..90ca776 100644 --- a/src/de/diddiz/LogBlock/Config.java +++ b/src/de/diddiz/LogBlock/Config.java @@ -25,7 +25,7 @@ public class Config public final boolean useBukkitScheduler; public final int keepLogDays; public final boolean dumpDeletedLog; - public boolean logBlockPlacings, logBlockBreaks, logSignTexts, logExplosions, logFire, logLeavesDecay, logLavaFlow, logWaterFlow, logChestAccess, logButtonsAndLevers, logKills, logChat, logSnowForm, logSnowFade, logDoors; + public boolean logBlockPlacings, logBlockBreaks, logSignTexts, logExplosions, logFire, logLeavesDecay, logLavaFlow, logWaterFlow, logChestAccess, logButtonsAndLevers, logKills, logChat, logSnowForm, logSnowFade, logDoors, logCakes; public final boolean logCreeperExplosionsAsPlayerWhoTriggeredThese; public final LogKillsLevel logKillsLevel; public final Set dontRollback, replaceAnyway; @@ -205,6 +205,8 @@ public class Config logSnowFade = true; if (wcfg.logDoors) logDoors = true; + if (wcfg.logCakes) + logCakes = true; } } } @@ -212,7 +214,7 @@ public class Config class WorldConfig { public final String table; - public final boolean logBlockPlacings, logBlockBreaks, logSignTexts, logExplosions, logFire, logLeavesDecay, logLavaFlow, logWaterFlow, logChestAccess, logButtonsAndLevers, logKills, logChat, logSnowForm, logSnowFade, logDoors; + public final boolean logBlockPlacings, logBlockBreaks, logSignTexts, logExplosions, logFire, logLeavesDecay, logLavaFlow, logWaterFlow, logChestAccess, logButtonsAndLevers, logKills, logChat, logSnowForm, logSnowFade, logDoors, logCakes; public WorldConfig(File file) { final Map def = new HashMap(); @@ -232,6 +234,7 @@ class WorldConfig def.put("logSnowForm", false); def.put("logSnowFade", false); def.put("logDoors", false); + def.put("logCakes", false); final Configuration config = new Configuration(file); config.load(); for (final Entry e : def.entrySet()) @@ -254,5 +257,6 @@ class WorldConfig logSnowForm = config.getBoolean("logSnowForm", false); logSnowFade = config.getBoolean("logSnowFade", false); logDoors = config.getBoolean("logDoors", false); + logCakes = config.getBoolean("logCakes", false); } } diff --git a/src/de/diddiz/LogBlock/LBPlayerListener.java b/src/de/diddiz/LogBlock/LBPlayerListener.java index ea4c07e..3b6e7e0 100644 --- a/src/de/diddiz/LogBlock/LBPlayerListener.java +++ b/src/de/diddiz/LogBlock/LBPlayerListener.java @@ -43,6 +43,8 @@ class LBPlayerListener extends PlayerListener consumer.queueBlock(event.getPlayer().getName(), event.getClickedBlock().getLocation(), type, type, (byte)0); else if (wcfg.logDoors && (type == 64 || type == 96)) consumer.queueBlock(event.getPlayer().getName(), event.getClickedBlock().getLocation(), type, type, (byte)((event.getClickedBlock().getData() & 4) / 4)); + else if (wcfg.logCakes && type == 92 && event.getPlayer().getHealth() < 20) + consumer.queueBlock(event.getPlayer().getName(), event.getClickedBlock().getLocation(), type, type, (byte)0); } } diff --git a/src/de/diddiz/LogBlock/LogBlock.java b/src/de/diddiz/LogBlock/LogBlock.java index e595c96..e168a0d 100644 --- a/src/de/diddiz/LogBlock/LogBlock.java +++ b/src/de/diddiz/LogBlock/LogBlock.java @@ -202,7 +202,7 @@ public class LogBlock extends JavaPlugin pm.registerEvent(Type.CUSTOM_EVENT, new LBChestAccessListener(this), Priority.Monitor, this); else log.warning("[LogBlock] BukkitContrib not found. Can't log chest accesses."); - if (config.logButtonsAndLevers || config.logDoors) + if (config.logButtonsAndLevers || config.logDoors || config.logCakes) pm.registerEvent(Type.PLAYER_INTERACT, lbPlayerListener, Priority.Monitor, this); if (config.logKills) pm.registerEvent(Type.ENTITY_DAMAGE, lbEntityListener, Priority.Monitor, this);