From 24caeab24fccfd16190a0baea9d3b3296cb94daf Mon Sep 17 00:00:00 2001 From: garbagemule Date: Mon, 7 Oct 2013 00:35:47 +0200 Subject: [PATCH] Health updates for 1.6 --- resources/plugin.yml | 2 +- src/com/garbagemule/MobArena/health/HealthStrategyHeroes.java | 3 +-- .../garbagemule/MobArena/health/HealthStrategyStandard.java | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/resources/plugin.yml b/resources/plugin.yml index b5c03b5..db2bef9 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,7 +1,7 @@ name: MobArena author: garbagemule main: com.garbagemule.MobArena.MobArena -version: 0.95.5.34 +version: 0.95.5.35 softdepend: [Multiverse-Core,Towny,Heroes,MagicSpells,Vault] commands: ma: diff --git a/src/com/garbagemule/MobArena/health/HealthStrategyHeroes.java b/src/com/garbagemule/MobArena/health/HealthStrategyHeroes.java index f8e0b42..22af62b 100644 --- a/src/com/garbagemule/MobArena/health/HealthStrategyHeroes.java +++ b/src/com/garbagemule/MobArena/health/HealthStrategyHeroes.java @@ -13,8 +13,7 @@ public class HealthStrategyHeroes implements HealthStrategy double regain = health == p.getMaxHealth() ? p.getMaxHealth() : health - current; try { - // TODO: Remove cast for 1.6 - EntityRegainHealthEvent event = new EntityRegainHealthEvent(p, (int) regain, RegainReason.CUSTOM); + EntityRegainHealthEvent event = new EntityRegainHealthEvent(p, regain, RegainReason.CUSTOM); Bukkit.getPluginManager().callEvent(event); } catch (Exception e) {} // Because Bukkit is retarded. diff --git a/src/com/garbagemule/MobArena/health/HealthStrategyStandard.java b/src/com/garbagemule/MobArena/health/HealthStrategyStandard.java index b3ed74a..4660892 100644 --- a/src/com/garbagemule/MobArena/health/HealthStrategyStandard.java +++ b/src/com/garbagemule/MobArena/health/HealthStrategyStandard.java @@ -6,7 +6,6 @@ public class HealthStrategyStandard implements HealthStrategy { @Override public void setHealth(Player p, double health) { - // TODO: Remove cast for 1.6 - p.setHealth((int) health); + p.setHealth(health); } }