From 6eaa6fcd145f92683933051130a92590db92691c Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 20 Aug 2014 04:57:21 +0100
Subject: [PATCH] See extended for update notes...

- Fixed issue where player couldn't stop watching an ent.

Dev info:

ConnectionService:disconnect(): Error disconnecting client.
java.lang.NullPointerException
at resources.objects.creature.CreatureObject.setPerformanceWatchee(CreatureObject.java:1076)
---
 src/resources/objects/creature/CreatureObject.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index 6769379d..cd9169c7 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -1073,7 +1073,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 			this.performanceWatchee = performanceWatchee;
 		}
 		
-		setListenToId(performanceWatchee.getObjectID());
+		setListenToId((performanceWatchee == null) ? 0L : performanceWatchee.getObjectID());
 	}
 	
 	public CreatureObject getPerformanceListenee() {