summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunfighterJ <joseph.jenniges@gmail.com>2013-07-08 19:22:38 -0500
committerGunfighterJ <joseph.jenniges@gmail.com>2013-07-08 19:22:38 -0500
commit1447ee781ba5a37cdf55a3238e80f6b7f63d2e36 (patch)
treec37732c66cedab4537c2a2dbc1ba3dfe7ef92ffc
parent96d8ea856a2433ceba168adfb93c5742b9b4b6ff (diff)
downloadEssentials-1447ee781ba5a37cdf55a3238e80f6b7f63d2e36.tar
Essentials-1447ee781ba5a37cdf55a3238e80f6b7f63d2e36.tar.gz
Essentials-1447ee781ba5a37cdf55a3238e80f6b7f63d2e36.tar.lz
Essentials-1447ee781ba5a37cdf55a3238e80f6b7f63d2e36.tar.xz
Essentials-1447ee781ba5a37cdf55a3238e80f6b7f63d2e36.zip
Update to 1.6.2, adds new potion effect types
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/Potions.java8
-rw-r--r--lib/bukkit.jarbin4890921 -> 4891025 bytes
3 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
index 943b6335a..f190fc352 100644
--- a/lib/bukkit.jar
+++ b/lib/bukkit.jar
Binary files differ