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

Awareness updates where all tests pass and it functions in-game

Browse Source
This commit is contained in:
Obique PSWG
2016-10-27 13:16:51 -05:00
parent 219f871da7
commit 6d8973ef45
10 changed files with 230 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectAwareness.java
+34 -8
View File
@@ -35,12 +35,15 @@ import intents.object.MoveObjectIntent;
import intents.object.ObjectCreatedIntent;
import intents.object.ObjectTeleportIntent;
import intents.player.PlayerTransformedIntent;
import main.ProjectSWG;
import network.packets.Packet;
import network.packets.swg.zone.CmdSceneReady;
import network.packets.swg.zone.insertion.CmdStartScene;
import network.packets.swg.zone.object_controller.DataTransform;
import network.packets.swg.zone.object_controller.DataTransformWithParent;
import resources.Location;
import resources.Race;
import resources.Terrain;
import resources.control.Intent;
import resources.control.Service;
import resources.objects.SWGObject;
@@ -139,12 +142,20 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
case PE_DESTROYED:
creature.setOwner(null);
break;
case PE_ZONE_IN_CLIENT:
startScene(creature);
break;
case PE_ZONE_IN_SERVER:
creature.resetAwareness();
if (creature.getParent() == null)
moveObject(creature, creature.getLocation());
else
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:
@@ -168,11 +179,8 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
SWGObject object = oti.getObject();
Player owner = object.getOwner();
object.setLocation(oti.getNewLocation());
if (oti.getParent() != null) {
moveObject(object, oti.getParent(), null);
} else {
moveObject(object, null);
}
if (oti.getParent() != object.getParent())
object.moveToContainer(oti.getParent());
if (object instanceof CreatureObject && ((CreatureObject) object).isLoggedInPlayer())
new RequestZoneInIntent(owner, (CreatureObject) object, false).broadcast();
}
@@ -200,12 +208,30 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
}
private void processMoveObjectIntent(MoveObjectIntent i) {
if (i.getParent() != null)
if (i.getParent() == null)
moveObjectWithTransform(i.getObject(), i.getNewLocation(), i.getSpeed(), i.getUpdateCounter());
else
moveObjectWithTransform(i.getObject(), i.getParent(), i.getNewLocation(), i.getSpeed(), i.getUpdateCounter());
}
private void startScene(SWGObject obj) {
Location loc = obj.getWorldLocation();
long time = ProjectSWG.getGalacticTime();
Race race = ((CreatureObject) obj).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);
}
private void recursiveCreateObject(SWGObject obj, Player owner) {
SWGObject parent = obj.getParent();
if (parent != null)
recursiveCreateObject(parent, owner);
else
obj.createObject(owner, true);
}
private void moveObject(SWGObject obj, Location requestedLocation) {
if (requestedLocation == null)
awarenessHandler.disappearObject(obj, true, true);