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

Fixed probable CharSummonTable NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-10-01 09:49:49 +00:00
parent 445aa48832
commit a1b8557c8f
24 changed files with 144 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

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

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

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

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

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

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

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

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

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

@@ -207,6 +207,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -214,6 +216,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -202,6 +202,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -209,6 +211,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -202,6 +202,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -209,6 +211,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);

3
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/sql/CharSummonTable.java
View File

@@ -202,6 +202,8 @@ public class CharSummonTable
if (player.hasServitors())
{
final Servitor summon = player.getServitors().values().stream().map(s -> ((Servitor) s)).filter(s -> s.getReferenceSkill() == skillId).findAny().orElse(null);
if (summon != null)
{
summon.setCurrentHp(curHp);
summon.setCurrentMp(curMp);
summon.setLifeTimeRemaining(time);
@@ -209,6 +211,7 @@ public class CharSummonTable
}
}
}
}
catch (SQLException e)
{
LOGGER.warning(getClass().getSimpleName() + ": Servitor cannot be restored: " + e);