From 6ad8ddb639af9b8d9ec086248476f70ed1f87d42 Mon Sep 17 00:00:00 2001 From: Robin Kupper Date: Thu, 10 Mar 2011 13:16:44 +0100 Subject: [PATCH] v0.5b --- src/de/diddiz/LogBlock/LogBlock.java | 16 +++++++++++++--- src/plugin.yml | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/de/diddiz/LogBlock/LogBlock.java b/src/de/diddiz/LogBlock/LogBlock.java index 5cb374b..4f7cead 100644 --- a/src/de/diddiz/LogBlock/LogBlock.java +++ b/src/de/diddiz/LogBlock/LogBlock.java @@ -23,6 +23,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.Event.Type; import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockListener; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockRightClickEvent; @@ -60,6 +61,7 @@ public class LogBlock extends JavaPlugin private int keepLogDays = -1; private boolean toolblockRemove = true; private boolean logExplosions = false; + private boolean logFire = false; private Consumer consumer = null; private LinkedBlockingQueue bqueue = new LinkedBlockingQueue(); @@ -87,6 +89,7 @@ public class LogBlock extends JavaPlugin worldNames = getConfiguration().getStringList("worldNames", null); worldTables = getConfiguration().getStringList("worldTables", null); logExplosions = getConfiguration().getBoolean("logExplosions", false); + logFire = getConfiguration().getBoolean("logFire", false); if (getConfiguration().getBoolean("usePermissions", false)) { if (getServer().getPluginManager().getPlugin("Permissions") != null) { usePermissions = true; @@ -131,6 +134,8 @@ public class LogBlock extends JavaPlugin pm.registerEvent(Type.BLOCK_PLACED, lblBlockListener, Event.Priority.Monitor, this); pm.registerEvent(Type.BLOCK_BREAK, lblBlockListener, Event.Priority.Monitor, this); pm.registerEvent(Type.SIGN_CHANGE, lblBlockListener, Event.Priority.Monitor, this); + if (logFire) + pm.registerEvent(Type.BLOCK_BURN, lblBlockListener, Event.Priority.Monitor, this); if (logExplosions) { lblEntityListener = new LBLEntityListener(); @@ -299,10 +304,10 @@ public class LogBlock extends JavaPlugin private void queueSign(String playerName, Block block, String[] signText) { - int idx = worldNames.indexOf(block.getWorld().getName()); - if (idx == -1) + String table = GetTable(block.getWorld().getName()); + if (table == null) return; - BlockRow row = new BlockRow(worldTables.get(idx), playerName, 0, block.getTypeId(), block.getData(), block.getX(), block.getY(), block.getZ()); + BlockRow row = new BlockRow(table, playerName, 0, block.getTypeId(), block.getData(), block.getX(), block.getY(), block.getZ()); String text = "sign"; for (int i = 0; i < 4; i++) text += " [" + signText[i] + "]"; @@ -495,6 +500,11 @@ public class LogBlock extends JavaPlugin if (!event.isCancelled()) queueSign(event.getPlayer().getName(), event.getBlock(), event.getLines()); } + + public void onBlockBurn(BlockBurnEvent event) { + if (!event.isCancelled()) + queueBlock("environment", event.getBlock(), event.getBlock().getTypeId(), 0, event.getBlock().getData()); + } } private class LBLEntityListener extends EntityListener diff --git a/src/plugin.yml b/src/plugin.yml index 239094b..31ce34e 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,5 +1,5 @@ name: LogBlock -version: 0.5 +version: 0.5b author: DiddiZ, bootswithdefer website: http://www.diddiz.de/minecraft/ main: de.diddiz.LogBlock.LogBlock