From 27e12424e5343816fdbef280ec79d3339c848bcb Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Mon, 3 Aug 2009 02:59:03 +0400
Subject: [PATCH] [8299] Move zone update form SendInitialPacketsBeforeAddToMap
 to SendInitialPacketsAfterAddToMap.

This must retore correct apply zone dependent auras at far teleport and login.
Also must be restored chat channels update at far teleport.
---
 src/game/Player.cpp      | 10 +++++-----
 src/shared/revision_nr.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 37931f69d..5169193c8 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -18134,11 +18134,6 @@ void Player::SendInitialPacketsBeforeAddToMap()
     m_reputationMgr.SendInitialReputations();
     m_achievementMgr.SendAllAchievementData();
 
-    // update zone
-    uint32 newzone, newarea;
-    GetZoneAndAreaId(newzone,newarea);
-    UpdateZone(newzone,newarea);                            // also call SendInitWorldStates();
-
     SendEquipmentSetList();
 
     data.Initialize(SMSG_LOGIN_SETTIMESPEED, 4 + 4 + 4);
@@ -18156,6 +18151,11 @@ void Player::SendInitialPacketsBeforeAddToMap()
 
 void Player::SendInitialPacketsAfterAddToMap()
 {
+    // update zone
+    uint32 newzone, newarea;
+    GetZoneAndAreaId(newzone,newarea);
+    UpdateZone(newzone,newarea);                            // also call SendInitWorldStates();
+
     WorldPacket data(SMSG_TIME_SYNC_REQ, 4);                // new 2.0.x, enable movement
     data << uint32(0x00000000);                             // on blizz it increments periodically
     GetSession()->SendPacket(&data);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 21b9406d5..929510f10 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8298"
+ #define REVISION_NR "8299"
 #endif // __REVISION_NR_H__