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

Redid observers and awareness and fixed NPCs inside buildings

Browse Source
This commit is contained in:
Obique PSWG
2016-05-15 17:14:55 -05:00
parent d7d3dbf699
commit 4577fd826c
7 changed files with 97 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectAwareness.java
+8 -6
View File
@@ -137,10 +137,8 @@ public class ObjectAwareness extends Service {
private void handleObjectCreatedIntent(ObjectCreatedIntent oci) {
SWGObject object = oci.getObject();
if (isInAwareness(object)) {
add(object);
update(object);
}
add(object);
update(object);
}
private void processObjectTeleportIntent(ObjectTeleportIntent oti) {
@@ -153,6 +151,7 @@ public class ObjectAwareness extends Service {
} else {
moveFromOld(object, old, false);
}
object.clearAware();
if (object instanceof CreatureObject && ((CreatureObject) object).isLoggedInPlayer())
new RequestZoneInIntent(owner, (CreatureObject) object, false).broadcast();
}
@@ -181,7 +180,6 @@ public class ObjectAwareness extends Service {
synchronized (tree) {
objects = tree.get(l.getX(), l.getZ());
}
Log.d(this, "Updated awareness for %s", obj);
if (objects.contains(obj)) {
if (!i.isInAwareness()) {
remove(obj);
@@ -307,6 +305,8 @@ public class ObjectAwareness extends Service {
* @param object the object to add
*/
public void add(SWGObject object) {
if (!isInAwareness(object))
return;
Location l = object.getLocation();
if (invalidLocation(l))
return;
@@ -375,7 +375,7 @@ public class ObjectAwareness extends Service {
* @param obj the object to update
*/
private void update(SWGObject obj) {
if (!obj.isGenerated())
if (!obj.isGenerated() || !isInAwareness(obj))
return;
Location l = obj.getWorldLocation();
if (invalidLocation(l))
@@ -427,6 +427,8 @@ public class ObjectAwareness extends Service {
return false;
if (obj instanceof CreatureObject && ((CreatureObject) obj).isLoggedOutPlayer())
return false;
if (obj.getParent() != null)
return false;
int distSquared = distanceSquared(objLoc, inRange.getWorldLocation());
int loadSquared = (int) (square(inRange.getLoadRange()) + 0.5);
return (loadSquared != 0 || distSquared <= DEFAULT_LOAD_RANGE) && (loadSquared == 0 || distSquared <= loadSquared);