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

Merge branch 'quality_assurance' into radials

Browse Source
This commit is contained in:
Obique PSWG
2015-08-08 17:02:36 -05:00
parent 0f8ea7820f d26b78c92a
commit 0f1722b8f9
19 changed files with 191 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+6 -4
View File
@@ -269,11 +269,13 @@ public class ObjectManager extends Manager {
for (SWGObject obj : p.getCreatureObject().getObservers())
p.getCreatureObject().destroyObject(obj.getOwner());
break;
case PE_FIRST_ZONE:
if (p.getCreatureObject().getParent() == null)
p.getCreatureObject().createObject(p);
break;
case PE_ZONE_IN:
p.getCreatureObject().clearAware();
objectAwareness.update(p.getCreatureObject());
if (p.getCreatureObject().getParent() == null)
p.getCreatureObject().createObject(p);
break;
default:
break;
@@ -415,7 +417,7 @@ public class ObjectManager extends Manager {
if (transform == null)
return;
Location newLocation = transform.getLocation();
newLocation.setTerrain(obj.getLocation().getTerrain());
newLocation.setTerrain(obj.getTerrain());
objectAwareness.move(obj, newLocation);
obj.sendDataTransforms(transform);
@@ -425,7 +427,7 @@ public class ObjectManager extends Manager {
private void moveObject(SWGObject obj, DataTransformWithParent transformWithParent) {
Location newLocation = transformWithParent.getLocation();
newLocation.setTerrain(obj.getLocation().getTerrain());
newLocation.setTerrain(obj.getTerrain());
SWGObject parent = objectMap.get(transformWithParent.getCellId());
if (parent == null) {
System.err.println("ObjectManager: Could not find parent for transform! Cell: " + transformWithParent.getCellId());