Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage committed 2009-02-12 17:09:15 -06:00
2 parents 2d2f433b4d f385747164
commit 6aee5fcbe7
603 files changed
+40989 -40987
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/Player.cpp
+6 -6
View File
@@ -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 << ", ";