Update Bukkit to 1.7.3-R0.3 - Bukkit: 1903 CB: 3020

This also disables vanilla fallback, use new aliases file.

4 files changed, 14 insertions, 20 deletions

diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 1150d8bd7..3fe086ad1 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -101,7 +101,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 	private transient Metrics metrics;
 	private transient EssentialsTimer timer;
 	private transient List<String> vanishedPlayers = new ArrayList<String>();
-	private transient SimpleCommandMap scm;
 
 	public Essentials()
 	{
@@ -153,7 +152,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 			i18n = new I18n(this);
 			i18n.onEnable();
 			execTimer.mark("I18n1");
-			scm = new SimpleCommandMap(this.getServer());
 			final PluginManager pm = getServer().getPluginManager();
 			for (Plugin plugin : pm.getPlugins())
 			{
@@ -457,16 +455,6 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials
 			// Check for disabled commands
 			if (getSettings().isCommandDisabled(commandLabel))
 			{
-				if (scm != null)
-				{
-					for (VanillaCommand cmd : scm.getFallbackCommands())
-					{
-						if (cmd.matches(commandLabel))
-						{
-							cmd.execute(cSender, commandLabel, args);
-						}
-					}
-				}
 				return true;
 			}
 
diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
index 52e3b2ce3..788437c28 100644
--- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
+++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
@@ -1365,48 +1365,54 @@ public class OfflinePlayer implements Player
 	@Override
 	public void playSound(Location arg0, String arg1, float arg2, float arg3)
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
 	@Override
 	public boolean isHealthScaled()
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
 	@Override
 	public void setHealthScaled(boolean arg0)
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
 	@Override
 	public void setHealthScale(double arg0) throws IllegalArgumentException
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
 	@Override
 	public double getHealthScale()
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
 	@Override
 	public boolean isLeashed()
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
 	@Override
 	public Entity getLeashHolder() throws IllegalStateException
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 
 	@Override
 	public boolean setLeashHolder(Entity arg0)
 	{
-		throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+		throw new UnsupportedOperationException("Not supported yet.");
+	}
+
+	@Override
+	public <T extends Projectile> T launchProjectile(Class<? extends T> type, Vector vector)
+	{
+		throw new UnsupportedOperationException("Not supported yet.");
 	}
 }
diff --git a/lib/bukkit.jar b/lib/bukkit.jar
index eba8f9ac1..3d81db136 100644
--- a/lib/bukkit.jar
+++ b/lib/bukkit.jar
diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar
index b0ef4cd3e..2f59a449b 100644
--- a/lib/craftbukkit.jar
+++ b/lib/craftbukkit.jar