diff options
| author | GunfighterJ <joseph.jenniges@gmail.com> | 2013-07-08 19:22:38 -0500 |
|---|---|---|
| committer | GunfighterJ <joseph.jenniges@gmail.com> | 2013-07-08 19:22:38 -0500 |
| commit | 4e9a42671f68159090d4ed934a6d3541643f3271 (patch) | |
| tree | 48c40dc2958692c23670f49f341f6f062fe95c12 | |
| parent | a369f9aabb0390620a7afddc134f54945d239274 (diff) | |
| download | Essentials-4e9a42671f68159090d4ed934a6d3541643f3271.tar Essentials-4e9a42671f68159090d4ed934a6d3541643f3271.tar.gz Essentials-4e9a42671f68159090d4ed934a6d3541643f3271.tar.lz Essentials-4e9a42671f68159090d4ed934a6d3541643f3271.tar.xz Essentials-4e9a42671f68159090d4ed934a6d3541643f3271.zip | |
Update to 1.6.2, adds new potion effect types
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Essentials.java | 4 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Potions.java | 8 | ||||
| -rw-r--r-- | lib/bukkit.jar | bin | 4890921 -> 4891025 bytes | |||
| -rw-r--r-- | lib/craftbukkit.jar | bin | 15233037 -> 15234115 bytes |
4 files changed, 10 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index cf0a7a5b0..c5ec3556a 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -76,7 +76,7 @@ import org.yaml.snakeyaml.error.YAMLException; public class Essentials extends JavaPlugin implements IEssentials { - public static final int BUKKIT_VERSION = 2794; + public static final int BUKKIT_VERSION = 2808; private static final Logger LOGGER = Logger.getLogger("Minecraft"); private transient ISettings settings; private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this); @@ -370,7 +370,7 @@ public class Essentials extends JavaPlugin implements IEssentials BlockCommandSender bsender = (BlockCommandSender)sender; bSenderBlock = bsender.getBlock(); } - + if (bSenderBlock != null) { Bukkit.getLogger().log(Level.INFO, "CommandBlock at {0},{1},{2} issued server command: /{3} {4}", new Object[] diff --git a/Essentials/src/com/earth2me/essentials/Potions.java b/Essentials/src/com/earth2me/essentials/Potions.java index db6f47c93..31fdb3fae 100644 --- a/Essentials/src/com/earth2me/essentials/Potions.java +++ b/Essentials/src/com/earth2me/essentials/Potions.java @@ -100,6 +100,14 @@ public class Potions POTIONS.put("wither", PotionEffectType.WITHER); ALIASPOTIONS.put("decay", PotionEffectType.WITHER); + + POTIONS.put("healthboost", PotionEffectType.HEALTH_BOOST); + ALIASPOTIONS.put("boost", PotionEffectType.HEALTH_BOOST); + + POTIONS.put("absorption", PotionEffectType.ABSORPTION); + ALIASPOTIONS.put("absorb", PotionEffectType.ABSORPTION); + + POTIONS.put("saturation", PotionEffectType.SATURATION); } public static PotionEffectType getByName(String name) diff --git a/lib/bukkit.jar b/lib/bukkit.jar Binary files differindex 943b6335a..f190fc352 100644 --- a/lib/bukkit.jar +++ b/lib/bukkit.jar diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar Binary files differindex 193475bbc..41652b367 100644 --- a/lib/craftbukkit.jar +++ b/lib/craftbukkit.jar |