From e0d3b9cfcfafe3e47a489017eb7f4bab711a4e0a Mon Sep 17 00:00:00 2001
From: ementalo <ementalodev@gmx.co.uk>
Date: Fri, 19 Oct 2012 10:33:10 +0100
Subject: Fix command handlers

---
 EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java | 5 +++--
 EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java    | 5 +++--
 pom.xml                                                 | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java b/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java
index 01a58776d..de2c5fedd 100644
--- a/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java
+++ b/EssentialsExtra/src/net/ess3/extra/EssentialsExtra.java
@@ -15,6 +15,7 @@ import java.util.logging.Level;
 import net.ess3.api.ICommandHandler;
 import net.ess3.api.IEssentials;
 import net.ess3.bukkit.BukkitPlugin;
+import org.bukkit.command.TabExecutor;
 import net.ess3.commands.EssentialsCommandHandler;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -80,7 +81,7 @@ public class EssentialsExtra extends JavaPlugin
 		}
 
 		ClassLoader loader = new URLClassLoader(urls);
-		final ICommandHandler handler = new EssentialsCommandHandler(loader, "Command", "essentials.", ess);
+		final TabExecutor handler = new EssentialsCommandHandler(loader, "Command", "essentials.", ess);
 		for (File file : commandDir.listFiles())
 		{
 			String fileName = file.getName();
@@ -99,7 +100,7 @@ public class EssentialsExtra extends JavaPlugin
 						@Override
 						public boolean execute(CommandSender cs, String label, String[] args)
 						{
-							return handler.handleCommand(cs, this, label, args);
+							return handler.onCommand(cs, this, label, args);
 						}
 					});
 					getLogger().info("Loaded command " + commandName);
diff --git a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
index 0aa6c9bed..b8e7545e6 100644
--- a/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
+++ b/EssentialsXMPP/src/net/ess3/xmpp/EssentialsXMPP.java
@@ -14,6 +14,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.command.TabExecutor;
 
 
 public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
@@ -23,7 +24,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
 	private transient UserManager users;
 	private transient XMPPManager xmpp;
 	private transient IEssentials ess;
-	private transient ICommandHandler commandHandler;
+	private transient TabExecutor commandHandler;
 
 	public static IEssentialsXMPP getInstance()
 	{
@@ -73,7 +74,7 @@ public class EssentialsXMPP extends JavaPlugin implements IEssentialsXMPP
 	@Override
 	public boolean onCommand(final CommandSender sender, final Command command, final String commandLabel, final String[] args)
 	{
-		return commandHandler.handleCommand(sender, command, commandLabel, args);
+		return commandHandler.onCommand(sender, command, commandLabel, args);
 	}
 
 	@Override
diff --git a/pom.xml b/pom.xml
index 5f6a6b90f..066ee5827 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <bukkit.version>1.3.2-R1.1-SNAPSHOT</bukkit.version>
+    <bukkit.version>1.3.2-R2.1-SNAPSHOT</bukkit.version>
     <build.number>Unknown</build.number>
     <org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>
     <org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>
-- 
cgit v1.2.3