From 2422fd15e94d4156426669d19d8608e2841496eb Mon Sep 17 00:00:00 2001 From: Obique PSWG Date: Thu, 5 Jan 2017 02:30:55 -0600 Subject: [PATCH] Added kinder error message for unknown parent in datatransformwithparent --- src/services/objects/ObjectAwareness.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java index 148d5f529..4d5724f23 100644 --- a/src/services/objects/ObjectAwareness.java +++ b/src/services/objects/ObjectAwareness.java @@ -229,6 +229,10 @@ public class ObjectAwareness extends Service implements TerrainMapCallback { SWGObject obj = i.getObjectManager().getObjectById(trans.getObjectId()); SWGObject parent = i.getObjectManager().getObjectById(trans.getCellId()); Assert.test(obj instanceof CreatureObject); + if (parent == null) { + Log.w(this, "Unknown data transform parent! Obj: %d/%s Parent: %d", trans.getObjectId(), obj, trans.getCellId()); + return; + } Location requestedLocation = new Location(trans.getLocation()); requestedLocation.setTerrain(obj.getTerrain()); moveObjectWithTransform(obj, parent, requestedLocation, trans.getSpeed(), trans.getUpdateCounter());