Core/Misc: Kill AnyPlayerInObjectRangeCheck (duplicate of AnyUnitInObjectRangeCheck)

Port From (https://github.com/TrinityCore/TrinityCore/commit/0f9a0accf17ba3a9f20d6a7575b51ed2cb09a73c)
This commit is contained in:
Hondacrx
2025-08-18 10:07:50 -04:00
parent b444c2f23c
commit 2bbd77bd94
5 changed files with 30 additions and 56 deletions
@@ -638,7 +638,7 @@ namespace Game.Entities
else
{
// Environmental trap: Any player
var check = new AnyPlayerInObjectRangeCheck(this, radius);
var check = new AnyUnitInObjectRangeCheck(this, radius);
var searcher = new PlayerSearcher(this, check);
Cell.VisitWorldObjects(this, searcher, radius);
target = searcher.GetTarget();
+8 -10
View File
@@ -3025,7 +3025,7 @@ namespace Game.Entities
public List<Player> GetPlayerListInGrid(float maxSearchRange, bool alive = true)
{
List<Player> playerList = new();
var checker = new AnyPlayerInObjectRangeCheck(this, maxSearchRange, alive);
var checker = new AnyUnitInObjectRangeCheck(this, maxSearchRange, alive);
var searcher = new PlayerListSearcher(this, playerList, checker);
Cell.VisitWorldObjects(this, searcher, maxSearchRange);
@@ -3116,26 +3116,24 @@ namespace Game.Entities
if (!IsInWorld)
return;
List<Player> targets = new();
var check = new AnyPlayerInObjectRangeCheck(this, GetVisibilityRange(), false);
var searcher = new PlayerListSearcher(this, targets, check);
Cell.VisitWorldObjects(this, searcher, GetVisibilityRange());
foreach (Player player in targets)
void destroyer(Player player)
{
if (player == this)
continue;
return;
if (!player.HaveAtClient(this))
continue;
return;
Unit unit = ToUnit();
if (unit != null && unit.GetCharmerGUID() == player.GetGUID())// @todo this is for puppet
continue;
return;
DestroyForPlayer(player);
player.m_clientGUIDs.Remove(GetGUID());
}
PlayerDistWorker worker = new(this, GetVisibilityRange(), destroyer);
Cell.VisitWorldObjects(this, worker, GetVisibilityRange());
}
public virtual void UpdateObjectVisibility(bool force = true)
+9 -27
View File
@@ -920,13 +920,20 @@ namespace Game.Maps
{
WorldObject i_searcher;
float i_dist;
IDoWork<Player> _do;
Action<Player> _do;
public PlayerDistWorker(WorldObject searcher, float _dist, IDoWork<Player> @do)
{
i_searcher = searcher;
i_dist = _dist;
_do = @do;
_do = @do.Invoke;
}
public PlayerDistWorker(WorldObject searcher, float _dist, Action<Player> destroyer)
{
i_searcher = searcher;
i_dist = _dist;
_do = destroyer;
}
public override void Visit(IList<Player> objs)
@@ -2604,31 +2611,6 @@ namespace Game.Maps
}
}
public class AnyPlayerInObjectRangeCheck : ICheck<Player>
{
public AnyPlayerInObjectRangeCheck(WorldObject obj, float range, bool reqAlive = true)
{
_obj = obj;
_range = range;
_reqAlive = reqAlive;
}
public bool Invoke(Player pl)
{
if (_reqAlive && !pl.IsAlive())
return false;
if (!_obj.IsWithinDist(pl, _range))
return false;
return true;
}
WorldObject _obj;
float _range;
bool _reqAlive;
}
class AnyPlayerInPositionRangeCheck : ICheck<Player>
{
public AnyPlayerInPositionRangeCheck(Position pos, float range, bool reqAlive = true)