From 8861770e7305e7342f43194b85b8aa2696f8f2fd Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 2 Nov 2019 13:04:17 +0000 Subject: [PATCH] Fixed Clan reputation score NPE at CharInfo. Contributed by Sahar. --- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- .../l2jmobius/gameserver/network/serverpackets/CharInfo.java | 5 ++++- 17 files changed, 68 insertions(+), 17 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 2a12915e19..dea93cc59e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 0de1514c8d..f7817d4484 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -229,7 +232,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 0de1514c8d..f7817d4484 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -229,7 +232,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 812f41c3ef..05a4f4eafe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 812f41c3ef..05a4f4eafe 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 63d2790886..351633c16a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 63d2790886..351633c16a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 63d2790886..351633c16a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 07b9c388d6..7fd654966a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -22,6 +22,7 @@ import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import org.l2jmobius.gameserver.model.actor.Decoy; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import org.l2jmobius.gameserver.model.zone.ZoneId; @@ -30,6 +31,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -80,6 +82,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -246,7 +249,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); // T1 packet.writeD(_player.getTransformationDisplayId()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 80a25dde89..7b6a7e11da 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -21,6 +21,7 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.actor.Decoy; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; import org.l2jmobius.gameserver.model.zone.ZoneId; @@ -29,6 +30,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -76,6 +78,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -234,7 +237,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); // T1 packet.writeD(_player.getTransformationDisplayId()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index be68c2d4b0..d843bed850 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -229,7 +232,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 7edaf1042f..34a031c4e8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 7edaf1042f..34a031c4e8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 4b4af50d5b..f64b0cc4ee 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 4b4af50d5b..f64b0cc4ee 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 4b4af50d5b..f64b0cc4ee 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 7edaf1042f..34a031c4e8 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.actor.instance.DecoyInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosEvent; import org.l2jmobius.gameserver.model.ceremonyofchaos.CeremonyOfChaosMember; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.model.interfaces.ILocational; import org.l2jmobius.gameserver.model.itemcontainer.Inventory; import org.l2jmobius.gameserver.model.skills.AbnormalVisualEffect; @@ -35,6 +36,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets; public class CharInfo implements IClientOutgoingPacket { private final PlayerInstance _player; + private final Clan _clan; private int _objId; private int _x; private int _y; @@ -75,6 +77,7 @@ public class CharInfo implements IClientOutgoingPacket { _player = player; _objId = player.getObjectId(); + _clan = player.getClan(); if ((_player.getVehicle() != null) && (_player.getInVehiclePosition() != null)) { _x = _player.getInVehiclePosition().getX(); @@ -230,7 +233,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeC(_player.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_player.getCursedWeaponEquippedId()) : 0); - packet.writeD(_player.getAppearance().getVisibleClanId() > 0 ? _player.getClan().getReputationScore() : 0); + packet.writeD(_clan != null ? _clan.getReputationScore() : 0); packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed