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

Core/Entities: fix interaction of traps with ffa pvp and sanctuary flags

Browse Source
This commit is contained in:
hondacrx
2018-01-24 12:06:19 -05:00
parent 461dff9b67
commit 659080b5a5
4 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/GridNotifiers.cs
+3 -3
View File
@@ -1458,9 +1458,9 @@ namespace Game.Maps
float i_range;
}
public class NearestUnfriendlyNoTotemUnitInObjectRangeCheck : ICheck<Unit>
public class NearestAttackableNoTotemUnitInObjectRangeCheck : ICheck<Unit>
{
public NearestUnfriendlyNoTotemUnitInObjectRangeCheck(WorldObject obj, Unit funit, float range)
public NearestAttackableNoTotemUnitInObjectRangeCheck(WorldObject obj, Unit funit, float range)
{
i_obj = obj;
i_funit = funit;
@@ -1481,7 +1481,7 @@ namespace Game.Maps
if (!u.isTargetableForAttack(false))
return false;
if (!i_obj.IsWithinDistInMap(u, i_range) || i_funit.IsFriendlyTo(u))
if (!i_obj.IsWithinDistInMap(u, i_range) || i_funit._IsValidAttackTarget(u, null, i_obj))
return false;
i_range = i_obj.GetDistance(u);