projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-10 00:13:42 -04:00
Code Issues Projects Releases Wiki Activity

Added assertions for TestObjectAwareness and added slotted objects to awareness

Browse Source
This commit is contained in:
Obique PSWG
2017-06-19 21:04:06 -05:00
parent 016fe18c67
commit eae94373f2
4 changed files with 69 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectAwareness.java
+3 -3
View File
@@ -155,11 +155,9 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
private void handleDestroyObjectIntent(DestroyObjectIntent doi) {
SWGObject obj = doi.getObject();
disappearObject(obj, true, true);
obj.moveToContainer(null);
disappearObject(obj, true, true);
obj.setPosition(Terrain.GONE, 0, 0, 0);
obj.clearObjectsAware();
obj.clearCustomAware(true);
}
private void processObjectTeleportIntent(ObjectTeleportIntent oti) {
@@ -317,6 +315,8 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
private void disappearObject(SWGObject obj, boolean disappearObjects, boolean disappearCustom) {
awarenessHandler.disappearObject(obj, disappearObjects, disappearCustom);
obj.clearObjectsAware();
obj.clearCustomAware(true);
}
}