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

Prevent NPE from missing symbol seal data.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-07-02 21:13:42 +00:00
parent 2dbb12a234
commit 5737d9353e
10 changed files with 100 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SymbolSealData.java
View File

@@ -80,7 +80,16 @@ public class SymbolSealData implements IXmlReader
public Skill getSkill(int classId, int symbolId) public Skill getSkill(int classId, int symbolId)
{ {
return _data.get(classId).get(symbolId).getSkill(); final List<SymbolSealHolder> data = _data.get(classId);
if (data != null)
{
final SymbolSealHolder symbol = data.get(symbolId);
if (symbol != null)
{
return symbol.getSkill();
}
}
return null;
} }
public static SymbolSealData getInstance() public static SymbolSealData getInstance()

12
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -6863,7 +6863,11 @@ public class Player extends Playable
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
removeSkill(SymbolSealData.getInstance().getSkill(classId, i)); final Skill skill = SymbolSealData.getInstance().getSkill(classId, i);
if (skill != null)
{
removeSkill(skill);
}
} }
} }
} }
@@ -6897,7 +6901,11 @@ public class Player extends Playable
} }
for (int i = 0; i < usedSlots; i++) for (int i = 0; i < usedSlots; i++)
{ {
addSkill(SymbolSealData.getInstance().getSkill(classId, i)); final Skill skill = SymbolSealData.getInstance().getSkill(classId, i);
if (skill != null)
{
addSkill(skill);
}
} }
} }
} }

11
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SymbolSealData.java
View File

@@ -80,7 +80,16 @@ public class SymbolSealData implements IXmlReader
public Skill getSkill(int classId, int symbolId) public Skill getSkill(int classId, int symbolId)
{ {
return _data.get(classId).get(symbolId).getSkill(); final List<SymbolSealHolder> data = _data.get(classId);
if (data != null)
{
final SymbolSealHolder symbol = data.get(symbolId);
if (symbol != null)
{
return symbol.getSkill();
}
}
return null;
} }
public static SymbolSealData getInstance() public static SymbolSealData getInstance()

12
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -6963,7 +6963,11 @@ public class Player extends Playable
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
removeSkill(SymbolSealData.getInstance().getSkill(classId, i)); final Skill skill = SymbolSealData.getInstance().getSkill(classId, i);
if (skill != null)
{
removeSkill(skill);
}
} }
} }
} }
@@ -6997,7 +7001,11 @@ public class Player extends Playable
} }
for (int i = 0; i < usedSlots; i++) for (int i = 0; i < usedSlots; i++)
{ {
addSkill(SymbolSealData.getInstance().getSkill(classId, i)); final Skill skill = SymbolSealData.getInstance().getSkill(classId, i);
if (skill != null)
{
addSkill(skill);
}
} }
} }
} }

11
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SymbolSealData.java
View File

@@ -80,7 +80,16 @@ public class SymbolSealData implements IXmlReader
public Skill getSkill(int classId, int symbolId) public Skill getSkill(int classId, int symbolId)
{ {
return _data.get(classId).get(symbolId).getSkill(); final List<SymbolSealHolder> data = _data.get(classId);
if (data != null)
{
final SymbolSealHolder symbol = data.get(symbolId);
if (symbol != null)
{
return symbol.getSkill();
}
}
return null;
} }
public static SymbolSealData getInstance() public static SymbolSealData getInstance()

12
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -6980,7 +6980,11 @@ public class Player extends Playable
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
removeSkill(SymbolSealData.getInstance().getSkill(classId, i)); final Skill skill = SymbolSealData.getInstance().getSkill(classId, i);
if (skill != null)
{
removeSkill(skill);
}
} }
} }
} }
@@ -7014,7 +7018,11 @@ public class Player extends Playable
} }
for (int i = 0; i < usedSlots; i++) for (int i = 0; i < usedSlots; i++)
{ {
addSkill(SymbolSealData.getInstance().getSkill(classId, i)); final Skill skill = SymbolSealData.getInstance().getSkill(classId, i);
if (skill != null)
{
addSkill(skill);
}
} }
} }
} }

11
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/data/xml/SymbolSealData.java
View File

@@ -80,7 +80,16 @@ public class SymbolSealData implements IXmlReader
public Skill getSkill(int classId, int symbolId) public Skill getSkill(int classId, int symbolId)
{ {
return _data.get(classId).get(symbolId).getSkill(); final List<SymbolSealHolder> data = _data.get(classId);
if (data != null)
{
final SymbolSealHolder symbol = data.get(symbolId);
if (symbol != null)
{
return symbol.getSkill();
}
}
return null;
} }
public static SymbolSealData getInstance() public static SymbolSealData getInstance()

12
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -7017,7 +7017,11 @@ public class Player extends Playable
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
removeSkill(SymbolSealData.getInstance().getSkill(classId, i)); final Skill skill = SymbolSealData.getInstance().getSkill(classId, i);
if (skill != null)
{
removeSkill(skill);
}
} }
} }
} }
@@ -7051,7 +7055,11 @@ public class Player extends Playable
} }
for (int i = 0; i < usedSlots; i++) for (int i = 0; i < usedSlots; i++)
{ {
addSkill(SymbolSealData.getInstance().getSkill(classId, i)); final Skill skill = SymbolSealData.getInstance().getSkill(classId, i);
if (skill != null)
{
addSkill(skill);
}
} }
} }
} }

11
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/SymbolSealData.java
View File

@@ -80,7 +80,16 @@ public class SymbolSealData implements IXmlReader
public Skill getSkill(int classId, int symbolId) public Skill getSkill(int classId, int symbolId)
{ {
return _data.get(classId).get(symbolId).getSkill(); final List<SymbolSealHolder> data = _data.get(classId);
if (data != null)
{
final SymbolSealHolder symbol = data.get(symbolId);
if (symbol != null)
{
return symbol.getSkill();
}
}
return null;
} }
public static SymbolSealData getInstance() public static SymbolSealData getInstance()

12
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
View File

@@ -7045,7 +7045,11 @@ public class Player extends Playable
{ {
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
{ {
removeSkill(SymbolSealData.getInstance().getSkill(classId, i)); final Skill skill = SymbolSealData.getInstance().getSkill(classId, i);
if (skill != null)
{
removeSkill(skill);
}
} }
} }
} }
@@ -7079,7 +7083,11 @@ public class Player extends Playable
} }
for (int i = 0; i < usedSlots; i++) for (int i = 0; i < usedSlots; i++)
{ {
addSkill(SymbolSealData.getInstance().getSkill(classId, i)); final Skill skill = SymbolSealData.getInstance().getSkill(classId, i);
if (skill != null)
{
addSkill(skill);
}
} }
} }
} }