More merge fixes

This commit is contained in:
tomrus88 2009-03-11 13:40:17 +03:00
parent 972510fdcc
commit fbf658d1f0
5 changed files with 4 additions and 31 deletions

View file

@ -18298,7 +18298,6 @@ void Player::SendInitialPacketsBeforeAddToMap()
SendInitialActionButtons();
SendInitialReputations();
SendInitWorldStates();
m_achievementMgr.SendAllAchievementData();
uint32 newzone, newarea;