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

Changed restore method at CharSummonTable.

Browse Source
This commit is contained in:
MobiusDev 2019-02-17 16:14:41 +00:00
parent 2cb58f8c73
commit 6098ba5317
10 changed files with 40 additions and 30 deletions
Show Stats 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

@ -196,17 +196,18 @@ public class CharSummonTable
final int curMp = rs.getInt("curMp"); final int curMp = rs.getInt("curMp");
final int time = rs.getInt("time"); final int time = rs.getInt("time");
removeServitor(activeChar, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); if (activeChar.hasServitors())
if (summon != null)
{ {
final L2ServitorInstance summon = activeChar.getServitors().values().stream().map(s -> ((L2ServitorInstance) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);

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

@ -196,17 +196,18 @@ public class CharSummonTable
final int curMp = rs.getInt("curMp"); final int curMp = rs.getInt("curMp");
final int time = rs.getInt("time"); final int time = rs.getInt("time");
removeServitor(activeChar, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); if (activeChar.hasServitors())
if (summon != null)
{ {
final L2ServitorInstance summon = activeChar.getServitors().values().stream().map(s -> ((L2ServitorInstance) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);

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

@ -196,17 +196,18 @@ public class CharSummonTable
final int curMp = rs.getInt("curMp"); final int curMp = rs.getInt("curMp");
final int time = rs.getInt("time"); final int time = rs.getInt("time");
removeServitor(activeChar, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); if (activeChar.hasServitors())
if (summon != null)
{ {
final L2ServitorInstance summon = activeChar.getServitors().values().stream().map(s -> ((L2ServitorInstance) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);

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

@ -196,17 +196,18 @@ public class CharSummonTable
final int curMp = rs.getInt("curMp"); final int curMp = rs.getInt("curMp");
final int time = rs.getInt("time"); final int time = rs.getInt("time");
removeServitor(activeChar, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); if (activeChar.hasServitors())
if (summon != null)
{ {
final L2ServitorInstance summon = activeChar.getServitors().values().stream().map(s -> ((L2ServitorInstance) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);

7
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@ -196,17 +196,18 @@ public class CharSummonTable
final int curMp = rs.getInt("curMp"); final int curMp = rs.getInt("curMp");
final int time = rs.getInt("time"); final int time = rs.getInt("time");
removeServitor(activeChar, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); if (activeChar.hasServitors())
if (summon != null)
{ {
final L2ServitorInstance summon = activeChar.getServitors().values().stream().map(s -> ((L2ServitorInstance) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);

7
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@ -196,17 +196,18 @@ public class CharSummonTable
final int curMp = rs.getInt("curMp"); final int curMp = rs.getInt("curMp");
final int time = rs.getInt("time"); final int time = rs.getInt("time");
removeServitor(activeChar, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); if (activeChar.hasServitors())
if (summon != null)
{ {
final L2ServitorInstance summon = activeChar.getServitors().values().stream().map(s -> ((L2ServitorInstance) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);

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

@ -196,17 +196,18 @@ public class CharSummonTable
final int curMp = rs.getInt("curMp"); final int curMp = rs.getInt("curMp");
final int time = rs.getInt("time"); final int time = rs.getInt("time");
removeServitor(activeChar, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); if (activeChar.hasServitors())
if (summon != null)
{ {
final L2ServitorInstance summon = activeChar.getServitors().values().stream().map(s -> ((L2ServitorInstance) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);

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

@ -196,17 +196,18 @@ public class CharSummonTable
final int curMp = rs.getInt("curMp"); final int curMp = rs.getInt("curMp");
final int time = rs.getInt("time"); final int time = rs.getInt("time");
removeServitor(activeChar, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); if (activeChar.hasServitors())
if (summon != null)
{ {
final L2ServitorInstance summon = activeChar.getServitors().values().stream().map(s -> ((L2ServitorInstance) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);

7
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@ -196,17 +196,18 @@ public class CharSummonTable
final int curMp = rs.getInt("curMp"); final int curMp = rs.getInt("curMp");
final int time = rs.getInt("time"); final int time = rs.getInt("time");
removeServitor(activeChar, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); if (activeChar.hasServitors())
if (summon != null)
{ {
final L2ServitorInstance summon = activeChar.getServitors().values().stream().map(s -> ((L2ServitorInstance) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);

7
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@ -196,17 +196,18 @@ public class CharSummonTable
final int curMp = rs.getInt("curMp"); final int curMp = rs.getInt("curMp");
final int time = rs.getInt("time"); final int time = rs.getInt("time");
removeServitor(activeChar, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(activeChar, summonObjId);
return; return;
} }
skill.applyEffects(activeChar, activeChar); skill.applyEffects(activeChar, activeChar);
final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getServitor(summonObjId); if (activeChar.hasServitors())
if (summon != null)
{ {
final L2ServitorInstance summon = activeChar.getServitors().values().stream().map(s -> ((L2ServitorInstance) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
summon.setCurrentHp(curHp); summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp); summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time); summon.setLifeTimeRemaining(time);