From ca9b827cd2896652e83bede340a1c47db0a770fb Mon Sep 17 00:00:00 2001 From: Obique PSWG Date: Tue, 29 Nov 2016 18:04:50 -0600 Subject: [PATCH] Fixed NPC despawn issue --- src/resources/Terrain.java | 1 + src/services/objects/ObjectAwareness.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/resources/Terrain.java b/src/resources/Terrain.java index 82637d7d0..dde731d4f 100644 --- a/src/resources/Terrain.java +++ b/src/resources/Terrain.java @@ -50,6 +50,7 @@ public enum Terrain { ENDOR ("terrain/endor.trn"), FLORATEST ("terrain/floratest.trn"), GODCLIENT_TEST ("terrain/godclient_test.trn"), + GONE ("terrain/gone.trn"), KASHYYYK_DEAD_FOREST ("terrain/kashyyyk_dead_forest.trn"), KASHYYYK_HUNTING ("terrain/kashyyyk_hunting.trn"), KASHYYYK_MAIN ("terrain/kashyyyk_main.trn"), diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java index b199174e2..82b78062f 100644 --- a/src/services/objects/ObjectAwareness.java +++ b/src/services/objects/ObjectAwareness.java @@ -66,6 +66,8 @@ import resources.server_info.Log; public class ObjectAwareness extends Service implements TerrainMapCallback { + private static final Location GONE_LOCATION = new Location(0, 0, 0, Terrain.GONE); + private final AwarenessHandler awarenessHandler; private final DataTransformHandler dataTransformHandler; @@ -183,6 +185,7 @@ public class ObjectAwareness extends Service implements TerrainMapCallback { private void handleDestroyObjectIntent(DestroyObjectIntent doi) { SWGObject obj = doi.getObject(); disappearObject(obj, true, true); + obj.setLocation(GONE_LOCATION); obj.moveToContainer(null); }