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

Core/Misc: don't allow FindNearestCreature() and FindNearestGameObject() searches to return the entity that called them.

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/2bcfc6680c899ac4e94d71c7b864379ce69f9654)
This commit is contained in:
hondacrx
2021-12-22 20:16:49 -05:00
parent 6a295f7fe4
commit 79e33b6a4a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/GridNotifiers.cs
+2 -2
View File
@@ -2351,7 +2351,7 @@ namespace Game.Maps
public bool Invoke(Creature u) public bool Invoke(Creature u)
{ {
if (u.GetDeathState() != DeathState.Dead && u.GetEntry() == i_entry && u.IsAlive() == i_alive && i_obj.IsWithinDistInMap(u, i_range) && u.CheckPrivateObjectOwnerVisibility(i_obj)) if (u.GetDeathState() != DeathState.Dead && u.GetEntry() == i_entry && u.IsAlive() == i_alive && u.GetGUID() != i_obj.GetGUID() && i_obj.IsWithinDistInMap(u, i_range) && u.CheckPrivateObjectOwnerVisibility(i_obj))
{ {
i_range = i_obj.GetDistance(u); // use found unit range as new range limit for next check i_range = i_obj.GetDistance(u); // use found unit range as new range limit for next check
return true; return true;
@@ -2740,7 +2740,7 @@ namespace Game.Maps
public bool Invoke(GameObject go) public bool Invoke(GameObject go)
{ {
if (go.GetEntry() == i_entry && i_obj.IsWithinDistInMap(go, i_range)) if (go.GetEntry() == i_entry && go.GetGUID() != i_obj.GetGUID() && i_obj.IsWithinDistInMap(go, i_range))
{ {
i_range = i_obj.GetDistance(go); // use found GO range as new range limit for next check i_range = i_obj.GetDistance(go); // use found GO range as new range limit for next check
return true; return true;