From 47edaeae8f9ce174ed9b0245b778cd220361a1ab Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Tue, 23 May 2017 18:30:31 -0500
Subject: [PATCH] Fixed object teleport setting terrain before container

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

diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java
index e0177dce7..8ef73726f 100644
--- a/src/services/objects/ObjectAwareness.java
+++ b/src/services/objects/ObjectAwareness.java
@@ -210,8 +210,8 @@ public class ObjectAwareness extends Service implements TerrainMapCallback {
 			Log.i("Zoning in %s with character %s at %s in %s/%s %s", player.getUsername(), player.getCharacterName(), loc.getPosition(), superParent, world, superParent.getTerrain());
 		}
 		resetAwarenessOnZone(creature, firstZone);
-		creature.setLocation(loc);
 		creature.moveToContainer(parent);
+		creature.setLocation(loc);
 		startZone(creature, firstZone);
 		recursiveCreateObject(creature, player);
 		if (parent != null) {