Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-10 18:38:18 +01:00
Code Issues Projects Releases Wiki Activity

Update Bukkit

Browse Source 
Bukkit: #1859 CB: #2943
This commit is contained in:
KHobbits 2013-12-07 22:24:01 +00:00
parent 5e9f5904fd
commit af02a28ce5
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Essentials/src/com/earth2me/essentials/Enchantments.java
View File

@ -141,13 +141,32 @@ public class Enchantments
ALIASENCHANTMENTS.put("unlimited", Enchantment.ARROW_INFINITE); ALIASENCHANTMENTS.put("unlimited", Enchantment.ARROW_INFINITE);
ALIASENCHANTMENTS.put("unlimitedarrows", Enchantment.ARROW_INFINITE); ALIASENCHANTMENTS.put("unlimitedarrows", Enchantment.ARROW_INFINITE);
ALIASENCHANTMENTS.put("ai", Enchantment.ARROW_INFINITE); ALIASENCHANTMENTS.put("ai", Enchantment.ARROW_INFINITE);
try // 1.7 update
{
ENCHANTMENTS.put("luck", Enchantment.LUCK);
ALIASENCHANTMENTS.put("luckofsea", Enchantment.LUCK);
ALIASENCHANTMENTS.put("luckofseas", Enchantment.LUCK);
ALIASENCHANTMENTS.put("rodluck", Enchantment.LUCK);
ENCHANTMENTS.put("lure", Enchantment.LURE);
ALIASENCHANTMENTS.put("rodlure", Enchantment.LURE);
}
catch (java.lang.NoSuchFieldError e)
{
Essentials.wrongVersion();
}
} }
public static Enchantment getByName(String name) { public static Enchantment getByName(String name)
{
Enchantment enchantment; Enchantment enchantment;
if (NumberUtil.isInt(name)) { if (NumberUtil.isInt(name))
{
enchantment = Enchantment.getById(Integer.parseInt(name)); enchantment = Enchantment.getById(Integer.parseInt(name));
} else { }
else
{
enchantment = Enchantment.getByName(name.toUpperCase(Locale.ENGLISH)); enchantment = Enchantment.getByName(name.toUpperCase(Locale.ENGLISH));
} }
if (enchantment == null) if (enchantment == null)

BIN
lib/bukkit.jar
View File

Binary file not shown.

BIN
lib/craftbukkit.jar
View File

Binary file not shown.