From f563a71425ea0eba72f21effa19873f642eb71c1 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Mon, 2 Jan 2017 13:13:14 -0600
Subject: [PATCH] Fixed teleport/travel bug NGE-552

---
 src/services/objects/ObjectAwareness.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java
index 66aef398d..148d5f529 100644
--- a/src/services/objects/ObjectAwareness.java
+++ b/src/services/objects/ObjectAwareness.java
@@ -261,7 +261,8 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
 	
 	private void handleZoneIn(CreatureObject creature, Player player, boolean firstZone) {
 		creature.setOwner(player);
-		Assert.test(player.getPlayerState() == PlayerState.LOGGED_IN);
+		// Fresh login or teleport/travel
+		Assert.test(player.getPlayerState() == PlayerState.LOGGED_IN || player.getPlayerState() == PlayerState.ZONED_IN);
 		player.setPlayerState(PlayerState.ZONING_IN);
 		Log.i(this, "Zoning in %s with character %s", player.getUsername(), player.getCharacterName());
 		if (firstZone)