lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed restoring summons on login.

Browse Source
This commit is contained in:
MobiusDev
2018-04-02 13:44:23 +00:00
parent 711581a2bc
commit 40558fe87b
6 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@@ -197,21 +197,24 @@ public class CharSummonTable
final int time = rs.getInt("time"); final int time = rs.getInt("time");
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if ((skill == null) || !activeChar.hasServitor(summonObjId)) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
removeServitor(activeChar, summonObjId);
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId);
if (summon != null)
{
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);
} }
} }
} }
}
catch (SQLException e) catch (SQLException e)
{ {
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e); LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

7
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@@ -197,21 +197,24 @@ public class CharSummonTable
final int time = rs.getInt("time"); final int time = rs.getInt("time");
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if ((skill == null) || !activeChar.hasServitor(summonObjId)) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
removeServitor(activeChar, summonObjId);
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId);
if (summon != null)
{
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);
} }
} }
} }
}
catch (SQLException e) catch (SQLException e)
{ {
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e); LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

7
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@@ -197,21 +197,24 @@ public class CharSummonTable
final int time = rs.getInt("time"); final int time = rs.getInt("time");
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if ((skill == null) || !activeChar.hasServitor(summonObjId)) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
removeServitor(activeChar, summonObjId);
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId);
if (summon != null)
{
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);
} }
} }
} }
}
catch (SQLException e) catch (SQLException e)
{ {
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e); LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

7
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@@ -197,21 +197,24 @@ public class CharSummonTable
final int time = rs.getInt("time"); final int time = rs.getInt("time");
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if ((skill == null) || !activeChar.hasServitor(summonObjId)) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
removeServitor(activeChar, summonObjId);
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId);
if (summon != null)
{
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);
} }
} }
} }
}
catch (SQLException e) catch (SQLException e)
{ {
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e); LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

7
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@@ -197,21 +197,24 @@ public class CharSummonTable
final int time = rs.getInt("time"); final int time = rs.getInt("time");
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if ((skill == null) || !activeChar.hasServitor(summonObjId)) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
removeServitor(activeChar, summonObjId);
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId);
if (summon != null)
{
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);
} }
} }
} }
}
catch (SQLException e) catch (SQLException e)
{ {
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e); LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

7
L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@@ -197,21 +197,24 @@ public class CharSummonTable
final int time = rs.getInt("time"); final int time = rs.getInt("time");
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if ((skill == null) || !activeChar.hasServitor(summonObjId)) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
removeServitor(activeChar, summonObjId);
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId);
if (summon != null)
{
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);
} }
} }
} }
}
catch (SQLException e) catch (SQLException e)
{ {
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e); LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);