projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-07-30 00:15:50 -04:00
Code Issues Projects Releases Wiki Activity

Fixed some object IDs being overwritten by snapshots/buildouts

Browse Source
This commit is contained in:
Obique PSWG
2015-06-20 17:28:11 -05:00
parent 86dcc5e492
commit c870fc34a5
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+4 -6
View File
@@ -135,9 +135,6 @@ public class ObjectManager extends Manager {
for (SWGObject obj : buildouts) {
loadBuildout(obj);
}
for (SWGObject obj : loader.getObjectTable().values()) {
objectMap.put(obj.getObjectId(), obj);
}
double loadTime = (System.nanoTime() - startLoad) / 1E6;
System.out.printf("ObjectManager: Finished loading %d buildouts. Time: %fms%n", buildouts.size(), loadTime);
Log.i("ObjectManager", "Finished loading buildouts. Time: %fms", loadTime);
@@ -168,9 +165,6 @@ public class ObjectManager extends Manager {
for (SWGObject obj : snapshots) {
loadSnapshot(obj);
}
for (SWGObject obj : loader.getObjectTable().values()) {
objectMap.put(obj.getObjectId(), obj);
}
double loadTime = (System.nanoTime() - startLoad) / 1E6;
System.out.printf("ObjectManager: Finished loading %d snapshots. Time: %fms%n", snapshots.size(), loadTime);
Log.i("ObjectManager", "Finished loading snapshots. Time: %fms", loadTime);
@@ -184,6 +178,8 @@ public class ObjectManager extends Manager {
if (obj instanceof TangibleObject || obj instanceof CellObject) {
objectAwareness.add(obj);
}
objectMap.put(obj.getObjectId(), obj);
addChildrenObjects(obj);
mapService.addMapLocation(obj, MapService.MapType.STATIC);
}
@@ -191,6 +187,8 @@ public class ObjectManager extends Manager {
if (obj instanceof TangibleObject || obj instanceof CellObject) {
objectAwareness.add(obj);
}
objectMap.put(obj.getObjectId(), obj);
addChildrenObjects(obj);
mapService.addMapLocation(obj, MapService.MapType.STATIC);
}