Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc cleanups

Browse Source
This commit is contained in:
hondacrx
2017-07-22 10:56:15 -04:00
parent 54fc79fced
commit cbf11e07ae
14 changed files with 48 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/Entities/AreaTrigger/AreaTrigger.cs
+5 -5
View File
@@ -499,14 +499,14 @@ namespace Game.Entities
UpdatePolygonOrientation();
}
bool UnitFitToActionRequirement(Unit unit, Unit caster, AreaTriggerActionUserTypes targetType)
bool UnitFitToActionRequirement(Unit unit, Unit caster, AreaTriggerAction action)
{
switch (targetType)
switch (action.TargetType)
{
case AreaTriggerActionUserTypes.Friend:
return caster.IsFriendlyTo(unit);
return caster._IsValidAssistTarget(unit, Global.SpellMgr.GetSpellInfo(action.Param));
case AreaTriggerActionUserTypes.Enemy:
return !caster.IsFriendlyTo(unit);
return caster._IsValidAttackTarget(unit, Global.SpellMgr.GetSpellInfo(action.Param));
case AreaTriggerActionUserTypes.Raid:
return caster.IsInRaidWith(unit);
case AreaTriggerActionUserTypes.Party:
@@ -528,7 +528,7 @@ namespace Game.Entities
{
foreach (AreaTriggerAction action in GetTemplate().Actions)
{
if (UnitFitToActionRequirement(unit, caster, action.TargetType))
if (UnitFitToActionRequirement(unit, caster, action))
{
switch (action.ActionType)
{