Use World forEach methods when possible.
This commit is contained in:
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -66,14 +66,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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -66,14 +66,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);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -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 ->
|
||||
{
|
||||
if (creature.getTarget() == this)
|
||||
{
|
||||
creature.setTarget(null);
|
||||
creature.abortAttack();
|
||||
creature.abortCast();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user