From 20da6c69e0b59c220c487eca4927d0e67e35893f Mon Sep 17 00:00:00 2001 From: Waverunner Date: Tue, 15 Jul 2014 14:28:28 -0400 Subject: [PATCH] Fixed null errors associated when you stop watching an entertainer or go out of range --- src/services/EntertainmentService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/services/EntertainmentService.java b/src/services/EntertainmentService.java index 7a9187f4..e41dceb6 100644 --- a/src/services/EntertainmentService.java +++ b/src/services/EntertainmentService.java @@ -702,7 +702,10 @@ public class EntertainmentService implements INetworkDispatch { //spectator.setMoodAnimation("neutral"); performer.removeSpectator(spectator); - if (spectator.getInspirationTick().cancel(true)) + if (spectator.getInspirationTick() != null) + spectator.getInspirationTick().cancel(true); + + if (spectator.getSpectatorTask() != null) spectator.getSpectatorTask().cancel(true); }