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

Fixed restoring multiple summons.

Browse Source
This commit is contained in:
MobiusDevelopment 2020-06-06 05:54:45 +00:00
parent 2ed402df38
commit 381abc4cb2
30 changed files with 60 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

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

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_2.5_Underground/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

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

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_3.0_Helios/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

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

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_4.0_GrandCrusade/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

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

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_5.0_Salvation/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

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

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_5.5_EtinasFate/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

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

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_6.0_Fafurion/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

7
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_7.0_PreludeOfWar/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

7
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_Classic_2.0_Saviors/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

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

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_Classic_2.1_Zaken/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

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

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_Classic_2.2_Antharas/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

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

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

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

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

7
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_Classic_3.0_TheKamael/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

7
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)

2
L2J_Mobius_Classic_Interlude/dist/db_installer/sql/game/character_summons.sql vendored
View File

@ -6,5 +6,5 @@ CREATE TABLE IF NOT EXISTS `character_summons` (
`curHp` int(9) unsigned DEFAULT '0', `curHp` int(9) unsigned DEFAULT '0',
`curMp` int(9) unsigned DEFAULT '0', `curMp` int(9) unsigned DEFAULT '0',
`time` int(10) unsigned NOT NULL DEFAULT '0', `time` int(10) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`ownerId`,`summonSkillId`) PRIMARY KEY (`ownerId`,`summonId`,`summonSkillId`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci; ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;

7
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/impl/CharSummonTable.java
View File

@ -196,13 +196,12 @@ 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(player, summonObjId);
skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId)); skill = SkillData.getInstance().getSkill(skillId, player.getSkillLevel(skillId));
if (skill == null) if (skill == null)
{ {
removeServitor(player, summonObjId);
return; return;
} }
skill.applyEffects(player, player); skill.applyEffects(player, player);
if (player.hasServitors()) if (player.hasServitors())
@ -223,7 +222,7 @@ public class CharSummonTable
public void saveSummon(ServitorInstance summon) public void saveSummon(ServitorInstance summon)
{ {
if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) if (summon == null)
{ {
return; return;
} }
@ -238,7 +237,7 @@ public class CharSummonTable
ps.setInt(3, summon.getReferenceSkill()); ps.setInt(3, summon.getReferenceSkill());
ps.setInt(4, (int) Math.round(summon.getCurrentHp())); ps.setInt(4, (int) Math.round(summon.getCurrentHp()));
ps.setInt(5, (int) Math.round(summon.getCurrentMp())); ps.setInt(5, (int) Math.round(summon.getCurrentMp()));
ps.setInt(6, summon.getLifeTimeRemaining()); ps.setInt(6, Math.max(0, summon.getLifeTimeRemaining()));
ps.execute(); ps.execute();
} }
catch (Exception e) catch (Exception e)