Use World forEach methods when possible.
This commit is contained in:
@@ -63,14 +63,14 @@ public class GetAgro extends AbstractEffect
|
||||
final Set<Integer> clans = template.getClans();
|
||||
if (clans != null)
|
||||
{
|
||||
for (Attackable nearby : World.getInstance().getVisibleObjectsInRange(effected, Attackable.class, template.getClanHelpRange()))
|
||||
World.getInstance().forEachVisibleObjectInRange(effected, Attackable.class, template.getClanHelpRange(), nearby ->
|
||||
{
|
||||
if (!nearby.isMovementDisabled() && nearby.getTemplate().isClan(clans))
|
||||
{
|
||||
nearby.addDamageHate(effector, 1, 200);
|
||||
nearby.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effector);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -419,11 +419,14 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
_isTargetable = targetable;
|
||||
if (!targetable)
|
||||
{
|
||||
World.getInstance().getVisibleObjects(this, Creature.class, creature -> this == creature.getTarget()).forEach(creature ->
|
||||
World.getInstance().forEachVisibleObject(this, Creature.class, creature ->
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user