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

4 files changed, 48 insertions, 48 deletions

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
 {