From 77f8998fc7adabc5f8e94bd9b8737b50302880e2 Mon Sep 17 00:00:00 2001 From: Mads Boddum Date: Wed, 24 Aug 2016 16:48:15 +0200 Subject: [PATCH 1/2] Fixed an issue where a failed login would cause an exception in EntertainmentService --- src/services/commands/EntertainmentService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/services/commands/EntertainmentService.java b/src/services/commands/EntertainmentService.java index 30b916a34..a961dac8f 100644 --- a/src/services/commands/EntertainmentService.java +++ b/src/services/commands/EntertainmentService.java @@ -132,6 +132,9 @@ public class EntertainmentService extends Service { // Don't keep giving them XP if they log out CreatureObject creature = i.getPlayer().getCreatureObject(); + if(creature == null) + return; + if(creature.getPosture().equals(Posture.SKILL_ANIMATING)) { cancelExperienceTask(creature); } From 52e37615bae825ab9875b020cb1a76e111a09f47 Mon Sep 17 00:00:00 2001 From: Mads Boddum Date: Wed, 24 Aug 2016 16:52:02 +0200 Subject: [PATCH 2/2] CreatureObject null check in EntertainmentService consumes less space --- src/services/commands/EntertainmentService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/services/commands/EntertainmentService.java b/src/services/commands/EntertainmentService.java index a961dac8f..fdf114a6b 100644 --- a/src/services/commands/EntertainmentService.java +++ b/src/services/commands/EntertainmentService.java @@ -132,10 +132,7 @@ public class EntertainmentService extends Service { // Don't keep giving them XP if they log out CreatureObject creature = i.getPlayer().getCreatureObject(); - if(creature == null) - return; - - if(creature.getPosture().equals(Posture.SKILL_ANIMATING)) { + if(creature != null && creature.getPosture().equals(Posture.SKILL_ANIMATING)) { cancelExperienceTask(creature); }