diff --git a/war/pom.xml b/war/pom.xml index 2a009e3..a51b1d0 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -48,8 +48,8 @@ maven-compiler-plugin 2.0.2 - 1.5 - 1.5 + 1.6 + 1.6 @@ -81,7 +81,7 @@ org.bukkit bukkit - 1.4.7-R1.0 + 1.6.1-R0.1-SNAPSHOT org.kitteh diff --git a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java index ad0776e..183c850 100644 --- a/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java +++ b/war/src/main/java/com/tommytony/war/event/WarPlayerListener.java @@ -540,8 +540,8 @@ public class WarPlayerListener implements Listener { // Monuments if (playerTeam != null && playerWarzone.nearAnyOwnedMonument(playerLoc, playerTeam) && player.getHealth() < 20 && player.getHealth() > 0 // don't heal the dead && this.random.nextInt(7) == 3) { // one chance out of many of getting healed - int currentHp = player.getHealth(); - int newHp = Math.min(20, currentHp + locZone.getWarzoneConfig().getInt(WarzoneConfig.MONUMENTHEAL)); + double currentHp = player.getHealth(); + double newHp = Math.min(20, currentHp + locZone.getWarzoneConfig().getInt(WarzoneConfig.MONUMENTHEAL)); player.setHealth(newHp); String isS = "s"; diff --git a/war/src/main/java/com/tommytony/war/utility/PlayerState.java b/war/src/main/java/com/tommytony/war/utility/PlayerState.java index dcdc2f3..e500dc5 100644 --- a/war/src/main/java/com/tommytony/war/utility/PlayerState.java +++ b/war/src/main/java/com/tommytony/war/utility/PlayerState.java @@ -16,14 +16,14 @@ public class PlayerState { private final float exhaustion; private final float saturation; private final int foodLevel; - private final int health; + private final double health; private final GameMode gamemode; private final Collection potionEffects; private final String playerTitle; private final float exp; private final int level; - public PlayerState(GameMode gamemode, ItemStack[] contents, ItemStack helmet, ItemStack chest, ItemStack legs, ItemStack feet, int health, float exhaustion, float saturation, int foodLevel, Collection potionEffects, String playerTitle, int level, float exp) { + public PlayerState(GameMode gamemode, ItemStack[] contents, ItemStack helmet, ItemStack chest, ItemStack legs, ItemStack feet, double health, float exhaustion, float saturation, int foodLevel, Collection potionEffects, String playerTitle, int level, float exp) { this.gamemode = gamemode; this.health = health; this.exhaustion = exhaustion; @@ -92,7 +92,7 @@ public class PlayerState { return foodLevel; } - public int getHealth() { + public double getHealth() { return health; }