Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/AreaTrigger: Changed the way how AreaTriggers select enemies and friends

Browse Source
This commit is contained in:
joschiwald
2017-07-22 11:17:46 +02:00
parent 655a0b53d5
commit 080db6c99c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
View File

@@ -31,6 +31,7 @@
#include "Player.h"
#include "ScriptMgr.h"
#include "SpellInfo.h"
#include "SpellMgr.h"
#include "Spline.h"
#include "Transport.h"
#include "Unit.h"
@@ -501,17 +502,17 @@ void AreaTrigger::UpdateShape()
UpdatePolygonOrientation();
}
bool UnitFitToActionRequirement(Unit* unit, Unit* caster, AreaTriggerActionUserTypes targetType)
bool UnitFitToActionRequirement(Unit* unit, Unit* caster, AreaTriggerAction const& action)
{
switch (targetType)
switch (action.TargetType)
{
case AREATRIGGER_ACTION_USER_FRIEND:
{
return caster->IsFriendlyTo(unit);
return caster->_IsValidAssistTarget(unit, sSpellMgr->GetSpellInfo(action.Param));
}
case AREATRIGGER_ACTION_USER_ENEMY:
{
return !caster->IsFriendlyTo(unit);
return caster->_IsValidAttackTarget(unit, sSpellMgr->GetSpellInfo(action.Param));
}
case AREATRIGGER_ACTION_USER_RAID:
{
@@ -539,7 +540,7 @@ void AreaTrigger::DoActions(Unit* unit)
{
for (AreaTriggerAction const& action : GetTemplate()->Actions)
{
if (UnitFitToActionRequirement(unit, caster, action.TargetType))
if (UnitFitToActionRequirement(unit, caster, action))
{
switch (action.ActionType)
{