projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-14 04:13:14 -04:00
Code Issues Projects Releases Wiki Activity

Merge conflict resolve

Browse Source
This commit is contained in:
CharonInferar
2014-08-09 18:17:01 +02:00
parent 79d56ca4ef a8a824b8a7
commit 0f8466bf44
1452 changed files with 14987 additions and 14349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+10
View File
@@ -1331,6 +1331,14 @@ public class SimulationService implements INetworkDispatch {
public void teleport(SWGObject obj, Point3D position, Quaternion orientation, long cellId) {
if (obj.getPosition().getDistance2D(position) > 150) {
if (cellId != 0)
transferToPlanet(obj, obj.getPlanet(), position, orientation, core.objectService.getObject(cellId));
else
transferToPlanet(obj, obj.getPlanet(), position, orientation, null);
return;
}
if(cellId == 0) {
if(position.x >= -8192 && position.x <= 8192 && position.z >= -8192 && position.z <= 8192) {
obj.setMovementCounter(obj.getMovementCounter() + 1);
@@ -1346,6 +1354,8 @@ public class SimulationService implements INetworkDispatch {
obj.setPosition(position);
obj.setOrientation(orientation);
// Shouldn't the parent be set?
}
}