Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-07-16 16:45:05 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Bukkit: #1856 CB: #2922
This commit is contained in:
KHobbits 2013-12-01 02:51:40 +00:00
parent caa3ac88aa
commit e411f61296
5 changed files with 68 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Essentials/src/com/earth2me/essentials/Potions.java
View File

@ -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)

91
Essentials/src/com/earth2me/essentials/commands/Commandtree.java
View File

@ -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());

BIN
lib/bukkit.jar
View File

Binary file not shown.

BIN
lib/craftbukkit.jar
View File

Binary file not shown.

2
pom.xml
View File

@ -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>