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

Fixed probable getAllyCrestId NPE.

Browse Source 
Contributed by Sahar.
This commit is contained in:
MobiusDevelopment
2019-10-28 20:39:29 +00:00
parent f7fe3534c3
commit bf4e116a19
18 changed files with 35 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -5588,34 +5588,16 @@ public class PlayerInstance extends Playable
}
/**
* Return the Alliance Identifier of the PlayerInstance.<BR>
* <BR>
* @return the ally id
* @return the Alliance Identifier of the PlayerInstance.
*/
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
/**
* Gets the ally crest id.
* @return the ally crest id
*/
public int getAllyCrestId()
{
if ((getClanId() == 0) || (getClan() == null))
{
return 0;
}
if (getClan().getAllyId() == 0)
{
return 0;
}
return getClan().getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**