From e9246a2a21f9f3111f313d14ec72227bd0fc937f Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 8 Jan 2023 18:44:05 +0000
Subject: [PATCH] Removed stream usage from CharSummonTable.

---
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 .../gameserver/data/sql/CharSummonTable.java  | 23 +++++++++++++++----
 26 files changed, 468 insertions(+), 130 deletions(-)

diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index e2144dffb5..41ddb5eb0e 100644
--- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -33,6 +33,7 @@ import org.l2jmobius.gameserver.data.xml.PetDataTable;
 import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -206,12 +207,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index db588bfc8e..5ad71b2bd8 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.EvolveLevel;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -201,12 +202,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index db588bfc8e..5ad71b2bd8 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.EvolveLevel;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -201,12 +202,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index db588bfc8e..5ad71b2bd8 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.EvolveLevel;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -201,12 +202,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}
diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
index db588bfc8e..5ad71b2bd8 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
+++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
@@ -34,6 +34,7 @@ import org.l2jmobius.gameserver.data.xml.SkillData;
 import org.l2jmobius.gameserver.enums.EvolveLevel;
 import org.l2jmobius.gameserver.model.PetData;
 import org.l2jmobius.gameserver.model.actor.Player;
+import org.l2jmobius.gameserver.model.actor.Summon;
 import org.l2jmobius.gameserver.model.actor.instance.Pet;
 import org.l2jmobius.gameserver.model.actor.instance.Servitor;
 import org.l2jmobius.gameserver.model.actor.templates.NpcTemplate;
@@ -201,12 +202,24 @@ public class CharSummonTable
 					
 					if (player.hasServitors())
 					{
-						final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
-						if (summon != null)
+						Servitor servitor = null;
+						for (Summon summon : player.getServitors().values())
 						{
-							summon.setCurrentHp(curHp);
-							summon.setCurrentMp(curMp);
-							summon.setLifeTimeRemaining(time);
+							if (summon instanceof Servitor)
+							{
+								final Servitor s = (Servitor) summon;
+								if (s.getReferenceSkill() == skillId)
+								{
+									servitor = s;
+									break;
+								}
+							}
+						}
+						if (servitor != null)
+						{
+							servitor.setCurrentHp(curHp);
+							servitor.setCurrentMp(curMp);
+							servitor.setLifeTimeRemaining(time);
 						}
 					}
 				}