From 721ed17050ce796dd7640fc5f29a31477cfe1c9e Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Fri, 16 May 2014 11:56:34 +0100
Subject: [PATCH] Added cellId null check for static obj scripts

---
 src/services/StaticService.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/services/StaticService.java b/src/services/StaticService.java
index fb52a566..8d6d6891 100644
--- a/src/services/StaticService.java
+++ b/src/services/StaticService.java
@@ -113,6 +113,11 @@ public class StaticService implements INetworkDispatch {
 		
 		SWGObject cell = core.objectService.getObject(cellId);
 		
+		if (cellId != 0 && cell == null) {
+			System.err.println("CellId invalid for template " + template);
+			return;
+		}
+		
 		if (cell != null && cell.getContainer() != null && cell.getContainer() instanceof BuildingObject) {
 			buildingId = cell.getContainer().getObjectId();
 			cellNumber = ((BuildingObject) cell.getContainer()).getCellNumberByObjectId(cellId);