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

Fixed probable Player getPlayerSide NPE.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-04-07 18:58:20 +00:00
parent 48c6ffce5c
commit 2897ec40a8
23 changed files with 345 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13584,11 +13584,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13587,11 +13587,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13590,11 +13590,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13562,11 +13562,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13588,11 +13588,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13591,11 +13591,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13597,11 +13597,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13633,11 +13633,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13749,11 +13749,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13787,11 +13787,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13849,11 +13849,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13849,11 +13849,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13401,11 +13401,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13401,11 +13401,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13387,11 +13387,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13435,11 +13435,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13435,11 +13435,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13445,11 +13445,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13397,11 +13397,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13716,11 +13716,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13794,11 +13794,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13916,11 +13916,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
+15 -2
View File
@@ -13916,11 +13916,24 @@ public class Player extends Playable
*/
public CastleSide getPlayerSide()
{
if ((_clan == null) || (_clan.getCastleId() == 0))
if (_clan == null)
{
return CastleSide.NEUTRAL;
}
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
final int castleId = _clan.getCastleId();
if (castleId == 0)
{
return CastleSide.NEUTRAL;
}
final Castle castle = CastleManager.getInstance().getCastleById(castleId);
if (castle == null)
{
return CastleSide.NEUTRAL;
}
return castle.getSide();
}
/**