projectswg-bitbucket/holocore
1
0
Fork 0
mirror of https://bitbucket.org/projectswg/holocore.git synced 2026-10-13 05:12:55 -04:00
Code Issues Projects Releases Wiki Activity

Fixed CORE-153 - can now zone in to instances

Browse Source
This commit is contained in:
Obique PSWG
2015-10-10 14:09:48 -05:00
parent 2e9c984647
commit 578502d213
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+6
View File
@@ -56,6 +56,7 @@ import network.packets.swg.zone.object_controller.DataTransform;
import network.packets.swg.zone.object_controller.DataTransformWithParent;
import network.packets.swg.zone.object_controller.ObjectController;
import resources.Location;
import resources.buildout.BuildoutArea;
import resources.containers.ContainerPermissions;
import resources.control.Intent;
import resources.control.Manager;
@@ -412,9 +413,14 @@ public class ObjectManager extends Manager {
return;
Location newLocation = transform.getLocation();
newLocation.setTerrain(obj.getTerrain());
BuildoutArea area = obj.getBuildoutArea();
if (area != null && area.isAdjustCoordinates())
newLocation.translatePosition(area.getX1(), 0, area.getZ1());
if (obj instanceof CreatureObject)
new PlayerTransformedIntent((CreatureObject) obj, obj.getParent(), null, obj.getLocation(), newLocation).broadcast();
objectAwareness.move(obj, newLocation);
if (area != null && area.isAdjustCoordinates())
newLocation.translatePosition(-area.getX1(), 0, -area.getZ1());
obj.sendDataTransforms(transform);
// TODO: State checks before sending a data transform message to ensure the move is valid/change speed depending