From 3bbabb14000d41f6b2dd1f0faf539d31c623a6a7 Mon Sep 17 00:00:00 2001
From: kaelima <kaelima@live.se>
Date: Mon, 9 Apr 2012 03:02:45 +0200
Subject: [PATCH] Core/Spell: Fix crash when blinking on transports in
 instancable maps

Closes #789
---
 src/server/game/Entities/Player/Player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index ea7985f67f..1fa88ce86e 100755
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -2134,7 +2134,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
     if (duel && GetMapId() != mapid && GetMap()->GetGameObject(GetUInt64Value(PLAYER_DUEL_ARBITER)))
         DuelComplete(DUEL_FLED);
 
-    if ((GetMapId() == mapid && !m_transport) || (GetTransport() && GetMapId() == 628))
+    if (GetMapId() == mapid)
     {
         //lets reset far teleport flag if it wasn't reset during chained teleports
         SetSemaphoreTeleportFar(false);