Update for CB #2014

Author: turt2live

src/de/diddiz/LogBlockQuestioner/LogBlockQuestioner.java

@@ -2,8 +2,6 @@
 
 import java.util.Vector;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event.Priority;
-import org.bukkit.event.Event.Type;
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class LogBlockQuestioner extends JavaPlugin
@@ -12,7 +10,7 @@ public class LogBlockQuestioner extends JavaPlugin
 
 	@Override
 	public void onEnable() {
-		getServer().getPluginManager().registerEvent(Type.PLAYER_COMMAND_PREPROCESS, new LogBlockQuestionerPlayerListener(questions), Priority.Normal, this);
+		getServer().getPluginManager().registerEvents(new LogBlockQuestionerPlayerListener(questions), this);
 		getServer().getScheduler().scheduleSyncRepeatingTask(this, new QuestionsReaper(questions), 15000, 15000);
 		getServer().getLogger().info("LogBlockQuestioner v" + getDescription().getVersion() + " enabled");
 	}

src/de/diddiz/LogBlockQuestioner/LogBlockQuestionerPlayerListener.java

@@ -1,18 +1,20 @@
 package de.diddiz.LogBlockQuestioner;
 
 import java.util.Vector;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerListener;
 
-class LogBlockQuestionerPlayerListener extends PlayerListener
+class LogBlockQuestionerPlayerListener implements Listener
 {
 	private final Vector<Question> questions;
 
 	LogBlockQuestionerPlayerListener(Vector<Question> questions) {
 		this.questions = questions;
 	}
 
-	@Override
+	@EventHandler
 	public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
 		if (!event.isCancelled() && !questions.isEmpty()) {
 			final int playerHash = event.getPlayer().getName().hashCode();