lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use World forEach methods when possible.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-09-02 21:32:31 +00:00
parent 0790f3d43b
commit e47e7d2759
50 changed files with 237 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java vendored
View File

@@ -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);
}
}
});
}
}
}

11
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
View File

@@ -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();
}
});
}
}