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

Owner is now set for player's, changed some system messages in moveObject method

Browse Source
This commit is contained in:
Waverunner
2014-12-18 10:30:05 -05:00
parent c125d339b0
commit 76d7cade66
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+5 -12
View File
@@ -141,7 +141,7 @@ public class ObjectManager extends Manager {
addObjectAttributes(obj, template);
obj.setTemplate(template);
obj.setLocation(l);
moveObject(obj, null, l);
moveObject(obj, null, l); // TODO: Fix so objects in slots/containers aren't in the quadtree
objects.put(objectId, obj);
return obj;
}
@@ -158,15 +158,11 @@ public class ObjectManager extends Manager {
y = oldLocation.getZ();
if (quadTree.get(oldLocation.getTerrain()).get(x, y) != null) {
if (quadTree.get(oldLocation.getTerrain()).get(x, y) == obj) {
if (!quadTree.get(oldLocation.getTerrain()).remove(x, y, obj))
System.err.println("Failed to remove previous object from QuadTree!");
} else {
System.err.println("Expected " + quadTree.get(oldLocation.getTerrain()).get(x, y) + " instead of " + obj);
}
if (!quadTree.get(oldLocation.getTerrain()).remove(x, y, obj))
System.err.println("Failed to remove previous object from QuadTree!");
} else {
System.err.println("Tried to get a null obj in the quadtree!");
System.err.println("Tried to get a null quad in the quadtree!");
}
}
if (newLocation != null && newLocation.getTerrain() != null) { // Add to QuadTree, update awareness
@@ -181,11 +177,8 @@ public class ObjectManager extends Manager {
}
}
quadTree.get(newLocation.getTerrain()).put(x, y, obj);
if (quadTree.get(newLocation.getTerrain()).get(x, y) == null) {
System.err.println("NULL OBJ PUT INTO TREE!");
}
}
System.out.println("Now Aware Of: " + Arrays.toString(updatedAware.toArray(new Player[updatedAware.size()])));
System.out.println("Now Aware Of: " + updatedAware.size() + " player(s)");
obj.updateAwareness(updatedAware);
obj.sendDataTransforms();
}