diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index b3e0609108..b174f935ff 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 	
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index ce5599a94f..dafe04d202 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 }
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index b3e0609108..b174f935ff 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index ce5599a94f..dafe04d202 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 }
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index b3e0609108..b174f935ff 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index ce5599a94f..dafe04d202 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 }
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index b3e0609108..b174f935ff 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index ce5599a94f..dafe04d202 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 }
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index b3e0609108..b174f935ff 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 	
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index ce5599a94f..dafe04d202 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 }
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index b3e0609108..b174f935ff 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 	
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index ce5599a94f..dafe04d202 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 }
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index b3e0609108..b174f935ff 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 	
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index ce5599a94f..dafe04d202 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 }
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
index b3e0609108..b174f935ff 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/AirBind.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 	
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
index ce5599a94f..dafe04d202 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java
@@ -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));
 					}
 				}
-			}
+			});
 		}
 	}
 }
diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index bdc324cc65..e1a3b2d998 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java
index afcf03b889..652a9c0030 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/World.java
@@ -532,7 +532,7 @@ public class World
 			if (oldRegion.isSurroundingRegion(worldRegion))
 			{
 				continue;
-			} 
+			}
 			
 			final List<WorldObject> visibleObjects = worldRegion.getVisibleObjects();
 			for (int j = 0; j < visibleObjects.size(); j++)
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index bdc324cc65..e1a3b2d998 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java
index afcf03b889..652a9c0030 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/World.java
@@ -532,7 +532,7 @@ public class World
 			if (oldRegion.isSurroundingRegion(worldRegion))
 			{
 				continue;
-			} 
+			}
 			
 			final List<WorldObject> visibleObjects = worldRegion.getVisibleObjects();
 			for (int j = 0; j < visibleObjects.size(); j++)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
index 9181fb919c..a855275446 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/GetAgro.java
@@ -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);
 					}
-				}
+				});
 			}
 		}
 	}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
index 3b8f7fb5fb..b1292dd3d4 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -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();
+					}
 				});
 			}
 		}