diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-03-24 14:39:29 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2024-03-28 20:23:12 +0100 |
| commit | 18b7199a47ee1ebc767c631f2c91c8e1f680d39c (patch) | |
| tree | 8ca9a4621e5f0a8568faa8859b2718f694cf7c0e /src/server/scripts/OutdoorPvP | |
| parent | 98cb0b4eaf7b66ae797dfb3c92c586adbc3ced6c (diff) | |
Core/Players: Slightly improve neutral player faction support
(cherry picked from commit 94b78ebc8b0eb09409d0db36bebfde85a1644fe8)
Diffstat (limited to 'src/server/scripts/OutdoorPvP')
| -rw-r--r-- | src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp index 65f145154b9..533e360eef6 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPHP.cpp @@ -109,7 +109,7 @@ void OutdoorPvPHP::HandlePlayerEnterZone(Player* player, uint32 zone) if (m_AllianceTowersControlled >=3) player->CastSpell(player, AllianceBuff, true); } - else + else if (player->GetTeam() == HORDE) { if (m_HordeTowersControlled >=3) player->CastSpell(player, HordeBuff, true); @@ -124,7 +124,7 @@ void OutdoorPvPHP::HandlePlayerLeaveZone(Player* player, uint32 zone) { player->RemoveAurasDueToSpell(AllianceBuff); } - else + else if (player->GetTeam() == HORDE) { player->RemoveAurasDueToSpell(HordeBuff); } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 225c039a931..b3295dc4e28 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -62,7 +62,7 @@ void OutdoorPvPNA::HandleKillImpl(Player* player, Unit* killed) player->KilledMonsterCredit(NA_CREDIT_MARKER); // 0 guid, btw it isn't even used in killedmonster function :S if (player->GetTeam() == ALLIANCE) player->CastSpell(player, NA_KILL_TOKEN_ALLIANCE, true); - else + else if (player->GetTeam() == HORDE) player->CastSpell(player, NA_KILL_TOKEN_HORDE, true); } } diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp index 1da65a99b63..82d40493cee 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPTF.cpp @@ -148,7 +148,7 @@ void OutdoorPvPTF::HandlePlayerEnterZone(Player* player, uint32 zone) if (m_AllianceTowersControlled >= TF_TOWER_NUM) player->CastSpell(player, TF_CAPTURE_BUFF, true); } - else + else if (player->GetTeam() == HORDE) { if (m_HordeTowersControlled >= TF_TOWER_NUM) player->CastSpell(player, TF_CAPTURE_BUFF, true); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 8937cddddbd..d6ec4f94d4e 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -119,7 +119,7 @@ void OutdoorPvPZM::HandlePlayerEnterZone(Player* player, uint32 zone) if (m_Graveyard->GetGraveyardState() & ZM_GRAVEYARD_A) player->CastSpell(player, ZM_CAPTURE_BUFF, true); } - else + else if (player->GetTeam() == HORDE) { if (m_Graveyard->GetGraveyardState() & ZM_GRAVEYARD_H) player->CastSpell(player, ZM_CAPTURE_BUFF, true); |