From 317478a66dddd5979bfefab99128a9e0ff1fa8a7 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 2 Apr 2018 13:47:29 +0000 Subject: [PATCH] Restoring servitor must remove database record at all times. --- .../l2jmobius/gameserver/data/sql/impl/CharSummonTable.java | 3 +-- .../l2jmobius/gameserver/data/sql/impl/CharSummonTable.java | 3 +-- .../l2jmobius/gameserver/data/sql/impl/CharSummonTable.java | 3 +-- .../l2jmobius/gameserver/data/sql/impl/CharSummonTable.java | 3 +-- .../l2jmobius/gameserver/data/sql/impl/CharSummonTable.java | 3 +-- .../l2jmobius/gameserver/data/sql/impl/CharSummonTable.java | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java index cb3bf87122..021a434a38 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java @@ -196,13 +196,12 @@ public class CharSummonTable final int curMp = rs.getInt("curMp"); final int time = rs.getInt("time"); + removeServitor(activeChar, summonObjId); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); if (skill == null) { return; } - removeServitor(activeChar, summonObjId); - skill.applyEffects(activeChar, activeChar); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java index cb3bf87122..021a434a38 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java @@ -196,13 +196,12 @@ public class CharSummonTable final int curMp = rs.getInt("curMp"); final int time = rs.getInt("time"); + removeServitor(activeChar, summonObjId); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); if (skill == null) { return; } - removeServitor(activeChar, summonObjId); - skill.applyEffects(activeChar, activeChar); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java index cb3bf87122..021a434a38 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java @@ -196,13 +196,12 @@ public class CharSummonTable final int curMp = rs.getInt("curMp"); final int time = rs.getInt("time"); + removeServitor(activeChar, summonObjId); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); if (skill == null) { return; } - removeServitor(activeChar, summonObjId); - skill.applyEffects(activeChar, activeChar); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java index cb3bf87122..021a434a38 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java @@ -196,13 +196,12 @@ public class CharSummonTable final int curMp = rs.getInt("curMp"); final int time = rs.getInt("time"); + removeServitor(activeChar, summonObjId); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); if (skill == null) { return; } - removeServitor(activeChar, summonObjId); - skill.applyEffects(activeChar, activeChar); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java index cb3bf87122..021a434a38 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java @@ -196,13 +196,12 @@ public class CharSummonTable final int curMp = rs.getInt("curMp"); final int time = rs.getInt("time"); + removeServitor(activeChar, summonObjId); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); if (skill == null) { return; } - removeServitor(activeChar, summonObjId); - skill.applyEffects(activeChar, activeChar); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java index cb3bf87122..021a434a38 100644 --- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java +++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java @@ -196,13 +196,12 @@ public class CharSummonTable final int curMp = rs.getInt("curMp"); final int time = rs.getInt("time"); + removeServitor(activeChar, summonObjId); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); if (skill == null) { return; } - removeServitor(activeChar, summonObjId); - skill.applyEffects(activeChar, activeChar); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId);