Prevent crash after .goname/namego teleports at same bg/arena, by mns.

--HG--
branch : trunk

1 files changed, 4 insertions, 2 deletions

diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp
index 4163aaa40e1..6ac68997cbc 100644
--- a/src/game/Level1.cpp
+++ b/src/game/Level1.cpp
@@ -824,7 +824,8 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
             // when porting out from the bg, it will be reset to 0
             target->SetBattleGroundId(m_session->GetPlayer()->GetBattleGroundId(), m_session->GetPlayer()->GetBattleGroundTypeId());
             // remember current position as entry point for return at bg end teleportation
-            target->SetBattleGroundEntryPoint();
+            if (!target->GetMap()->IsBattleGroundOrArena())
+                target->SetBattleGroundEntryPoint();
         }
         else if (pMap->IsDungeon())
         {
@@ -940,7 +941,8 @@ bool ChatHandler::HandleGonameCommand(const char* args)
             // when porting out from the bg, it will be reset to 0
             _player->SetBattleGroundId(target->GetBattleGroundId(), target->GetBattleGroundTypeId());
             // remember current position as entry point for return at bg end teleportation
-            _player->SetBattleGroundEntryPoint();
+            if (!_player->GetMap()->IsBattleGroundOrArena())
+                _player->SetBattleGroundEntryPoint();
         }
         else if(cMap->IsDungeon())
         {