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

Merge branch 'master' of https://bitbucket.org/projectswg/core3 into awareness

Browse Source 
Conflicts:
	src/services/objects/ObjectManager.java
	src/services/player/ZoneService.java
This commit is contained in:
Obique
2015-01-06 09:34:04 -06:00
committed by Obique
parent 05ab45b792 488a3d010d
commit b8594631db
1 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+2 -26
View File
@@ -145,37 +145,13 @@ public class ObjectManager extends Manager {
addObjectAttributes(obj, template);
obj.setTemplate(template);
obj.setLocation(l);
addToQuadtree(obj, l);
// moveObject(obj, null, l);
// addToQuadtree(obj, l);
moveObject(obj, null, l);
objects.put(objectId, obj);
return obj;
}
}
// Adds an object to the quadtree and refreshes awareness lists in the object added as well as adds the Player to objects in range (if there is one)
private void addToQuadtree(SWGObject obj, Location loc) {
if (loc == null || loc.isNaN()) // Object is inside a container or it's a slot of an item
return;
double x = loc.getX(), z = loc.getY();
List<Player> awarePlayers = new ArrayList<Player>();
QuadTree<SWGObject> tree = quadTree.get(loc.getTerrain());
for (SWGObject inRange : tree.getWithinRange(x, z, AWARE_RANGE)) {
if (inRange != null && inRange.getOwner() != null && inRange.getObjectId() != obj.getObjectId()) {
if (obj.getOwner() != null)
inRange.updateAwareness(obj.getOwner(), true);
awarePlayers.add(inRange.getOwner());
}
}
if (awarePlayers.size() > 0)
obj.updateAwareness(awarePlayers);
quadTree.get(loc.getTerrain()).put(x, z, obj);
}
private void moveObject(SWGObject obj, Location oldLocation, Location newLocation) {
if (oldLocation != null && oldLocation.getTerrain() != null) { // Remove from QuadTree
double x = oldLocation.getX();