From c273105f4ed3424f43f12317574a1b45531bf787 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 18 Dec 2021 22:56:56 +0000 Subject: [PATCH] CharInfo and UserInfo packet adjustments. Thanks to nasseka. --- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 11 ++++--- .../network/serverpackets/UserInfo.java | 12 +++---- .../network/serverpackets/CharInfo.java | 11 ++++--- .../network/serverpackets/UserInfo.java | 12 +++---- .../network/serverpackets/CharInfo.java | 12 ++++--- .../network/serverpackets/UserInfo.java | 12 +++---- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 8 +++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 7 ++-- .../network/serverpackets/UserInfo.java | 3 +- .../network/serverpackets/CharInfo.java | 30 ++++------------- .../network/serverpackets/UserInfo.java | 12 +++---- .../network/serverpackets/CharInfo.java | 30 ++++------------- .../network/serverpackets/UserInfo.java | 12 +++---- .../network/serverpackets/CharInfo.java | 32 ++++--------------- .../network/serverpackets/UserInfo.java | 12 +++---- 42 files changed, 140 insertions(+), 209 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index e92febccda..4c00912f5c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -128,7 +128,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -242,7 +242,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -250,7 +250,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index c1a1d18b22..fedaf622bf 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,7 +20,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; @@ -153,7 +152,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index ebe7588dfb..778ffbd3c3 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -128,7 +128,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -241,7 +241,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -249,7 +249,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 064af1d2c3..c6f498d462 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,7 +20,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; @@ -153,7 +152,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index ebe7588dfb..778ffbd3c3 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -128,7 +128,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -241,7 +241,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -249,7 +249,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 064af1d2c3..c6f498d462 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,7 +20,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; @@ -153,7 +152,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index af4cc12744..c3f775a8d3 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -242,7 +242,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -250,7 +250,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 070549ffb6..7c67dd651d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,7 +20,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; @@ -154,7 +153,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index af4cc12744..c3f775a8d3 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -242,7 +242,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -250,7 +250,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index d3600f6f9d..ebe4943eb7 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,7 +20,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; @@ -154,7 +153,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index a2f713977a..95a808c69e 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -242,7 +242,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -250,7 +250,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index fe9bd458f8..a3e6690b24 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,7 +20,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; @@ -154,7 +153,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index a2f713977a..95a808c69e 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -242,7 +242,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -250,7 +250,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index fe9bd458f8..a3e6690b24 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,7 +20,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; @@ -154,7 +153,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index a26ce49e13..207a2cf462 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -130,7 +130,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -243,7 +243,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -251,7 +251,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index b6e71884c9..da5800b76b 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,7 +20,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; @@ -156,7 +155,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index fa10219ef2..c4b6d6ff28 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -131,7 +131,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -281,10 +282,12 @@ public class CharInfo implements IClientOutgoingPacket } // Rank. - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - packet.writeD(0x00); // 272 - hNotoriety - packet.writeD(0x00); // 286 - nMainClass + packet.writeH(0x00); + packet.writeC(0x00); + packet.writeD(_player.getClassId().getId()); + packet.writeC(0x00); return true; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 28c2bc2daf..d47aa72532 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -21,7 +21,6 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.BonusExpType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -158,13 +157,10 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); - packet.writeC(_player.getLevel()); - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeD(0x00); // 286 + packet.writeD(_player.getLevel()); // 270 + packet.writeD(_player.getClassId().getId()); // 286 } if (containsMask(UserInfoType.BASE_STATS)) @@ -424,7 +420,7 @@ public class UserInfo extends AbstractMaskPacket if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } if (containsMask(UserInfoType.STAT_POINTS)) // 235 diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index fa10219ef2..c4b6d6ff28 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -131,7 +131,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -281,10 +282,12 @@ public class CharInfo implements IClientOutgoingPacket } // Rank. - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - packet.writeD(0x00); // 272 - hNotoriety - packet.writeD(0x00); // 286 - nMainClass + packet.writeH(0x00); + packet.writeC(0x00); + packet.writeD(_player.getClassId().getId()); + packet.writeC(0x00); return true; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 28c2bc2daf..d47aa72532 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -21,7 +21,6 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.BonusExpType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -158,13 +157,10 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); - packet.writeC(_player.getLevel()); - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeD(0x00); // 286 + packet.writeD(_player.getLevel()); // 270 + packet.writeD(_player.getClassId().getId()); // 286 } if (containsMask(UserInfoType.BASE_STATS)) @@ -424,7 +420,7 @@ public class UserInfo extends AbstractMaskPacket if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } if (containsMask(UserInfoType.STAT_POINTS)) // 235 diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index 6989cbc01f..579aa3f0ff 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -132,7 +132,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.isDeathKnight() ? 212 : _player.getBaseClass()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -282,12 +282,14 @@ public class CharInfo implements IClientOutgoingPacket } // Rank. - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - packet.writeD(0x00); // 272 - hNotoriety - packet.writeD(0x00); // 286 - nMainClass + packet.writeH(0x00); + packet.writeC(0x00); + packet.writeD(_player.getClassId().getId()); + packet.writeC(0x00); packet.writeD(_player.getVisualHairColor() + 1); // 338 - DK color. - packet.writeD(0x00); // 338 - nWorldID + packet.writeD(0x00); return true; } diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 291fd5c688..c07c64d9c1 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -21,7 +21,6 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.AttributeType; import org.l2jmobius.gameserver.enums.BonusExpType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.ItemGrade; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CastleManager; @@ -158,13 +157,10 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); - packet.writeC(_player.getLevel()); - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeD(0x00); // 286 + packet.writeD(_player.getLevel()); // 270 + packet.writeD(_player.getClassId().getId()); // 286 } if (containsMask(UserInfoType.BASE_STATS)) @@ -426,7 +422,7 @@ public class UserInfo extends AbstractMaskPacket if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } if (containsMask(UserInfoType.STAT_POINTS)) // 235 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 00ca690f8d..2ec565e612 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 @@ -128,7 +128,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -241,7 +241,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -249,7 +249,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 689611d5a5..0a8afb62a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Player; @@ -151,7 +150,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } 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 fd4112eb1e..607352f62b 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 @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -242,7 +242,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -250,7 +250,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index d9a9506381..c9930f843b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; @@ -152,7 +151,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } 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 fd4112eb1e..607352f62b 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 @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -242,7 +242,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -250,7 +250,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index fffc7eb45d..e2a9a7496c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; @@ -152,7 +151,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } 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 41b0a3d332..b6769d53f9 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 @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -242,7 +242,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -250,7 +250,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 629a73d1a9..efea6902e3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; @@ -152,7 +151,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } 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 41b0a3d332..b6769d53f9 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 @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -242,7 +242,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -250,7 +250,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 629a73d1a9..efea6902e3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; @@ -152,7 +151,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } 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 d52cbe1999..7632f16d7b 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 @@ -130,7 +130,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -243,7 +244,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -251,7 +252,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 52875a2d34..8c4567fa08 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.instancemanager.RankManager; @@ -154,7 +153,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } 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 fd4112eb1e..607352f62b 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 @@ -129,7 +129,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - packet.writeD(_player.getBaseClass()); // Confirmed + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -242,7 +242,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getTransformationDisplayId()); // Confirmed packet.writeD(_player.getAgathionId()); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // nPvPRestrainStatus packet.writeD((int) Math.round(_player.getCurrentCp())); // Confirmed packet.writeD(_player.getMaxHp()); // Confirmed @@ -250,7 +250,8 @@ public class CharInfo implements IClientOutgoingPacket packet.writeD(_player.getMaxMp()); // Confirmed packet.writeD((int) Math.round(_player.getCurrentMp())); // Confirmed - packet.writeC(0x00); // TODO: Find me! + packet.writeC(0x00); // cBRLectureMark + final Set abnormalVisualEffects = _player.getEffectList().getCurrentAbnormalVisualEffects(); packet.writeD(abnormalVisualEffects.size() + (_gmSeeInvis ? 1 : 0)); // Confirmed for (AbnormalVisualEffect abnormalVisualEffect : abnormalVisualEffects) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index d9a9506381..c9930f843b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets; import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; import org.l2jmobius.gameserver.model.Party; @@ -152,7 +151,7 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); packet.writeC(_player.getLevel()); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index a1b9175d4b..7a68746f74 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -132,27 +132,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - // DK Human - final int baseClassId = _player.getBaseClass(); - if ((baseClassId >= 196) && (baseClassId <= 199)) - { - packet.writeD(196); - } - // DK Elf - else if ((baseClassId >= 200) && (baseClassId <= 203)) - { - packet.writeD(200); - } - // DK Dark Elf - else if ((baseClassId >= 204) && (baseClassId <= 207)) - { - packet.writeD(204); - } - // Other Classes - else - { - packet.writeD(baseClassId); - } + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -302,10 +282,12 @@ public class CharInfo implements IClientOutgoingPacket } // Rank. - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - packet.writeD(0x00); // 272 - hNotoriety - packet.writeD(0x00); // 286 - nMainClass + packet.writeH(0x00); + packet.writeC(0x00); + packet.writeD(_player.getClassId().getId()); + packet.writeC(0x00); return true; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index cc0ca05099..4545110d5f 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,7 +20,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.BonusExpType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; @@ -157,13 +156,10 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); - packet.writeC(_player.getLevel()); - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeD(0x00); // 286 + packet.writeD(_player.getLevel()); // 270 + packet.writeD(_player.getClassId().getId()); // 286 } if (containsMask(UserInfoType.BASE_STATS)) @@ -422,7 +418,7 @@ public class UserInfo extends AbstractMaskPacket if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } if (containsMask(UserInfoType.STAT_POINTS)) // 235 diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index a1b9175d4b..7a68746f74 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -132,27 +132,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - // DK Human - final int baseClassId = _player.getBaseClass(); - if ((baseClassId >= 196) && (baseClassId <= 199)) - { - packet.writeD(196); - } - // DK Elf - else if ((baseClassId >= 200) && (baseClassId <= 203)) - { - packet.writeD(200); - } - // DK Dark Elf - else if ((baseClassId >= 204) && (baseClassId <= 207)) - { - packet.writeD(204); - } - // Other Classes - else - { - packet.writeD(baseClassId); - } + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -302,10 +282,12 @@ public class CharInfo implements IClientOutgoingPacket } // Rank. - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - packet.writeD(0x00); // 272 - hNotoriety - packet.writeD(0x00); // 286 - nMainClass + packet.writeH(0x00); + packet.writeC(0x00); + packet.writeD(_player.getClassId().getId()); + packet.writeC(0x00); return true; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index cc0ca05099..4545110d5f 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,7 +20,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.BonusExpType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; @@ -157,13 +156,10 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); - packet.writeC(_player.getLevel()); - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeD(0x00); // 286 + packet.writeD(_player.getLevel()); // 270 + packet.writeD(_player.getClassId().getId()); // 286 } if (containsMask(UserInfoType.BASE_STATS)) @@ -422,7 +418,7 @@ public class UserInfo extends AbstractMaskPacket if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } if (containsMask(UserInfoType.STAT_POINTS)) // 235 diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java index f55c498578..c55485256f 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CharInfo.java @@ -132,27 +132,7 @@ public class CharInfo implements IClientOutgoingPacket packet.writeH(_player.getRace().ordinal()); // Confirmed packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); // Confirmed - // DK Human - final int baseClassId = _player.getBaseClass(); - if ((baseClassId >= 196) && (baseClassId <= 199)) - { - packet.writeD(196); - } - // DK Elf - else if ((baseClassId >= 200) && (baseClassId <= 203)) - { - packet.writeD(200); - } - // DK Dark Elf - else if ((baseClassId >= 204) && (baseClassId <= 207)) - { - packet.writeD(204); - } - // Other Classes - else - { - packet.writeD(baseClassId); - } + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); for (int slot : getPaperdollOrder()) { @@ -302,12 +282,14 @@ public class CharInfo implements IClientOutgoingPacket } // Rank. - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); - packet.writeD(0x00); // 272 - hNotoriety - packet.writeD(0x00); // 286 - nMainClass + packet.writeH(0x00); + packet.writeC(0x00); + packet.writeD(_player.getClassId().getId()); + packet.writeC(0x00); packet.writeD(_player.getVisualHairColor() + 1); // 338 - DK color. - packet.writeD(0x00); // 338 - nWorldID + packet.writeD(0x00); return true; } diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java index 86dc77f533..21b328c878 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/UserInfo.java @@ -20,7 +20,6 @@ import org.l2jmobius.Config; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.enums.BonusExpType; -import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.UserInfoType; import org.l2jmobius.gameserver.instancemanager.CastleManager; import org.l2jmobius.gameserver.instancemanager.CursedWeaponsManager; @@ -157,13 +156,10 @@ public class UserInfo extends AbstractMaskPacket packet.writeC(_player.isGM() ? 0x01 : 0x00); packet.writeC(_player.getRace().ordinal()); packet.writeC(_player.getAppearance().isFemale() ? 0x01 : 0x00); - packet.writeD(ClassId.getClassId(_player.getBaseTemplate().getClassId().getId()).getRootClassId().getId()); + packet.writeD(_player.getBaseTemplate().getClassId().getRootClassId().getId()); packet.writeD(_player.getClassId().getId()); - packet.writeC(_player.getLevel()); - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeC(0x00); // 270 - packet.writeD(0x00); // 286 + packet.writeD(_player.getLevel()); // 270 + packet.writeD(_player.getClassId().getId()); // 286 } if (containsMask(UserInfoType.BASE_STATS)) @@ -424,7 +420,7 @@ public class UserInfo extends AbstractMaskPacket if (containsMask(UserInfoType.RANKING)) // 196 { packet.writeH(6); - packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : 0); + packet.writeD(RankManager.getInstance().getPlayerGlobalRank(_player) == 1 ? 1 : RankManager.getInstance().getPlayerRaceRank(_player) == 1 ? 2 : RankManager.getInstance().getPlayerClassRank(_player) == 1 ? 4 : 0); } if (containsMask(UserInfoType.STAT_POINTS)) // 235