DB/Conditions: quests Southern Sabotage and Toppling the Towers are only available if the respective faction is defending Wintergrasp.

Also codestyle stealthfix.
This commit is contained in:
SnapperRy
2016-10-04 15:51:44 +02:00
committed by Aokromes
parent a96ab21ee2
commit 638368f0e0
2 changed files with 8 additions and 1 deletions

View File

@@ -0,0 +1,7 @@
--
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (19, 20) AND `SourceEntry` IN (13538, 13539);
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(19, 0, 13538, 0, 0, 48, 0, 0, 0, 0, 1, 0, 0, "", "Alliance quest 'Southern Sabotage' is available if Wintergrasp is held by Alliance"),
(20, 0, 13538, 0, 0, 48, 0, 0, 0, 0, 1, 0, 0, "", "Quest mark for Alliance quest 'Southern Sabotage' is available if Wintergrasp is held by Alliance"),
(19, 0, 13539, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, "", "Horde quest 'Toppling the Towers' is available if Wintergrasp is held by Horde"),
(20, 0, 13539, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0, "", "Quest mark for Horde quest 'Toppling the Towers' is available if Wintergrasp is held by Horde");

View File

@@ -504,7 +504,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
case CONDITION_WINTERGRASP_HORDE:
{
condMeets = false;
if (object->ToPlayer())
if (object->GetTypeId() == TYPEID_PLAYER)
if (Battlefield* wintergrasp = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG))
if (wintergrasp->IsEnabled())
if (wintergrasp->GetDefenderTeam() == TEAM_HORDE)