From 6e2e6beab3d4bd0f254d39ccf1f31a1eb3572e0e Mon Sep 17 00:00:00 2001 From: Matt Parnell Date: Sun, 5 Oct 2014 02:15:42 -0500 Subject: [PATCH] more error handling for null creatures --- src/services/object/ObjectService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index 89fcc439..0aba9904 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -1149,7 +1149,8 @@ public class ObjectService implements INetworkDispatch { return; } CreatureObject creature = null; - if(getObject(objectId) == null) { + + if(objectId != 0 && objectId != 0L && getObject(objectId) == null) { creature = getCreatureFromDB(objectId); if(creature == null) { System.err.println("Cant get creature from db"); @@ -1166,7 +1167,7 @@ public class ObjectService implements INetworkDispatch { } else { if (!(getObject(objectId) instanceof CreatureObject)) { - System.out.println("Character is not an instance of CreatureObject!"); + System.out.println("Character is not an instance of CreatureObject or is null!"); return; }