diff options
| author | megamage <none@none> | 2009-02-12 17:09:15 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-12 17:09:15 -0600 |
| commit | 6aee5fcbe7473a3cbac12b7e8482a7b98bef8be3 (patch) | |
| tree | 91ec91d5c19eba9c2fe0e84b1c9dc7047a3de80e /src/game/Player.cpp | |
| parent | 2d2f433b4de1c35b22aaf07854fc0ee11fcb350d (diff) | |
| parent | f385747164c3fb278c92ef46fbd6c3da6590bbf0 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
| -rw-r--r-- | src/game/Player.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 863cbc71f29..2dba5867129 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -1578,15 +1578,15 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati if(!InBattleGround() && mEntry->IsBattleGroundOrArena()) return false; - // 449 - Champions' Hall (Alliance) // 450 - Hall of Legends (Horde) - if(mapid == 449 && GetTeam()==HORDE) + // 449 - Champions' Hall (Alliance) // 450 - Hall of Legends (Horde) + if(mapid == 449 && GetTeam()==HORDE) { GetSession()->SendNotification(LANG_NO_ENTER_CHAMPIONS_HALL); return false; } - if(mapid == 450 && GetTeam() == ALLIANCE) - { + if(mapid == 450 && GetTeam() == ALLIANCE) + { GetSession()->SendNotification(LANG_NO_ENTER_HALL_OF_LEGENDS); return false; } @@ -16079,8 +16079,8 @@ void Player::SaveToDB() ss << ", '"; ss << m_taxi.SaveTaxiDestinationsToString(); - ss << "', '0', "; - ss << GetSession()->GetLatency(); + ss << "', '0', "; + ss << GetSession()->GetLatency(); ss << ", "; ss << GetBattleGroundId(); ss << ", "; |