Update to first build of 1.7.2 - CraftBukkit is still buggy so expect issues

Bukkit: #1856 CB: #2922

5 files changed, 68 insertions, 38 deletions

diff --git a/Essentials/src/com/earth2me/essentials/Potions.java b/Essentials/src/com/earth2me/essentials/Potions.java
index 7cc967ecb..e79237a0f 100644
--- a/Essentials/src/com/earth2me/essentials/Potions.java
+++ b/Essentials/src/com/earth2me/essentials/Potions.java
@@ -116,6 +116,19 @@ public class Potions
 		{
 			Essentials.wrongVersion();
 		}
+		
+		try // 1.7 update
+		{
+			POTIONS.put("waterbreathing", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("underwaterbreathing", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("waterbreath", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("underwaterbreath", PotionEffectType.WATER_BREATHING);
+			ALIASPOTIONS.put("air", PotionEffectType.WATER_BREATHING);
+		}
+		catch (java.lang.NoSuchFieldError e)
+		{
+			Essentials.wrongVersion();
+		}
 	}
 
 	public static PotionEffectType getByName(String name)
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java b/Essentials/src/com/earth2me/essentials/commands/Commandtree.java
index 5c5f25b78..b58e05da8 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandtree.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandtree.java
@@ -1,5 +1,6 @@
 package com.earth2me.essentials.commands;
 
+import com.earth2me.essentials.Essentials;
 import static com.earth2me.essentials.I18n._;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.utils.LocationUtil;
@@ -18,46 +19,62 @@ public class Commandtree extends EssentialsCommand
 	@Override
 	public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
 	{
-		TreeType tree;
-		if (args.length < 1)
+		TreeType tree = TreeType.BIRCH;
+		try // update check
 		{
-			throw new NotEnoughArgumentsException();
+			
+			if (args.length < 1)
+			{
+				throw new NotEnoughArgumentsException();
+			}
+			else if (args[0].equalsIgnoreCase("birch"))
+			{
+				tree = TreeType.BIRCH;
+			}
+			else if (args[0].equalsIgnoreCase("redwood"))
+			{
+				tree = TreeType.REDWOOD;
+			}
+			else if (args[0].equalsIgnoreCase("tree"))
+			{
+				tree = TreeType.TREE;
+			}
+			else if (args[0].equalsIgnoreCase("redmushroom"))
+			{
+				tree = TreeType.RED_MUSHROOM;
+			}
+			else if (args[0].equalsIgnoreCase("brownmushroom"))
+			{
+				tree = TreeType.BROWN_MUSHROOM;
+			}
+			else if (args[0].equalsIgnoreCase("jungle"))
+			{
+				tree = TreeType.SMALL_JUNGLE;
+			}
+			else if (args[0].equalsIgnoreCase("junglebush"))
+			{
+				tree = TreeType.JUNGLE_BUSH;
+			}
+			else if (args[0].equalsIgnoreCase("swamp"))
+			{
+				tree = TreeType.SWAMP;
+			}
+			else if (args[0].equalsIgnoreCase("acacia"))
+			{
+				tree = TreeType.ACACIA;
+			}
+			else if (args[0].equalsIgnoreCase("darkoak"))
+			{
+				tree = TreeType.DARK_OAK;
+			}
+			else
+			{
+				throw new NotEnoughArgumentsException();
+			}
 		}
-		else if (args[0].equalsIgnoreCase("birch"))
+		catch (java.lang.NoSuchFieldError e)
 		{
-			tree = TreeType.BIRCH;
-		}
-		else if (args[0].equalsIgnoreCase("redwood"))
-		{
-			tree = TreeType.REDWOOD;
-		}
-		else if (args[0].equalsIgnoreCase("tree"))
-		{
-			tree = TreeType.TREE;
-		}
-		else if (args[0].equalsIgnoreCase("redmushroom"))
-		{
-			tree = TreeType.RED_MUSHROOM;
-		}
-		else if (args[0].equalsIgnoreCase("brownmushroom"))
-		{
-			tree = TreeType.BROWN_MUSHROOM;
-		}
-		else if (args[0].equalsIgnoreCase("jungle"))
-		{
-			tree = TreeType.SMALL_JUNGLE;
-		}
-		else if (args[0].equalsIgnoreCase("junglebush"))
-		{
-			tree = TreeType.JUNGLE_BUSH;
-					}
-		else if (args[0].equalsIgnoreCase("swamp"))
-		{
-			tree = TreeType.SWAMP;
-		}
-		else
-		{
-			throw new NotEnoughArgumentsException();
+			Essentials.wrongVersion();
 		}
 
 		final Location loc = LocationUtil.getTarget(user.getBase());
diff --git a/lib/bukkit.jar b/lib/bukkit.jar
index fb99656f3..5926c83bd 100644
--- a/lib/bukkit.jar
+++ b/lib/bukkit.jar
diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar
index 729ee4cd2..4a8d1abcb 100644
--- a/lib/craftbukkit.jar
+++ b/lib/craftbukkit.jar
diff --git a/pom.xml b/pom.xml
index 5a2dfa048..97ba94b66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>1.6.4-R0.1-SNAPSHOT</version>
+			<version>1.7.2-R0.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>