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

Fixed probable PlayerInstance getAllyCrestId method NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-06-05 05:41:36 +00:00
parent 403106efdc
commit 0d4a181380
12 changed files with 12 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4253,11 +4253,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4259,11 +4259,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4261,11 +4261,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4252,11 +4252,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4232,11 +4232,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4232,11 +4232,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4233,11 +4233,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4228,11 +4228,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4229,11 +4229,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4212,11 +4212,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4212,11 +4212,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+1 -5
View File
@@ -4212,11 +4212,7 @@ public final class PlayerInstance extends Playable
public int getAllyCrestId() public int getAllyCrestId()
{ {
if (_clanId == 0) if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
if (_clan.getAllyId() == 0)
{ {
return 0; return 0;
} }