From e249bd3aeae10ec601675462d477ca6824488f25 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 8 Jan 2023 13:55:11 +0000
Subject: [PATCH] Removed stream usage from SummonExceptMaster affect scope.

---
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 .../affectscope/SummonExceptMaster.java       | 39 +++++++++++++------
 26 files changed, 728 insertions(+), 286 deletions(-)

diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 057428fb51..8c11c691f5 100644
--- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -41,15 +40,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		final int affectLimit = skill.getAffectLimit();
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 057428fb51..8c11c691f5 100644
--- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -41,15 +40,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		final int affectLimit = skill.getAffectLimit();
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}
 	
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
index 511d3b47f2..38a417c44f 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/targethandlers/affectscope/SummonExceptMaster.java
@@ -23,13 +23,12 @@ import org.l2jmobius.gameserver.handler.IAffectObjectHandler;
 import org.l2jmobius.gameserver.handler.IAffectScopeHandler;
 import org.l2jmobius.gameserver.model.WorldObject;
 import org.l2jmobius.gameserver.model.actor.Creature;
-import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.skill.Skill;
 import org.l2jmobius.gameserver.model.skill.targets.AffectScope;
 import org.l2jmobius.gameserver.util.Util;
 
 /**
- * @author Nik
+ * @author Nik, Mobius
  */
 public class SummonExceptMaster implements IAffectScopeHandler
 {
@@ -42,15 +41,33 @@ public class SummonExceptMaster implements IAffectScopeHandler
 		
 		if (target.isPlayable())
 		{
-			final Player player = target.getActingPlayer();
-			//@formatter:off
-			player.getServitorsAndPets().stream()
-			.filter(c -> !c.isDead())
-			.filter(c -> (affectRange <= 0) || Util.checkIfInRange(affectRange, c, target, true))
-			.filter(c -> (affectObject == null) || affectObject.checkAffectedObject(creature, c))
-			.limit(affectLimit > 0 ? affectLimit : Long.MAX_VALUE)
-			.forEach(action);
-			//@formatter:on
+			int count = 0;
+			final int limit = (affectLimit > 0) ? affectLimit : Integer.MAX_VALUE;
+			for (Creature c : target.getActingPlayer().getServitorsAndPets())
+			{
+				if (c.isDead())
+				{
+					continue;
+				}
+				
+				if ((affectRange > 0) && !Util.checkIfInRange(affectRange, c, target, true))
+				{
+					continue;
+				}
+				
+				if ((affectObject != null) && !affectObject.checkAffectedObject(creature, c))
+				{
+					continue;
+				}
+				
+				count++;
+				action.accept(c);
+				
+				if (count >= limit)
+				{
+					break;
+				}
+			}
 		}
 	}