From 0d4a18138016ea36cdeb71539a6ae010ae296366 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 5 Jun 2019 05:41:36 +0000 Subject: [PATCH] Fixed probable PlayerInstance getAllyCrestId method NPE. --- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- .../gameserver/model/actor/instance/PlayerInstance.java | 6 +----- 12 files changed, 12 insertions(+), 60 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 818f10326b..506659c705 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4253,11 +4253,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 16b3e2c2a1..9fdabd4aa8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4259,11 +4259,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8bb8778180..c10608d351 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4261,11 +4261,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 62facf8d0c..430766c20e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4252,11 +4252,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index cc09569e7a..9caa1c468c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4232,11 +4232,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1cba581e9f..b958f423e7 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4232,11 +4232,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index c814ddea00..d2f0a991cb 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4233,11 +4233,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d69d0fa782..8e75d35eff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4228,11 +4228,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 3a04bde009..9140cd6d76 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4229,11 +4229,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 82f3b67031..378ea6eef3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4212,11 +4212,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 490ff1e4e0..b3afdb3ca9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4212,11 +4212,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1eae49244e..ca76b5d11a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -4212,11 +4212,7 @@ public final class PlayerInstance extends Playable public int getAllyCrestId() { - if (_clanId == 0) - { - return 0; - } - if (_clan.getAllyId() == 0) + if ((_clanId == 0) || (_clan == null) || (_clan.getAllyId() == 0)) { return 0; }