From 403106efdcc8d8412f6b67c85998b24a27647b85 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 5 Jun 2019 05:36:41 +0000 Subject: [PATCH] Fixed probable PlayerAppearance getVisibleAllyCrestId method NPE. --- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- .../gameserver/model/actor/appearance/PlayerAppearance.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java index cae7bd2bb3..ef56652945 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/appearance/PlayerAppearance.java @@ -240,7 +240,7 @@ public class PlayerAppearance public int getVisibleAllyCrestId() { - return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); + return _visibleAllyCrestId != -1 ? _visibleAllyCrestId : (_owner == null) || _owner.isCursedWeaponEquipped() ? 0 : _owner.getAllyCrestId(); } public void setVisibleClanData(int clanId, int clanCrestId, int clanLargeCrestId, int allyId, int allyCrestId)