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

9 files changed, 56 insertions, 57 deletions

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);