From 246d51b4ac08629244641c09e62c57dd9aeafaa8 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 20 Aug 2014 02:02:33 +0100
Subject: [PATCH] See extended for update notes...

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

Dev info:

ConnectionService:disconnect(): Error disconnecting client.
java.lang.NullPointerException
at resources.objects.creature.CreatureObject.setPerformanceListenee(CreatureObject.java:1092)
---
 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 86c636f7..4ac9485f 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -1087,7 +1087,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
 			this.performanceListenee = performanceListenee;
 		}
 		
-		setListenToId(performanceListenee.getObjectID());
+		setListenToId((performanceListenee == null) ? 0L : performanceListenee.getObjectID());
 	}
 	
 	public int getFlourishCount() {