From 0748d34dbe8d930b43010b17be38a2e013277bbf Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 18 Jun 2014 03:05:13 +0100
Subject: [PATCH] Fixed error when NPCs heal

---
 src/services/combat/CombatService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java
index 1910ab6a..040dca41 100644
--- a/src/services/combat/CombatService.java
+++ b/src/services/combat/CombatService.java
@@ -942,7 +942,7 @@ public class CombatService implements INetworkDispatch {
 		if(success && !applySpecialCost(healer, weapon, command))
 			success = false;
 
-		if(!success) {
+		if(!success && healer.getClient() != null) {
 			IoSession session = healer.getClient().getSession();
 			CommandEnqueueRemove commandRemove = new CommandEnqueueRemove(healer.getObjectId(), actionCounter);
 			session.write(new ObjControllerMessage(0x0B, commandRemove).serialize());