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

Fixed infrequent zone in crash where buildouts were loaded slowly

Browse Source
This commit is contained in:
Obique PSWG
2016-10-28 12:31:57 -05:00
parent 72ea75ce9d
commit 07eb924bd4
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectAwareness.java
+13 -16
View File
@@ -146,16 +146,6 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
startScene(creature);
break;
case PE_ZONE_IN_SERVER:
creature.resetAwareness();
if (creature.getParent() == null)
moveObject(creature, creature.getLocation());
else {
for (SWGObject obj : creature.getSuperParent().getObjectsAware()) {
obj.createObject(creature);
creature.createObject(obj);
}
moveObject(creature, creature.getParent(), creature.getLocation());
}
p.sendPacket(new CmdSceneReady());
break;
default:
@@ -214,14 +204,21 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
moveObjectWithTransform(i.getObject(), i.getParent(), i.getNewLocation(), i.getSpeed(), i.getUpdateCounter());
}
private void startScene(SWGObject obj) {
Location loc = obj.getWorldLocation();
private void startScene(CreatureObject creature) {
Location loc = creature.getWorldLocation();
long time = ProjectSWG.getGalacticTime();
Race race = ((CreatureObject) obj).getRace();
Race race = ((CreatureObject) creature).getRace();
boolean ignoreSnapshots = loc.getTerrain() == Terrain.DEV_AREA;
Player owner = obj.getOwner();
owner.sendPacket(new CmdStartScene(ignoreSnapshots, obj.getObjectId(), race, loc, time, (int)(System.currentTimeMillis()/1E3)));
recursiveCreateObject(obj, owner);
Player owner = creature.getOwner();
creature.resetAwareness();
owner.sendPacket(new CmdStartScene(ignoreSnapshots, creature.getObjectId(), race, loc, time, (int)(System.currentTimeMillis()/1E3)));
recursiveCreateObject(creature, owner);
if (creature.getParent() != null) {
for (SWGObject obj : creature.getSuperParent().getObjectsAware()) {
obj.createObject(creature);
creature.createObject(obj);
}
}
}
private void recursiveCreateObject(SWGObject obj, Player owner) {