From 219f871da772f18a1c54fa47e2318ddde692077e Mon Sep 17 00:00:00 2001 From: Obique PSWG Date: Mon, 3 Oct 2016 17:21:33 -0500 Subject: [PATCH] Created logic for disappearing with null location --- src/services/objects/ObjectAwareness.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java index adb09bea6..49dc78210 100644 --- a/src/services/objects/ObjectAwareness.java +++ b/src/services/objects/ObjectAwareness.java @@ -207,11 +207,17 @@ public class ObjectAwareness extends Service implements TerrainMapCallback { } private void moveObject(SWGObject obj, Location requestedLocation) { - awarenessHandler.moveObject(obj, requestedLocation); + if (requestedLocation == null) + awarenessHandler.disappearObject(obj, true, true); + else + awarenessHandler.moveObject(obj, requestedLocation); } private void moveObject(SWGObject obj, SWGObject parent, Location requestedLocation) { - awarenessHandler.moveObject(obj, parent, requestedLocation); + if (requestedLocation == null) + awarenessHandler.disappearObject(obj, true, true); + else + awarenessHandler.moveObject(obj, parent, requestedLocation); } private void moveObjectWithTransform(SWGObject obj, Location requestedLocation, double speed, int update) {