From d1fdcbf84f0d143bdced71dea2711541b09f8bb6 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Tue, 24 May 2016 09:40:30 -0500
Subject: [PATCH] Fixed players flickering upon zone in

---
 src/resources/objects/SWGObject.java      | 20 +++++++++++---------
 src/services/objects/ObjectAwareness.java |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java
index 7f1eb97a6..aac0678a6 100644
--- a/src/resources/objects/SWGObject.java
+++ b/src/resources/objects/SWGObject.java
@@ -52,6 +52,7 @@ import resources.network.NetBuffer;
 import resources.objects.building.BuildingObject;
 import resources.objects.creature.CreatureObject;
 import resources.player.Player;
+import resources.player.PlayerState;
 import resources.server_info.Log;
 import services.CoreManager;
 
@@ -128,7 +129,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 	 * Adds the specified object to this object and places it in the appropriate slot if needed
 	 * @param object Object to add to this container, which will either be put into the appropriate slot(s) or become a contained object
 	 */
-	protected boolean addObject(SWGObject object) {
+	public boolean addObject(SWGObject object) {
 		// If the arrangement is -1, then this object will be a contained object
 		int arrangementId = getArrangementId(object);
 		if (arrangementId == -1) {
@@ -160,7 +161,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 	 * Removes the specified object from this current object.
 	 * @param object Object to remove
 	 */
-	protected void removeObject(SWGObject object) {
+	public void removeObject(SWGObject object) {
 		synchronized (object.objectsAware) {
 			object.objectsAware.clear();
 			object.objectsAware.addAll(getObjectsAware());
@@ -740,6 +741,12 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 			awarenessOutOfRange(o, updateSelf);
 		}
 	}
+	
+	public void resetAwareness() {
+		synchronized (objectsAware) {
+			objectsAware.clear();
+		}
+	}
 
 	public Set <SWGObject> getObjectsAware() {
 		Set<SWGObject> aware;
@@ -789,6 +796,8 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 				Player awareOwner = aware.getOwner();
 				if (awareOwner == null || awareOwner.equals(owner))
 					continue;
+				if (awareOwner.getPlayerState() != PlayerState.ZONED_IN)
+					continue;
 				if (((CreatureObject) aware).isLoggedInPlayer())
 					observers.add(aware);
 			} else
@@ -845,12 +854,6 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 		synchronized (objectsAware) {
 			outOfRange = new HashSet<>(objectsAware);
 		}
-		if (outOfRange.contains(this)) {
-			Log.e("SWGObject", "outOfRange contains this");
-		}
-		if (withinRange.contains(this)) {
-			Log.e("SWGObject", "withinRange contains this");
-		}
 		for (SWGObject o : outOfRange) {
 			if (!withinRange.contains(o)) {
 				awarenessOutOfRange(o, true);
@@ -940,7 +943,6 @@ public abstract class SWGObject extends BaselineObject implements Comparable<SWG
 		synchronized (slots) {
 			for (SWGObject slotObject : slots.values()) {
 				if (slotObject != null && !sentObjects.contains(slotObject)) {
-					//Log.i("ChildrenObjects", "Sending slotObj " + slotObject + " to " + target);
 					slotObject.createObject(target, ignoreSnapshotChecks);
 					sentObjects.add(slotObject);
 				}
diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java
index b77c4641f..ba2f8b20c 100644
--- a/src/services/objects/ObjectAwareness.java
+++ b/src/services/objects/ObjectAwareness.java
@@ -117,7 +117,7 @@ public class ObjectAwareness extends Service {
 				creature.setOwner(null);
 				break;
 			case PE_ZONE_IN_SERVER:
-				creature.clearAware(false);
+				creature.resetAwareness();
 				add(creature);
 				update(creature);
 				p.sendPacket(new CmdSceneReady());