Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-27 13:07:16 +01:00
Code Issues Projects Releases Wiki Activity

Fix player health conflicts.

Browse Source
This commit is contained in:
Andreas Troelsen 2013-05-03 22:30:59 +02:00
parent 914c26a02a
commit 5104c975fd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/garbagemule/MobArena/ArenaImpl.java
View File

@ -434,7 +434,7 @@ public class ArenaImpl implements Arena
p.setAllowFlight(false); p.setAllowFlight(false);
p.setFlying(false); p.setFlying(false);
//movePlayerToLocation(p, region.getArenaWarp()); //movePlayerToLocation(p, region.getArenaWarp());
setHealth(p, 20); setHealth(p, p.getMaxHealth());
p.setFoodLevel(20); p.setFoodLevel(20);
assignClassPermissions(p); assignClassPermissions(p);
arenaPlayerMap.get(p).resetStats(); arenaPlayerMap.get(p).resetStats();
@ -554,7 +554,7 @@ public class ArenaImpl implements Arena
storePlayerData(p, loc); storePlayerData(p, loc);
removePotionEffects(p); removePotionEffects(p);
MAUtils.sitPets(p); MAUtils.sitPets(p);
setHealth(p, 20); setHealth(p, p.getMaxHealth());
p.setFoodLevel(20); p.setFoodLevel(20);
p.setGameMode(GameMode.SURVIVAL); p.setGameMode(GameMode.SURVIVAL);
movePlayerToLobby(p); movePlayerToLobby(p);
@ -640,7 +640,7 @@ public class ArenaImpl implements Arena
return; return;
} }
p.setHealth(20); setHealth(p, p.getMaxHealth());
Delays.revivePlayer(plugin, this, p); Delays.revivePlayer(plugin, this, p);
endArena(); endArena();
} }