Merged in M4SS/holocore/entservice_fix (pull request #274)

Fixed an issue where a failed login would cause an exception in EntertainmentService
This commit is contained in:
Obique PSWG
2016-08-24 09:57:13 -05:00
@@ -132,7 +132,7 @@ public class EntertainmentService extends Service {
// Don't keep giving them XP if they log out
CreatureObject creature = i.getPlayer().getCreatureObject();
if(creature.getPosture().equals(Posture.SKILL_ANIMATING)) {
if(creature != null && creature.getPosture().equals(Posture.SKILL_ANIMATING)) {
cancelExperienceTask(creature);
}