Merged chat and player listeners.

src/de/diddiz/LogBlock/LBChatListener.java

@@ -1,26 +0,0 @@
-package de.diddiz.LogBlock;
-
-import org.bukkit.event.player.PlayerChatEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerListener;
-
-class LBChatListener extends PlayerListener
-{
-	private final Consumer consumer;
-
-	LBChatListener(LogBlock logblock) {
-		consumer = logblock.getConsumer();
-	}
-
-	@Override
-	public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-		if (!event.isCancelled())
-			consumer.queueChat(event.getPlayer().getName(), event.getMessage());
-	}
-
-	@Override
-	public void onPlayerChat(PlayerChatEvent event) {
-		if (!event.isCancelled())
-			consumer.queueChat(event.getPlayer().getName(), event.getMessage());
-	}
-}

src/de/diddiz/LogBlock/LBPlayerListener.java

@@ -5,6 +5,8 @@ import org.bukkit.Material;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerBucketEmptyEvent;
 import org.bukkit.event.player.PlayerBucketFillEvent;
+import org.bukkit.event.player.PlayerChatEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerListener;
 
@@ -41,4 +43,18 @@ class LBPlayerListener extends PlayerListener
 				consumer.queueBlock(event.getPlayer().getName(), event.getClickedBlock().getLocation(), type, type, (byte)0);
 		}
 	}
+
+	@Override
+	public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
+		final WorldConfig wcfg = worlds.get(event.getPlayer().getWorld().getName().hashCode());
+		if (!event.isCancelled() && wcfg.logChat)
+			consumer.queueChat(event.getPlayer().getName(), event.getMessage());
+	}
+
+	@Override
+	public void onPlayerChat(PlayerChatEvent event) {
+		final WorldConfig wcfg = worlds.get(event.getPlayer().getWorld().getName().hashCode());
+		if (!event.isCancelled() && wcfg.logChat)
+			consumer.queueChat(event.getPlayer().getName(), event.getMessage());
+	}
 }

src/de/diddiz/LogBlock/LogBlock.java

@@ -184,9 +184,8 @@ public class LogBlock extends JavaPlugin
 		if (config.logKills)
 			pm.registerEvent(Type.ENTITY_DAMAGE, lbEntityListener, Priority.Monitor, this);
 		if (config.logChat) {
-			final LBChatListener lbChatListener = new LBChatListener(this);
+			pm.registerEvent(Type.PLAYER_CHAT, lbPlayerListener, Priority.Monitor, this);
-			pm.registerEvent(Type.PLAYER_CHAT, lbChatListener, Priority.Monitor, this);
+			pm.registerEvent(Type.PLAYER_COMMAND_PREPROCESS, lbPlayerListener, Priority.Monitor, this);
-			pm.registerEvent(Type.PLAYER_COMMAND_PREPROCESS, lbChatListener, Priority.Monitor, this);
 		}
 		if (config.useBukkitScheduler) {
 			if (getServer().getScheduler().scheduleAsyncRepeatingTask(this, consumer, config.delayBetweenRuns * 20, config.delayBetweenRuns * 20) > 0)