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

Reverted portions of last patch, should zone in successfully

Browse Source
This commit is contained in:
Obique
2015-01-09 12:56:44 -06:00
committed by Obique
parent b3f8d5f33e
commit 33361539cb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/objects/ObjectManager.java
+2 -1
View File
@@ -174,7 +174,7 @@ public class ObjectManager extends Manager {
double y = location.getZ();
QuadTree<SWGObject> tree = quadTree.get(location.getTerrain());
for (SWGObject inRange : tree.getWithinRange(x, y, AWARE_RANGE)) {
if (inRange.getOwner() != null) {
if (inRange.getOwner() != null && inRange.getObjectId() != obj.getObjectId()) {
updatedAware.add(inRange.getOwner());
}
}
@@ -227,6 +227,7 @@ public class ObjectManager extends Manager {
// player.getCreatureObject().createObject(player);
CreatureObject creature = (CreatureObject) player.getCreatureObject();
player.sendPacket(new UpdatePvpStatusMessage(creature.getPvpType(), creature.getPvpFactionId(), creature.getObjectId()));
creature.createObject(player);
creature.clearAware();
moveObject(null, creature, creature.getLocation(), creature.getLocation());
updateAwarenessForObject(creature);