From ec9cdcced00abc7c6eff204e014afeaf5a6bf36f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 31 Jul 2021 00:08:35 +0000 Subject: [PATCH] Null checks for AbstractPlayerGroup isLeader method. --- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- .../gameserver/model/AbstractPlayerGroup.java | 13 ++++++++++++- 23 files changed, 276 insertions(+), 23 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 850376b2f7..c239159133 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -82,7 +82,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 850376b2f7..c239159133 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -82,7 +82,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /** diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java index 39e23694b1..6fdc4130fc 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/AbstractPlayerGroup.java @@ -83,7 +83,18 @@ public abstract class AbstractPlayerGroup */ public boolean isLeader(PlayerInstance player) { - return getLeader().getObjectId() == player.getObjectId(); + if (player == null) + { + return false; + } + + final PlayerInstance leader = getLeader(); + if (leader == null) + { + return false; + } + + return leader.getObjectId() == player.getObjectId(); } /**