aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGacko <gacko28@gmx.de>2013-01-12 20:23:40 +0100
committerGacko <gacko28@gmx.de>2013-01-12 20:28:12 +0100
commitda21bbe93c219f6122f8f4a04eb5ef3d5210acb9 (patch)
tree8c0ae8bfcd760e2133045a470bed21899bae648f
parent9e91bcfe40df06698300e879f6515c70e05aee5d (diff)
Core/Battleground: Eye of Storm - Fel Reaver Ruins
Make it possible to deliver the flag at Fel Reaver Ruins which was impossible before because of a big areatrigger which covered the original areatrigger for the flag point. Solves #337. Thanks to @Greymane
-rw-r--r--src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
index 4ddf7a8b052..13b41e7553e 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
@@ -247,7 +247,7 @@ void BattlegroundEY::UpdatePointStatuses()
if (player)
{
this->UpdateWorldStateForPlayer(PROGRESS_BAR_STATUS, m_PointBarStatus[point], player);
- //if point owner changed we must evoke event!
+ //if point owner changed we must evoke event!
if (pointOwnerTeamId != m_PointOwnedByTeam[point])
{
//point was uncontrolled and player is from team which captured point
@@ -258,6 +258,11 @@ void BattlegroundEY::UpdatePointStatuses()
if (m_PointState[point] == EY_POINT_UNDER_CONTROL && player->GetTeam() != m_PointOwnedByTeam[point])
this->EventTeamLostPoint(player, point);
}
+
+ if (point == FEL_REAVER && m_PointOwnedByTeam[point] == player->GetTeam())
+ if (m_FlagState && GetFlagPickerGUID() == player->GetGUID())
+ if (player->GetDistance2d(2044,1730) < 2)
+ EventPlayerCapturedFlag(player, BG_EY_OBJECT_FLAG_FEL_REAVER);
}
}
}
@@ -378,6 +383,8 @@ void BattlegroundEY::HandleAreaTrigger(Player* player, uint32 trigger)
if (!player->isAlive()) //hack code, must be removed later
return;
+
+
switch (trigger)
{
case TR_BLOOD_ELF_POINT: