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

12
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java vendored
View File

@@ -96,17 +96,17 @@ public class AirBind extends AbstractEffect
{
ACTIVE_AIRBINDS.add(effected);
for (PlayerInstance nearbyPlayer : World.getInstance().getVisibleObjectsInRange(effected, PlayerInstance.class, 1200))
World.getInstance().forEachVisibleObjectInRange(effected, PlayerInstance.class, 1200, nearby ->
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
if ((nearby.getRace() != Race.ERTHEIA) && (nearby.getTarget() == effected) && nearby.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearby.isAlterSkillActive())
{
final int chainSkill = AIRBIND_SKILLS.get(nearbyPlayer.getClassId()).intValue();
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
final int chainSkill = AIRBIND_SKILLS.get(nearby.getClassId()).intValue();
if (nearby.getSkillRemainingReuseTime(chainSkill) == -1)
{
nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 5));
nearby.sendPacket(new ExAlterSkillRequest(nearby, chainSkill, chainSkill, 5));
}
}
}
});
}
}

4
L2J_Mobius_3.0_Helios/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);
}
}
});
}
}
}

12
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -175,17 +175,17 @@ public class KnockBack extends AbstractEffect
effected.broadcastPacket(new ValidateLocation(effected));
effected.revalidateZone(true);
for (PlayerInstance nearbyPlayer : World.getInstance().getVisibleObjectsInRange(effected, PlayerInstance.class, 1200))
World.getInstance().forEachVisibleObjectInRange(effected, PlayerInstance.class, 1200, nearby ->
{
if ((nearbyPlayer.getRace() != Race.ERTHEIA) && (nearbyPlayer.getTarget() == effected) && nearbyPlayer.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearbyPlayer.isAlterSkillActive())
if ((nearby.getRace() != Race.ERTHEIA) && (nearby.getTarget() == effected) && nearby.isInCategory(CategoryType.SIXTH_CLASS_GROUP) && !nearby.isAlterSkillActive())
{
final int chainSkill = KNOCKBACK_SKILLS.get(nearbyPlayer.getClassId()).intValue();
if (nearbyPlayer.getSkillRemainingReuseTime(chainSkill) == -1)
final int chainSkill = KNOCKBACK_SKILLS.get(nearby.getClassId()).intValue();
if (nearby.getSkillRemainingReuseTime(chainSkill) == -1)
{
nearbyPlayer.sendPacket(new ExAlterSkillRequest(nearbyPlayer, chainSkill, chainSkill, 3));
nearby.sendPacket(new ExAlterSkillRequest(nearby, chainSkill, chainSkill, 3));
}
}
}
});
}
}
}