diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index dc2a8bc921..a78176506c 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -3697,10 +3697,12 @@ void Map::ScriptsProcess()
                     sLog.outError("SCRIPT_COMMAND_ORIENTATION call for NULL creature.");
                     break;
                 }
-
-                source->ToCreature()->SetOrientation(step.script->o);
+                Unit* pPlayer = (Unit*)source;
+                if (step.script->datalong)
+                    source->ToCreature()->SetInFront(pPlayer);
+                else
+                    source->ToCreature()->SetOrientation(step.script->o);
                 source->ToCreature()->SendMovementFlagUpdate();
-
                 break;
             }
             case SCRIPT_COMMAND_EQUIP: