projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-08-04 05:16:49 -04:00
Code Issues Projects Releases Wiki Activity

Sped up ObjectCreatedIntent processing

Browse Source
This commit is contained in:
Obique PSWG
2017-06-14 23:37:46 -05:00
parent 9d27c7e226
commit eeb97a4ea3
9 changed files with 108 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/awareness/AwarenessHandler.java
+27 -1
View File
@@ -73,7 +73,7 @@ public class AwarenessHandler implements AutoCloseable {
public void moveObject(SWGObject obj, Location requestedLocation) {
// Remove from previous awareness
if (obj.getTerrain() != requestedLocation.getTerrain()) {
if (obj.getTerrain() != requestedLocation.getTerrain() && obj.getTerrain() != null) {
TerrainMap oldTerrainMap = getTerrainMap(obj.getTerrain());
if (oldTerrainMap != null)
oldTerrainMap.removeWithoutUpdate(obj);
@@ -109,6 +109,32 @@ public class AwarenessHandler implements AutoCloseable {
obj.resetAwareness();
}
public void transferContainers(SWGObject obj, SWGObject newContainer) {
// Remove from previous awareness
TerrainMap oldMap = getTerrainMap(obj.getTerrain());
if (oldMap != null)
oldMap.removeWithoutUpdate(obj);
// Update location
if (obj.getParent() != newContainer) {
obj.moveToContainer(newContainer);
obj.onObjectMoved();
// Update awareness
if (newContainer == null) {
Location loc = obj.getLocation();
if (obj.getTerrain() != Terrain.GONE) {
TerrainMap map = getTerrainMap(loc.getTerrain());
if (map != null) {
map.moveWithinMap(obj);
} else {
Log.e("Unknown terrain: %s", loc.getTerrain());
}
}
} else {
obj.resetAwareness();
}
}
}
public void disappearObject(SWGObject obj, boolean disappearObjects, boolean disappearCustom) {
if (obj.getTerrain() != Terrain.GONE) {
TerrainMap map = getTerrainMap(obj);