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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 3254ee328a..e2144dffb5 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 @@ -207,9 +207,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 e1369f2acc..db588bfc8e 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 @@ -202,9 +202,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 e1369f2acc..db588bfc8e 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 @@ -202,9 +202,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.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 e1369f2acc..db588bfc8e 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 @@ -202,9 +202,12 @@ 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); - summon.setCurrentHp(curHp); - summon.setCurrentMp(curMp); - summon.setLifeTimeRemaining(time); + if (summon != null) + { + summon.setCurrentHp(curHp); + summon.setCurrentMp(curMp); + summon.setLifeTimeRemaining(time); + } } } }