Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_npc.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h

18 files changed, 275 insertions, 230 deletions

diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
index 4f9381ce78d..fa423d2db85 100644
--- a/src/server/scripts/Commands/cs_debug.cpp
+++ b/src/server/scripts/Commands/cs_debug.cpp
@@ -928,7 +928,7 @@ public:
 
         Map* map = handler->GetSession()->GetPlayer()->GetMap();
 
-        if (!v->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_VEHICLE), map, handler->GetSession()->GetPlayer()->GetPhaseMask(), entry, id, handler->GetSession()->GetPlayer()->GetTeam(), x, y, z, o))
+        if (!v->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_VEHICLE), map, handler->GetSession()->GetPlayer()->GetPhaseMask(), entry, x, y, z, o, nullptr, id))
         {
             delete v;
             return false;
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp
index 6fdc3b9f5ef..6cc049b48ea 100644
--- a/src/server/scripts/Commands/cs_npc.cpp
+++ b/src/server/scripts/Commands/cs_npc.cpp
@@ -227,14 +227,6 @@ public:
         if (!charID)
             return false;
 
-        char* team = strtok(NULL, " ");
-        int32 teamval = 0;
-        if (team)
-            teamval = atoi(team);
-
-        if (teamval < 0)
-            teamval = 0;
-
         uint32 id  = atoi(charID);
         if (!sObjectMgr->GetCreatureTemplate(id))
             return false;
@@ -266,7 +258,7 @@ public:
         }
 
         Creature* creature = new Creature();
-        if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, 0, (uint32)teamval, x, y, z, o))
+        if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, x, y, z, o))
         {
             delete creature;
             return false;
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
index 041823896ba..b529e718d3e 100644
--- a/src/server/scripts/Commands/cs_wp.cpp
+++ b/src/server/scripts/Commands/cs_wp.cpp
@@ -565,7 +565,7 @@ public:
         // Check
         // Remember: "show" must also be the name of a column!
         if ((show != "delay") && (show != "action") && (show != "action_chance")
-            && (show != "move_flag") && (show != "del") && (show != "move") && (show != "wpadd")
+            && (show != "move_flag") && (show != "del") && (show != "move")
             )
         {
             return false;
@@ -694,7 +694,7 @@ public:
                     }
                     // re-create
                     Creature* wpCreature2 = new Creature();
-                    if (!wpCreature2->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), VISUAL_WAYPOINT, 0, 0, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), chr->GetOrientation()))
+                    if (!wpCreature2->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), VISUAL_WAYPOINT, chr->GetPositionX(), chr->GetPositionY(), chr->GetPositionZ(), chr->GetOrientation()))
                     {
                         handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, VISUAL_WAYPOINT);
                         delete wpCreature2;
@@ -918,7 +918,7 @@ public:
                 float o = chr->GetOrientation();
 
                 Creature* wpCreature = new Creature();
-                if (!wpCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
+                if (!wpCreature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, x, y, z, o))
                 {
                     handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id);
                     delete wpCreature;
@@ -982,7 +982,7 @@ public:
             Map* map = chr->GetMap();
 
             Creature* creature = new Creature();
-            if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
+            if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, x, y, z, o))
             {
                 handler->PSendSysMessage(LANG_WAYPOINT_VP_NOTCREATED, id);
                 delete creature;
@@ -1031,7 +1031,7 @@ public:
             Map* map = chr->GetMap();
 
             Creature* creature = new Creature();
-            if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, 0, 0, x, y, z, o))
+            if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, x, y, z, o))
             {
                 handler->PSendSysMessage(LANG_WAYPOINT_NOTCREATED, id);
                 delete creature;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
index 60352f7d55c..9316aaa7cd8 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -856,7 +856,7 @@ public:
                                 if (!pZombie)
                                     pZombie = GetClosestCreatureWithEntry(malganis, NPC_CITY_MAN2, 100.0f);
                                 if (pZombie)
-                                    pZombie->UpdateEntry(NPC_ZOMBIE, 0);
+                                    pZombie->UpdateEntry(NPC_ZOMBIE);
                                 else //There's no one else to transform
                                     step++;
                             }
@@ -1017,7 +1017,7 @@ public:
                         case 68:
                             if (Creature* disguised2 = Unit::GetCreature(*me, infiniteDraconianGUID[2]))
                             {
-                                disguised2->UpdateEntry(NPC_INFINITE_HUNTER, 0);
+                                disguised2->UpdateEntry(NPC_INFINITE_HUNTER);
                                 //Make them unattackable
                                 disguised2->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
                                 disguised2->SetReactState(REACT_PASSIVE);
@@ -1027,7 +1027,7 @@ public:
                         case 69:
                             if (Creature* disguised1 = Unit::GetCreature(*me, infiniteDraconianGUID[1]))
                             {
-                                disguised1->UpdateEntry(NPC_INFINITE_AGENT, 0);
+                                disguised1->UpdateEntry(NPC_INFINITE_AGENT);
                                 //Make them unattackable
                                 disguised1->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
                                 disguised1->SetReactState(REACT_PASSIVE);
@@ -1037,7 +1037,7 @@ public:
                         case 70:
                             if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0]))
                             {
-                                disguised0->UpdateEntry(NPC_INFINITE_ADVERSARY, 0);
+                                disguised0->UpdateEntry(NPC_INFINITE_ADVERSARY);
                                 //Make them unattackable
                                 disguised0->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC);
                                 disguised0->SetReactState(REACT_PASSIVE);
diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp
index 3eceb2adcf7..02ceb9b34c9 100644
--- a/src/server/scripts/Kalimdor/boss_azuregos.cpp
+++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2014 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -16,151 +15,206 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* ScriptData
-SDName: Boss_Azuregos
-SD%Complete: 90
-SDComment: Teleport not included, spell reflect not effecting dots (Core problem)
-SDCategory: Azshara
-EndScriptData */
-
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "SpellScript.h"
+#include "SpellAuraEffects.h"
+#include "Player.h"
 
 enum Say
 {
-    SAY_TELEPORT            = 0
+    SAY_TELEPORT             = 0
 };
 
 enum Spells
 {
-    SPELL_MARKOFFROST       = 23182,
-    SPELL_MANASTORM         = 21097,
-    SPELL_CHILL             = 21098,
-    SPELL_FROSTBREATH       = 21099,
-    SPELL_REFLECT           = 22067,
-    SPELL_CLEAVE            = 8255,     //Perhaps not right ID
-    SPELL_ENRAGE            = 23537
+    SPELL_MARK_OF_FROST      = 23182,
+    SPELL_AURA_OF_FROST      = 23186,
+    SPELL_MARK_OF_FROST_AURA = 23184,
+    SPELL_MANA_STORM         = 21097,
+    SPELL_CHILL              = 21098,
+    SPELL_FROST_BREATH       = 21099,
+    SPELL_REFLECT            = 22067,
+    SPELL_CLEAVE             = 8255,     // Perhaps not right ID
+    SPELL_ENRAGE             = 23537
+};
+
+enum Events
+{
+    EVENT_MARK_OF_FROST      = 1,
+    EVENT_MANA_STORM,
+    EVENT_CHILL,
+    EVENT_BREATH,
+    EVENT_TELEPORT,
+    EVENT_REFLECT,
+    EVENT_CLEAVE,
+    EVENT_ENRAGE
 };
 
 class boss_azuregos : public CreatureScript
 {
-public:
-    boss_azuregos() : CreatureScript("boss_azuregos") { }
-
-    CreatureAI* GetAI(Creature* creature) const OVERRIDE
-    {
-        return new boss_azuregosAI(creature);
-    }
-
-    struct boss_azuregosAI : public ScriptedAI
-    {
-        boss_azuregosAI(Creature* creature) : ScriptedAI(creature) { }
-
-        uint32 MarkOfFrostTimer;
-        uint32 ManaStormTimer;
-        uint32 ChillTimer;
-        uint32 BreathTimer;
-        uint32 TeleportTimer;
-        uint32 ReflectTimer;
-        uint32 CleaveTimer;
-        uint32 EnrageTimer;
-        bool Enraged;
-
-        void Reset() OVERRIDE
+    public:
+        boss_azuregos() : CreatureScript("boss_azuregos") { }
+
+        struct boss_azuregosAI : public WorldBossAI
         {
-            MarkOfFrostTimer = 35000;
-            ManaStormTimer = urand(5000, 17000);
-            ChillTimer = urand(10000, 30000);
-            BreathTimer = urand(2000, 8000);
-            TeleportTimer = 30000;
-            ReflectTimer = urand(15000, 30000);
-            CleaveTimer = 7000;
-            EnrageTimer = 0;
-            Enraged = false;
-        }
+            boss_azuregosAI(Creature* creature) : WorldBossAI(creature) { }
 
-        void EnterCombat(Unit* /*who*/) OVERRIDE { }
+            void Reset() OVERRIDE
+            {
+                _Reset();
+            }
 
-        void UpdateAI(uint32 diff) OVERRIDE
-        {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
+            void EnterCombat(Unit* /*who*/) OVERRIDE
+            {
+                DoCast(me, SPELL_MARK_OF_FROST_AURA, true);
+                _enraged = false;
+
+                events.ScheduleEvent(EVENT_MARK_OF_FROST, 35000);
+                events.ScheduleEvent(EVENT_MANA_STORM, urand(5000, 17000));
+                events.ScheduleEvent(EVENT_CHILL, urand(10000, 30000));
+                events.ScheduleEvent(EVENT_BREATH, urand(2000, 8000));
+                events.ScheduleEvent(EVENT_TELEPORT, 30000);
+                events.ScheduleEvent(EVENT_REFLECT, urand(15000, 30000));
+                events.ScheduleEvent(EVENT_CLEAVE, 7000);
+            }
 
-            if (TeleportTimer <= diff)
+            void KilledUnit(Unit* who) OVERRIDE
             {
-                Talk(SAY_TELEPORT);
-                ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList();
-                ThreatContainer::StorageType::const_iterator i = threatlist.begin();
-                for (i = threatlist.begin(); i != threatlist.end(); ++i)
+                if (who->GetTypeId() == TYPEID_PLAYER)
+                    who->CastSpell(who, SPELL_MARK_OF_FROST, true);
+            }
+
+            void UpdateAI(uint32 diff) OVERRIDE
+            {
+                if (!UpdateVictim())
+                    return;
+
+                events.Update(diff);
+
+                if (me->HasUnitState(UNIT_STATE_CASTING))
+                    return;
+
+                while (uint32 eventId = events.ExecuteEvent())
                 {
-                    Unit* unit = Unit::GetUnit(*me, (*i)->getUnitGuid());
-                    if (unit && (unit->GetTypeId() == TYPEID_PLAYER))
+                    switch (eventId)
                     {
-                        DoTeleportPlayer(unit, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+3, unit->GetOrientation());
+                        case EVENT_MANA_STORM:
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true))
+                                DoCast(target, SPELL_MANA_STORM);
+                            events.ScheduleEvent(EVENT_MANA_STORM, urand(7500, 12500));
+                            break;
+                        case EVENT_CHILL:
+                            DoCastVictim(SPELL_CHILL);
+                            events.ScheduleEvent(EVENT_CHILL, urand(13000, 25000));
+                            break;
+                        case EVENT_BREATH:
+                            DoCastVictim(SPELL_FROST_BREATH);
+                            events.ScheduleEvent(EVENT_BREATH, urand(10000, 15000));
+                            break;
+                        case EVENT_TELEPORT:
+                        {
+                            Talk(SAY_TELEPORT);
+                            ThreatContainer::StorageType const& threatlist = me->getThreatManager().getThreatList();
+                            for (ThreatContainer::StorageType::const_iterator i = threatlist.begin(); i != threatlist.end(); ++i)
+                            {
+                                if (Player* player = ObjectAccessor::GetPlayer(*me, (*i)->getUnitGuid()))
+                                    DoTeleportPlayer(player, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()+3, player->GetOrientation());
+                            }
+
+                            DoResetThreat();
+                            events.ScheduleEvent(EVENT_TELEPORT, 30000);
+                            break;
+                        }
+                        case EVENT_REFLECT:
+                            DoCast(me, SPELL_REFLECT);
+                            events.ScheduleEvent(EVENT_REFLECT, urand(20000, 35000));
+                            break;
+                        case EVENT_CLEAVE:
+                            DoCastVictim(SPELL_CLEAVE);
+                            events.ScheduleEvent(EVENT_CLEAVE, 7000);
+                            break;
+                        default:
+                            break;
                     }
                 }
 
-                DoResetThreat();
-                TeleportTimer = 30000;
-            } else TeleportTimer -= diff;
+                if (HealthBelowPct(26) && !_enraged)
+                {
+                    DoCast(me, SPELL_ENRAGE);
+                    _enraged = true;
+                }
 
-            //        //MarkOfFrostTimer
-            //        if (MarkOfFrostTimer <= diff)
-            //        {
-            //            DoCastVictim(SPELL_MARKOFFROST);
-            //            MarkOfFrostTimer = 25000;
-            //        } else MarkOfFrostTimer -= diff;
+                DoMeleeAttackIfReady();
+            }
 
-            //ChillTimer
-            if (ChillTimer <= diff)
-            {
-                DoCastVictim(SPELL_CHILL);
-                ChillTimer = urand(13000, 25000);
-            } else ChillTimer -= diff;
+        private:
+            bool _enraged;
+        };
 
-            //BreathTimer
-            if (BreathTimer <= diff)
-            {
-                DoCastVictim(SPELL_FROSTBREATH);
-                BreathTimer = urand(10000, 15000);
-            } else BreathTimer -= diff;
+        CreatureAI* GetAI(Creature* creature) const OVERRIDE
+        {
+            return new boss_azuregosAI(creature);
+        }
+};
 
-            //ManaStormTimer
-            if (ManaStormTimer <= diff)
+class MarkOfFrostTargetSelector
+{
+    public:
+        MarkOfFrostTargetSelector() { }
+
+        bool operator()(WorldObject* object) const
+        {
+            if (Unit* unit = object->ToUnit())
+                return !(unit->HasAura(SPELL_MARK_OF_FROST) && !unit->HasAura(SPELL_AURA_OF_FROST));
+            return true;
+        }
+};
+
+class spell_mark_of_frost : public SpellScriptLoader
+{
+    public:
+        spell_mark_of_frost() : SpellScriptLoader("spell_mark_of_frost") { }
+
+        class spell_mark_of_frost_SpellScript : public SpellScript
+        {
+            PrepareSpellScript(spell_mark_of_frost_SpellScript);
+
+            bool Validate(SpellInfo const* /*spellInfo*/) OVERRIDE
             {
-                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
-                    DoCast(target, SPELL_MANASTORM);
-                ManaStormTimer = urand(7500, 12500);
-            } else ManaStormTimer -= diff;
+                if (!sSpellMgr->GetSpellInfo(SPELL_MARK_OF_FROST))
+                    return false;
+                if (!sSpellMgr->GetSpellInfo(SPELL_AURA_OF_FROST))
+                    return false;
+                return true;
+            }
 
-            //ReflectTimer
-            if (ReflectTimer <= diff)
+            void FilterTargets(std::list<WorldObject*>& targets)
             {
-                DoCast(me, SPELL_REFLECT);
-                ReflectTimer = urand(20000, 35000);
-            } else ReflectTimer -= diff;
+                targets.remove_if(MarkOfFrostTargetSelector());
+            }
 
-            //CleaveTimer
-            if (CleaveTimer <= diff)
+            void HandleEffect(SpellEffIndex effIndex)
             {
-                DoCastVictim(SPELL_CLEAVE);
-                CleaveTimer = 7000;
-            } else CleaveTimer -= diff;
+                PreventHitDefaultEffect(effIndex);
+                GetHitUnit()->CastSpell(GetHitUnit(), SPELL_AURA_OF_FROST, true);
+            }
 
-            //EnrageTimer
-            if (HealthBelowPct(26) && !Enraged)
+            void Register() OVERRIDE
             {
-                DoCast(me, SPELL_ENRAGE);
-                Enraged = true;
+                OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mark_of_frost_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
+                OnEffectHitTarget += SpellEffectFn(spell_mark_of_frost_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
             }
+        };
 
-            DoMeleeAttackIfReady();
+        SpellScript* GetSpellScript() const OVERRIDE
+        {
+            return new spell_mark_of_frost_SpellScript();
         }
-    };
 };
 
 void AddSC_boss_azuregos()
 {
     new boss_azuregos();
+    new spell_mark_of_frost();
 }
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
index 1f8b281b807..b02722106ee 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
@@ -117,29 +117,29 @@ public:
                 // Champions
                 case VEHICLE_MOKRA_SKILLCRUSHER_MOUNT:
                     if (TeamInInstance == HORDE)
-                        creature->UpdateEntry(VEHICLE_MARSHAL_JACOB_ALERIUS_MOUNT, ALLIANCE);
+                        creature->UpdateEntry(VEHICLE_MARSHAL_JACOB_ALERIUS_MOUNT);
                     break;
                 case VEHICLE_ERESSEA_DAWNSINGER_MOUNT:
                     if (TeamInInstance == HORDE)
-                        creature->UpdateEntry(VEHICLE_AMBROSE_BOLTSPARK_MOUNT, ALLIANCE);
+                        creature->UpdateEntry(VEHICLE_AMBROSE_BOLTSPARK_MOUNT);
                     break;
                 case VEHICLE_RUNOK_WILDMANE_MOUNT:
                     if (TeamInInstance == HORDE)
-                        creature->UpdateEntry(VEHICLE_COLOSOS_MOUNT, ALLIANCE);
+                        creature->UpdateEntry(VEHICLE_COLOSOS_MOUNT);
                     break;
                 case VEHICLE_ZUL_TORE_MOUNT:
                     if (TeamInInstance == HORDE)
-                        creature->UpdateEntry(VEHICLE_EVENSONG_MOUNT, ALLIANCE);
+                        creature->UpdateEntry(VEHICLE_EVENSONG_MOUNT);
                     break;
                 case VEHICLE_DEATHSTALKER_VESCERI_MOUNT:
                     if (TeamInInstance == HORDE)
-                        creature->UpdateEntry(VEHICLE_LANA_STOUTHAMMER_MOUNT, ALLIANCE);
+                        creature->UpdateEntry(VEHICLE_LANA_STOUTHAMMER_MOUNT);
                     break;
                 // Coliseum Announcer || Just NPC_JAEREN must be spawned.
                 case NPC_JAEREN:
                     uiAnnouncerGUID = creature->GetGUID();
                     if (TeamInInstance == ALLIANCE)
-                        creature->UpdateEntry(NPC_ARELAS, ALLIANCE);
+                        creature->UpdateEntry(NPC_ARELAS);
                     break;
                 case VEHICLE_ARGENT_WARHORSE:
                 case VEHICLE_ARGENT_BATTLEWORG:
diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
index cb03842cf3f..c8734f67812 100644
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
@@ -69,15 +69,15 @@ class instance_forge_of_souls : public InstanceMapScript
                         break;
                     case NPC_SYLVANAS_PART1:
                         if (teamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_JAINA_PART1, ALLIANCE);
+                            creature->UpdateEntry(NPC_JAINA_PART1);
                         break;
                     case NPC_LORALEN:
                         if (teamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_ELANDRA, ALLIANCE);
+                            creature->UpdateEntry(NPC_ELANDRA);
                         break;
                     case NPC_KALIRA:
                         if (teamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_KORELN, ALLIANCE);
+                            creature->UpdateEntry(NPC_KORELN);
                         break;
                 }
             }
diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
index 364246e05f1..6dc787cb47f 100644
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
@@ -91,73 +91,73 @@ class instance_pit_of_saron : public InstanceMapScript
                         break;
                     case NPC_SYLVANAS_PART1:
                         if (_teamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_JAINA_PART1, ALLIANCE);
+                            creature->UpdateEntry(NPC_JAINA_PART1);
                         _jainaOrSylvanas1GUID = creature->GetGUID();
                         break;
                     case NPC_SYLVANAS_PART2:
                         if (_teamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_JAINA_PART2, ALLIANCE);
+                            creature->UpdateEntry(NPC_JAINA_PART2);
                         _jainaOrSylvanas2GUID = creature->GetGUID();
                         break;
                     case NPC_KILARA:
                         if (_teamInInstance == ALLIANCE)
-                           creature->UpdateEntry(NPC_ELANDRA, ALLIANCE);
+                           creature->UpdateEntry(NPC_ELANDRA);
                         break;
                     case NPC_KORALEN:
                         if (_teamInInstance == ALLIANCE)
-                           creature->UpdateEntry(NPC_KORLAEN, ALLIANCE);
+                           creature->UpdateEntry(NPC_KORLAEN);
                         break;
                     case NPC_CHAMPION_1_HORDE:
                         if (_teamInInstance == ALLIANCE)
-                           creature->UpdateEntry(NPC_CHAMPION_1_ALLIANCE, ALLIANCE);
+                           creature->UpdateEntry(NPC_CHAMPION_1_ALLIANCE);
                         break;
                     case NPC_CHAMPION_2_HORDE:
                         if (_teamInInstance == ALLIANCE)
-                           creature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE, ALLIANCE);
+                           creature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE);
                         break;
                     case NPC_CHAMPION_3_HORDE: // No 3rd set for Alliance?
                         if (_teamInInstance == ALLIANCE)
-                           creature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE, ALLIANCE);
+                           creature->UpdateEntry(NPC_CHAMPION_2_ALLIANCE);
                         break;
                     case NPC_HORDE_SLAVE_1:
                         if (_teamInInstance == ALLIANCE)
-                           creature->UpdateEntry(NPC_ALLIANCE_SLAVE_1, ALLIANCE);
+                           creature->UpdateEntry(NPC_ALLIANCE_SLAVE_1);
                         break;
                     case NPC_HORDE_SLAVE_2:
                         if (_teamInInstance == ALLIANCE)
-                           creature->UpdateEntry(NPC_ALLIANCE_SLAVE_2, ALLIANCE);
+                           creature->UpdateEntry(NPC_ALLIANCE_SLAVE_2);
                         break;
                     case NPC_HORDE_SLAVE_3:
                         if (_teamInInstance == ALLIANCE)
-                           creature->UpdateEntry(NPC_ALLIANCE_SLAVE_3, ALLIANCE);
+                           creature->UpdateEntry(NPC_ALLIANCE_SLAVE_3);
                         break;
                     case NPC_HORDE_SLAVE_4:
                         if (_teamInInstance == ALLIANCE)
-                           creature->UpdateEntry(NPC_ALLIANCE_SLAVE_4, ALLIANCE);
+                           creature->UpdateEntry(NPC_ALLIANCE_SLAVE_4);
                         break;
                     case NPC_FREED_SLAVE_1_HORDE:
                         if (_teamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_FREED_SLAVE_1_ALLIANCE, ALLIANCE);
+                            creature->UpdateEntry(NPC_FREED_SLAVE_1_ALLIANCE);
                         break;
                     case NPC_FREED_SLAVE_2_HORDE:
                         if (_teamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_FREED_SLAVE_2_ALLIANCE, ALLIANCE);
+                            creature->UpdateEntry(NPC_FREED_SLAVE_2_ALLIANCE);
                         break;
                     case NPC_FREED_SLAVE_3_HORDE:
                         if (_teamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_FREED_SLAVE_3_ALLIANCE, ALLIANCE);
+                            creature->UpdateEntry(NPC_FREED_SLAVE_3_ALLIANCE);
                         break;
                     case NPC_RESCUED_SLAVE_HORDE:
                         if (_teamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_RESCUED_SLAVE_ALLIANCE, ALLIANCE);
+                            creature->UpdateEntry(NPC_RESCUED_SLAVE_ALLIANCE);
                         break;
                     case NPC_MARTIN_VICTUS_1:
                         if (_teamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_MARTIN_VICTUS_1, ALLIANCE);
+                            creature->UpdateEntry(NPC_MARTIN_VICTUS_1);
                         break;
                     case NPC_MARTIN_VICTUS_2:
                         if (_teamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_MARTIN_VICTUS_2, ALLIANCE);
+                            creature->UpdateEntry(NPC_MARTIN_VICTUS_2);
                         break;
                     default:
                         break;
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
index 3a334f4d59c..e7d8e056ed0 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
@@ -1319,7 +1319,7 @@ struct npc_argent_captainAI : public ScriptedAI
                 }
 
                 Talk(SAY_CAPTAIN_RESURRECTED);
-                me->UpdateEntry(newEntry, instance->GetData(DATA_TEAM_IN_INSTANCE), me->GetCreatureData());
+                me->UpdateEntry(newEntry, me->GetCreatureData());
                 DoCast(me, SPELL_UNDEATH, true);
             }
         }
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index 51de8a1fe23..adf30410d01 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -194,39 +194,39 @@ class instance_icecrown_citadel : public InstanceMapScript
                 {
                     case NPC_KOR_KRON_GENERAL:
                         if (TeamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_ALLIANCE_COMMANDER, ALLIANCE);
+                            creature->UpdateEntry(NPC_ALLIANCE_COMMANDER);
                         break;
                     case NPC_KOR_KRON_LIEUTENANT:
                         if (TeamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_SKYBREAKER_LIEUTENANT, ALLIANCE);
+                            creature->UpdateEntry(NPC_SKYBREAKER_LIEUTENANT);
                         break;
                     case NPC_TORTUNOK:
                         if (TeamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_ALANA_MOONSTRIKE, ALLIANCE);
+                            creature->UpdateEntry(NPC_ALANA_MOONSTRIKE);
                         break;
                     case NPC_GERARDO_THE_SUAVE:
                         if (TeamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_TALAN_MOONSTRIKE, ALLIANCE);
+                            creature->UpdateEntry(NPC_TALAN_MOONSTRIKE);
                         break;
                     case NPC_UVLUS_BANEFIRE:
                         if (TeamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_MALFUS_GRIMFROST, ALLIANCE);
+                            creature->UpdateEntry(NPC_MALFUS_GRIMFROST);
                         break;
                     case NPC_IKFIRUS_THE_VILE:
                         if (TeamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_YILI, ALLIANCE);
+                            creature->UpdateEntry(NPC_YILI);
                         break;
                     case NPC_VOL_GUK:
                         if (TeamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_JEDEBIA, ALLIANCE);
+                            creature->UpdateEntry(NPC_JEDEBIA);
                         break;
                     case NPC_HARAGG_THE_UNSEEN:
                         if (TeamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_NIBY_THE_ALMIGHTY, ALLIANCE);
+                            creature->UpdateEntry(NPC_NIBY_THE_ALMIGHTY);
                         break;
                     case NPC_GARROSH_HELLSCREAM:
                         if (TeamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_KING_VARIAN_WRYNN, ALLIANCE);
+                            creature->UpdateEntry(NPC_KING_VARIAN_WRYNN);
                         break;
                     case NPC_DEATHBRINGER_SAURFANG:
                         DeathbringerSaurfangGUID = creature->GetGUID();
@@ -237,7 +237,7 @@ class instance_icecrown_citadel : public InstanceMapScript
                         break;
                     case NPC_SE_HIGH_OVERLORD_SAURFANG:
                         if (TeamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_SE_MURADIN_BRONZEBEARD, ALLIANCE, creature->GetCreatureData());
+                            creature->UpdateEntry(NPC_SE_MURADIN_BRONZEBEARD, creature->GetCreatureData());
                         // no break;
                     case NPC_SE_MURADIN_BRONZEBEARD:
                         DeathbringerSaurfangEventGUID = creature->GetGUID();
@@ -245,7 +245,7 @@ class instance_icecrown_citadel : public InstanceMapScript
                         break;
                     case NPC_SE_KOR_KRON_REAVER:
                         if (TeamInInstance == ALLIANCE)
-                            creature->UpdateEntry(NPC_SE_SKYBREAKER_MARINE, ALLIANCE);
+                            creature->UpdateEntry(NPC_SE_SKYBREAKER_MARINE);
                         break;
                     case NPC_FESTERGUT:
                         FestergutGUID = creature->GetGUID();
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
index 851e16fe576..c73e0eeef44 100644
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -88,7 +88,7 @@ public:
                     if (ServerAllowsTwoSideGroups())
                         creature->setFaction(FACTION_HOSTILE_FOR_ALL);
                     if (TeamInInstance == ALLIANCE)
-                        creature->UpdateEntry(26799, HORDE);
+                        creature->UpdateEntry(26799);
                     break;
                 }
                 case 26802:
@@ -96,7 +96,7 @@ public:
                     if (ServerAllowsTwoSideGroups())
                         creature->setFaction(FACTION_HOSTILE_FOR_ALL);
                     if (TeamInInstance == ALLIANCE)
-                        creature->UpdateEntry(26801, HORDE);
+                        creature->UpdateEntry(26801);
                     break;
                 }
                 case 26805:
@@ -104,7 +104,7 @@ public:
                     if (ServerAllowsTwoSideGroups())
                         creature->setFaction(FACTION_HOSTILE_FOR_ALL);
                     if (TeamInInstance == ALLIANCE)
-                        creature->UpdateEntry(26803, HORDE);
+                        creature->UpdateEntry(26803);
                     break;
                 }
                 case 27949:
@@ -112,7 +112,7 @@ public:
                     if (ServerAllowsTwoSideGroups())
                         creature->setFaction(FACTION_HOSTILE_FOR_ALL);
                     if (TeamInInstance == ALLIANCE)
-                        creature->UpdateEntry(27947, HORDE);
+                        creature->UpdateEntry(27947);
                     break;
                 }
                 case 26796:
@@ -120,7 +120,7 @@ public:
                     if (ServerAllowsTwoSideGroups())
                         creature->setFaction(FACTION_HOSTILE_FOR_ALL);
                     if (TeamInInstance == ALLIANCE)
-                        creature->UpdateEntry(26798, HORDE);
+                        creature->UpdateEntry(26798);
                     break;
                 }
             }
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
index 5e44d97299e..8c025c013e9 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
@@ -2709,7 +2709,7 @@ class spell_yogg_saron_revealed_tentacle : public SpellScriptLoader    // 64012
                 {
                     caster->CastSpell(caster, SPELL_TENTACLE_VOID_ZONE, true);
                     caster->CastSpell(caster, SPELL_GRIM_REPRISAL, true);
-                    caster->UpdateEntry(NPC_INFLUENCE_TENTACLE, 0, caster->GetCreatureData());
+                    caster->UpdateEntry(NPC_INFLUENCE_TENTACLE, caster->GetCreatureData());
                 }
             }
 
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
index c98a3db2334..2c25f567321 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
@@ -298,35 +298,35 @@ class instance_ulduar : public InstanceMapScript
                         break;
                     case NPC_EIVI_NIGHTFEATHER:
                         if (TeamInInstance == HORDE)
-                            creature->UpdateEntry(NPC_TOR_GREYCLOUD, HORDE);
+                            creature->UpdateEntry(NPC_TOR_GREYCLOUD);
                         break;
                     case NPC_ELLIE_NIGHTFEATHER:
                         if (TeamInInstance == HORDE)
-                            creature->UpdateEntry(NPC_KAR_GREYCLOUD, HORDE);
+                            creature->UpdateEntry(NPC_KAR_GREYCLOUD);
                         break;
                     case NPC_ELEMENTALIST_MAHFUUN:
                         if (TeamInInstance == HORDE)
-                            creature->UpdateEntry(NPC_SPIRITWALKER_TARA, HORDE);
+                            creature->UpdateEntry(NPC_SPIRITWALKER_TARA);
                         break;
                     case NPC_ELEMENTALIST_AVUUN:
                         if (TeamInInstance == HORDE)
-                            creature->UpdateEntry(NPC_SPIRITWALKER_YONA, HORDE);
+                            creature->UpdateEntry(NPC_SPIRITWALKER_YONA);
                         break;
                     case NPC_MISSY_FLAMECUFFS:
                         if (TeamInInstance == HORDE)
-                            creature->UpdateEntry(NPC_AMIRA_BLAZEWEAVER, HORDE);
+                            creature->UpdateEntry(NPC_AMIRA_BLAZEWEAVER);
                         break;
                     case NPC_SISSY_FLAMECUFFS:
                         if (TeamInInstance == HORDE)
-                            creature->UpdateEntry(NPC_VEESHA_BLAZEWEAVER, HORDE);
+                            creature->UpdateEntry(NPC_VEESHA_BLAZEWEAVER);
                         break;
                     case NPC_FIELD_MEDIC_PENNY:
                         if (TeamInInstance == HORDE)
-                            creature->UpdateEntry(NPC_BATTLE_PRIEST_ELIZA, HORDE);
+                            creature->UpdateEntry(NPC_BATTLE_PRIEST_ELIZA);
                         break;
                     case NPC_FIELD_MEDIC_JESSI:
                         if (TeamInInstance == HORDE)
-                            creature->UpdateEntry(NPC_BATTLE_PRIEST_GINA, HORDE);
+                            creature->UpdateEntry(NPC_BATTLE_PRIEST_GINA);
                         break;
 
                     case NPC_THORIM:
diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp
index ea9ebbdc15c..6e6f100c106 100644
--- a/src/server/scripts/Northrend/zone_borean_tundra.cpp
+++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp
@@ -1085,7 +1085,7 @@ public:
                     case 2:
                         if (talbot)
                         {
-                            talbot->UpdateEntry(NPC_PRINCE_VALANAR, ALLIANCE);
+                            talbot->UpdateEntry(NPC_PRINCE_VALANAR);
                             talbot->setFaction(14);
                             talbot->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                             talbot->SetReactState(REACT_PASSIVE);
@@ -1630,19 +1630,18 @@ public:
             {
                 EnterEvadeMode(); //We make sure that the npc is not attacking the player!
                 me->SetReactState(REACT_PASSIVE);
-                StartFollow(pCaster->ToPlayer(), 0, NULL);
-                me->UpdateEntry(NPC_CAPTURED_BERLY_SORCERER, TEAM_NEUTRAL);
+                StartFollow(pCaster->ToPlayer());
+                me->UpdateEntry(NPC_CAPTURED_BERLY_SORCERER);
                 DoCast(me, SPELL_COSMETIC_ENSLAVE_CHAINS_SELF, true);
 
                 if (Player* player = pCaster->ToPlayer())
-                    player->KilledMonsterCredit(NPC_CAPTURED_BERLY_SORCERER, 0);
+                    player->KilledMonsterCredit(NPC_CAPTURED_BERLY_SORCERER);
 
                 bEnslaved = true;
             }
         }
 
         void MoveInLineOfSight(Unit* who) OVERRIDE
-
         {
             FollowerAI::MoveInLineOfSight(who);
 
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
index 41cd17e1afd..3cfe765493f 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
@@ -82,15 +82,15 @@ uint32 OPvPCapturePointNA::GetControllingFaction() const
 
 void OPvPCapturePointNA::SpawnNPCsForTeam(uint32 team)
 {
-    const creature_type * creatures = NULL;
+    creature_type const* creatures = nullptr;
     if (team == ALLIANCE)
-        creatures=AllianceControlNPCs;
+        creatures = AllianceControlNPCs;
     else if (team == HORDE)
-        creatures=HordeControlNPCs;
+        creatures = HordeControlNPCs;
     else
         return;
     for (int i = 0; i < NA_CONTROL_NPC_NUM; ++i)
-        AddCreature(i, creatures[i].entry, creatures[i].teamval, creatures[i].map, creatures[i].x, creatures[i].y, creatures[i].z, creatures[i].o, 1000000);
+        AddCreature(i, creatures[i].entry, creatures[i].map, creatures[i].x, creatures[i].y, creatures[i].z, creatures[i].o, OutdoorPvP::GetTeamIdByTeam(team), 1000000);
 }
 
 void OPvPCapturePointNA::DeSpawnNPCs()
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
index cc32397741c..011775e1715 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
@@ -183,50 +183,50 @@ enum ControlNPCTypes
 
 const creature_type HordeControlNPCs[NA_CONTROL_NPC_NUM] =
 {
-    {18816, 67, 530, -1523.92f, 7951.76f, -17.6942f, 3.51172f},
-    {18821, 67, 530, -1527.75f, 7952.46f, -17.6948f, 3.99317f},
-    {21474, 67, 530, -1520.14f, 7927.11f, -20.2527f, 3.39389f},
-    {21484, 67, 530, -1524.84f, 7930.34f, -20.182f, 3.6405f},
-    {21483, 67, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f},
-    {18192, 67, 530, -1654.06f, 8000.46f, -26.59f, 3.37f},
-    {18192, 67, 530, -1487.18f, 7899.1f, -19.53f, 0.954f},
-    {18192, 67, 530, -1480.88f, 7908.79f, -19.19f, 4.485f},
-    {18192, 67, 530, -1540.56f, 7995.44f, -20.45f, 0.947f},
-    {18192, 67, 530, -1546.95f, 8000.85f, -20.72f, 6.035f},
-    {18192, 67, 530, -1595.31f, 7860.53f, -21.51f, 3.747f},
-    {18192, 67, 530, -1642.31f, 7995.59f, -25.8f, 3.317f},
-    {18192, 67, 530, -1545.46f, 7995.35f, -20.63f, 1.094f},
-    {18192, 67, 530, -1487.58f, 7907.99f, -19.27f, 5.567f},
-    {18192, 67, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f},
-    {18192, 67, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f},
-    {18192, 67, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f},
-    {18192, 67, 530, -1550.6f, 7944.45f, -21.63f, 3.559f},
-    {18192, 67, 530, -1545.57f, 7935.83f, -21.13f, 3.448f},
-    {18192, 67, 530, -1550.86f, 7937.56f, -21.7f, 3.801f}
+    {18816, 530, -1523.92f, 7951.76f, -17.6942f, 3.51172f},
+    {18821, 530, -1527.75f, 7952.46f, -17.6948f, 3.99317f},
+    {21474, 530, -1520.14f, 7927.11f, -20.2527f, 3.39389f},
+    {21484, 530, -1524.84f, 7930.34f, -20.182f, 3.6405f},
+    {21483, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f},
+    {18192, 530, -1654.06f, 8000.46f, -26.59f, 3.37f},
+    {18192, 530, -1487.18f, 7899.1f, -19.53f, 0.954f},
+    {18192, 530, -1480.88f, 7908.79f, -19.19f, 4.485f},
+    {18192, 530, -1540.56f, 7995.44f, -20.45f, 0.947f},
+    {18192, 530, -1546.95f, 8000.85f, -20.72f, 6.035f},
+    {18192, 530, -1595.31f, 7860.53f, -21.51f, 3.747f},
+    {18192, 530, -1642.31f, 7995.59f, -25.8f, 3.317f},
+    {18192, 530, -1545.46f, 7995.35f, -20.63f, 1.094f},
+    {18192, 530, -1487.58f, 7907.99f, -19.27f, 5.567f},
+    {18192, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f},
+    {18192, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f},
+    {18192, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f},
+    {18192, 530, -1550.6f, 7944.45f, -21.63f, 3.559f},
+    {18192, 530, -1545.57f, 7935.83f, -21.13f, 3.448f},
+    {18192, 530, -1550.86f, 7937.56f, -21.7f, 3.801f}
 };
 
 const creature_type AllianceControlNPCs[NA_CONTROL_NPC_NUM] =
 {
-    {18817, 469, 530, -1591.18f, 8020.39f, -22.2042f, 4.59022f},
-    {18822, 469, 530, -1588.0f, 8019.0f, -22.2042f, 4.06662f},
-    {21485, 469, 530, -1521.93f, 7927.37f, -20.2299f, 3.24631f},
-    {21487, 469, 530, -1540.33f, 7971.95f, -20.7186f, 3.07178f},
-    {21488, 469, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f},
-    {18256, 469, 530, -1654.06f, 8000.46f, -26.59f, 3.37f},
-    {18256, 469, 530, -1487.18f, 7899.1f, -19.53f, 0.954f},
-    {18256, 469, 530, -1480.88f, 7908.79f, -19.19f, 4.485f},
-    {18256, 469, 530, -1540.56f, 7995.44f, -20.45f, 0.947f},
-    {18256, 469, 530, -1546.95f, 8000.85f, -20.72f, 6.035f},
-    {18256, 469, 530, -1595.31f, 7860.53f, -21.51f, 3.747f},
-    {18256, 469, 530, -1642.31f, 7995.59f, -25.8f, 3.317f},
-    {18256, 469, 530, -1545.46f, 7995.35f, -20.63f, 1.094f},
-    {18256, 469, 530, -1487.58f, 7907.99f, -19.27f, 5.567f},
-    {18256, 469, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f},
-    {18256, 469, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f},
-    {18256, 469, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f},
-    {18256, 469, 530, -1603.75f, 8000.36f, -24.18f, 4.516f},
-    {18256, 469, 530, -1585.73f, 7994.68f, -23.29f, 4.439f},
-    {18256, 469, 530, -1595.5f, 7991.27f, -23.53f, 4.738f}
+    {18817, 530, -1591.18f, 8020.39f, -22.2042f, 4.59022f},
+    {18822, 530, -1588.0f, 8019.0f, -22.2042f, 4.06662f},
+    {21485, 530, -1521.93f, 7927.37f, -20.2299f, 3.24631f},
+    {21487, 530, -1540.33f, 7971.95f, -20.7186f, 3.07178f},
+    {21488, 530, -1570.01f, 7993.8f, -22.4505f, 5.02655f},
+    {18256, 530, -1654.06f, 8000.46f, -26.59f, 3.37f},
+    {18256, 530, -1487.18f, 7899.1f, -19.53f, 0.954f},
+    {18256, 530, -1480.88f, 7908.79f, -19.19f, 4.485f},
+    {18256, 530, -1540.56f, 7995.44f, -20.45f, 0.947f},
+    {18256, 530, -1546.95f, 8000.85f, -20.72f, 6.035f},
+    {18256, 530, -1595.31f, 7860.53f, -21.51f, 3.747f},
+    {18256, 530, -1642.31f, 7995.59f, -25.8f, 3.317f},
+    {18256, 530, -1545.46f, 7995.35f, -20.63f, 1.094f},
+    {18256, 530, -1487.58f, 7907.99f, -19.27f, 5.567f},
+    {18256, 530, -1651.54f, 7988.56f, -26.5289f, 2.98451f},
+    {18256, 530, -1602.46f, 7866.43f, -22.1177f, 4.74729f},
+    {18256, 530, -1591.22f, 7875.29f, -22.3536f, 4.34587f},
+    {18256, 530, -1603.75f, 8000.36f, -24.18f, 4.516f},
+    {18256, 530, -1585.73f, 7994.68f, -23.29f, 4.439f},
+    {18256, 530, -1595.5f, 7991.27f, -23.53f, 4.738f}
 };
 
 enum WyvernStates
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
index df526ed068d..8063d4fc090 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
@@ -256,8 +256,8 @@ OPvPCapturePointZM_GraveYard::OPvPCapturePointZM_GraveYard(OutdoorPvP* pvp)
     m_GraveYardState = ZM_GRAVEYARD_N;
     m_FlagCarrierGUID = 0;
     // add field scouts here
-    AddCreature(ZM_ALLIANCE_FIELD_SCOUT, ZM_AllianceFieldScout.entry, ZM_AllianceFieldScout.teamval, ZM_AllianceFieldScout.map, ZM_AllianceFieldScout.x, ZM_AllianceFieldScout.y, ZM_AllianceFieldScout.z, ZM_AllianceFieldScout.o);
-    AddCreature(ZM_HORDE_FIELD_SCOUT, ZM_HordeFieldScout.entry, ZM_HordeFieldScout.teamval, ZM_HordeFieldScout.map, ZM_HordeFieldScout.x, ZM_HordeFieldScout.y, ZM_HordeFieldScout.z, ZM_HordeFieldScout.o);
+    AddCreature(ZM_ALLIANCE_FIELD_SCOUT, ZM_AllianceFieldScout.entry, ZM_AllianceFieldScout.map, ZM_AllianceFieldScout.x, ZM_AllianceFieldScout.y, ZM_AllianceFieldScout.z, ZM_AllianceFieldScout.o);
+    AddCreature(ZM_HORDE_FIELD_SCOUT, ZM_HordeFieldScout.entry, ZM_HordeFieldScout.map, ZM_HordeFieldScout.x, ZM_HordeFieldScout.y, ZM_HordeFieldScout.z, ZM_HordeFieldScout.o);
     // add neutral banner
     AddObject(0, ZM_Banner_N.entry, ZM_Banner_N.map, ZM_Banner_N.x, ZM_Banner_N.y, ZM_Banner_N.z, ZM_Banner_N.o, ZM_Banner_N.rot0, ZM_Banner_N.rot1, ZM_Banner_N.rot2, ZM_Banner_N.rot3);
 }
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
index 4b810ddb15f..fdd093a1bfe 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
@@ -52,10 +52,10 @@ const go_type ZM_Banner_H = { 182528, 530, 253.54f, 7083.81f, 36.7728f, -0.01745
 const go_type ZM_Banner_N = { 182529, 530, 253.54f, 7083.81f, 36.7728f, -0.017453f, 0.0f, 0.0f, 0.008727f, -0.999962f };
 
 // horde field scout spawn data
-const creature_type ZM_HordeFieldScout = {18564, 67, 530, 296.625f, 7818.4f, 42.6294f, 5.18363f};
+const creature_type ZM_HordeFieldScout = {18564, 530, 296.625f, 7818.4f, 42.6294f, 5.18363f};
 
 // alliance field scout spawn data
-const creature_type ZM_AllianceFieldScout = {18581, 469, 530, 374.395f, 6230.08f, 22.8351f, 0.593412f};
+const creature_type ZM_AllianceFieldScout = {18581, 530, 374.395f, 6230.08f, 22.8351f, 0.593412f};
 
 enum ZMCreatureTypes
 {