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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4242,20 +4242,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4248,20 +4248,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4250,20 +4250,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4245,20 +4245,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4223,20 +4223,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4223,20 +4223,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4224,20 +4224,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4139,20 +4139,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

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();
}
/**

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4315,7 +4315,7 @@ public class PlayerInstance extends Playable
public int getAllyCrestId()
{
return (_clanId == 0) || (_clan.getAllyId() == 0) ? 0 : _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

2
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4202,7 +4202,7 @@ public class PlayerInstance extends Playable
public int getAllyCrestId()
{
return (_clanId == 0) || (_clan.getAllyId() == 0) ? 0 : _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4217,20 +4217,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4218,20 +4218,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4201,20 +4201,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4212,20 +4212,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4212,20 +4212,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4110,20 +4110,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**

12
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -4218,20 +4218,12 @@ public class PlayerInstance extends Playable
@Override
public int getAllyId()
{
if (_clan == null)
{
return 0;
}
return _clan.getAllyId();
return _clan == null ? 0 : _clan.getAllyId();
}
public int getAllyCrestId()
{
if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0))
{
return 0;
}
return _clan.getAllyCrestId();
return getAllyId() == 0 ? 0 : _clan.getAllyCrestId();
}
/**