From a5933c2db6806f6d32503d80385a4cfc5ec5dd73 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Wed, 18 Jun 2014 08:56:54 +0100
Subject: [PATCH] Fixed null error when NPCs use combat cmd

---
 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 c4c74838..2a732b7a 100644
--- a/src/services/combat/CombatService.java
+++ b/src/services/combat/CombatService.java
@@ -1329,7 +1329,7 @@ public class CombatService implements INetworkDispatch {
 		if(!applySpecialCost(creature, weapon, command))
 			success = false;
 		
-		if(!success) {
+		if(!success && creature.getClient() != null) {
 			IoSession session = creature.getClient().getSession();
 			CommandEnqueueRemove commandRemove = new CommandEnqueueRemove(creature.getObjectId(), actionCounter);
 			session.write(new ObjControllerMessage(0x0B, commandRemove).serialize());