Restoring servitor must remove database record at all times.

This commit is contained in:
MobiusDev 2018-04-02 13:47:29 +00:00
parent 40558fe87b
commit 317478a66d
6 changed files with 6 additions and 12 deletions

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);