Revert last rev and fix in correct way. Also some clean up after merge

--HG--
branch : trunk

src/bindings/scripts/base/escort_ai.h

@@ -88,9 +88,8 @@ struct TRINITY_DLL_DECL npc_escortAI : public ScriptedAI
         bool IsBeingEscorted;
         bool IsOnHold;
 
-        uint64 m_uiPlayerGUID;
-
     private:
+        uint64 m_uiPlayerGUID;
         uint32 m_uiWPWaitTimer;
         uint32 m_uiPlayerCheckTimer;
         float MaxPlayerDistance;

src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp

@@ -234,7 +234,7 @@ struct TRINITY_DLL_DECL npc_koltira_deathweaverAI : public npc_escortAI
 
     void JustSummoned(Creature* pSummoned)
     {
-        if (Unit* pPlayer = Unit::GetUnit(*me, m_uiPlayerGUID))
+        if (Player* pPlayer = GetPlayerForEscort())
         {
             pSummoned->AI()->AttackStart(pPlayer);
             pSummoned->AddThreat(me, 0.0f);