From cda18ac3b7feaa38864e35e687fb1867a125b5e0 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Mon, 16 Jun 2014 21:28:19 +0100
Subject: [PATCH] Fixed another potential equipment crash error

---
 .../objects/creature/CreatureMessageBuilder.java          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/resources/objects/creature/CreatureMessageBuilder.java b/src/resources/objects/creature/CreatureMessageBuilder.java
index 5842c41a..8a4a1edb 100644
--- a/src/resources/objects/creature/CreatureMessageBuilder.java
+++ b/src/resources/objects/creature/CreatureMessageBuilder.java
@@ -407,7 +407,13 @@ public class CreatureMessageBuilder extends TangibleMessageBuilder {
 			buffer.putInt(0);
 			buffer.putInt(creature.getAppearanceEquipmentListUpdateCounter());
 		} else {
-			buffer.putInt(creature.getAppearanceEquipmentList().size());
+			int size = 0;
+			
+			for (Long objId : creature.getEquipmentList().get()) {
+				size += ((NGECore.getInstance().objectService.getObject(objId) == null) ? 0 : 1);
+			}
+			
+			buffer.putInt(size);
 			buffer.putInt(creature.getAppearanceEquipmentListUpdateCounter());
 			
 			for(Long objId : creature.getAppearanceEquipmentList().get()) {