diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-12-07 22:24:01 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-12-07 22:26:41 +0000 |
| commit | af02a28ce5fb1bded8b3bd1785bb3c4ede1fde39 (patch) | |
| tree | 99d0e569f68e2c054aa9615b911eef60befcf66c | |
| parent | 5e9f5904fde62440ae9adbe6bfea79e6ad66c6b6 (diff) | |
| download | Essentials-af02a28ce5fb1bded8b3bd1785bb3c4ede1fde39.tar Essentials-af02a28ce5fb1bded8b3bd1785bb3c4ede1fde39.tar.gz Essentials-af02a28ce5fb1bded8b3bd1785bb3c4ede1fde39.tar.lz Essentials-af02a28ce5fb1bded8b3bd1785bb3c4ede1fde39.tar.xz Essentials-af02a28ce5fb1bded8b3bd1785bb3c4ede1fde39.zip | |
Update Bukkit
Bukkit: #1859 CB: #2943
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Enchantments.java | 25 | ||||
| -rw-r--r-- | lib/bukkit.jar | bin | 4918292 -> 4919000 bytes | |||
| -rw-r--r-- | lib/craftbukkit.jar | bin | 19919445 -> 19920009 bytes |
3 files changed, 22 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Enchantments.java b/Essentials/src/com/earth2me/essentials/Enchantments.java index 785f13adb..12e846611 100644 --- a/Essentials/src/com/earth2me/essentials/Enchantments.java +++ b/Essentials/src/com/earth2me/essentials/Enchantments.java @@ -141,13 +141,32 @@ public class Enchantments ALIASENCHANTMENTS.put("unlimited", Enchantment.ARROW_INFINITE); ALIASENCHANTMENTS.put("unlimitedarrows", 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; - if (NumberUtil.isInt(name)) { + if (NumberUtil.isInt(name)) + { enchantment = Enchantment.getById(Integer.parseInt(name)); - } else { + } + else + { enchantment = Enchantment.getByName(name.toUpperCase(Locale.ENGLISH)); } if (enchantment == null) diff --git a/lib/bukkit.jar b/lib/bukkit.jar Binary files differindex 5926c83bd..f7d2f9656 100644 --- a/lib/bukkit.jar +++ b/lib/bukkit.jar diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar Binary files differindex 4a8d1abcb..610e9a2b3 100644 --- a/lib/craftbukkit.jar +++ b/lib/craftbukkit.jar |