From 5104c975fd06c9cf39fac3fc444bed76a95a4ca8 Mon Sep 17 00:00:00 2001
From: Andreas Troelsen <garbagemule@gmail.com>
Date: Fri, 3 May 2013 22:30:59 +0200
Subject: [PATCH] Fix player health conflicts.

---
 src/com/garbagemule/MobArena/ArenaImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/garbagemule/MobArena/ArenaImpl.java b/src/com/garbagemule/MobArena/ArenaImpl.java
index d4f2237..98d8f7b 100644
--- a/src/com/garbagemule/MobArena/ArenaImpl.java
+++ b/src/com/garbagemule/MobArena/ArenaImpl.java
@@ -434,7 +434,7 @@ public class ArenaImpl implements Arena
             p.setAllowFlight(false);
             p.setFlying(false);
             //movePlayerToLocation(p, region.getArenaWarp());
-            setHealth(p, 20);
+            setHealth(p, p.getMaxHealth());
             p.setFoodLevel(20);
             assignClassPermissions(p);
             arenaPlayerMap.get(p).resetStats();
@@ -554,7 +554,7 @@ public class ArenaImpl implements Arena
         storePlayerData(p, loc);
         removePotionEffects(p);
         MAUtils.sitPets(p);
-        setHealth(p, 20);
+        setHealth(p, p.getMaxHealth());
         p.setFoodLevel(20);
         p.setGameMode(GameMode.SURVIVAL);
         movePlayerToLobby(p);
@@ -640,7 +640,7 @@ public class ArenaImpl implements Arena
             return;
         }
         
-        p.setHealth(20);
+        setHealth(p, p.getMaxHealth());
         Delays.revivePlayer(plugin, this, p);
         endArena();
     }