From 055da88da9a5750fe1c0de4f191f1c0fb9877557 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 20 Feb 2018 18:44:52 +0000 Subject: [PATCH] Dropped addCharName message parameter. --- .../ai/others/MentorGuide/MentorGuide.java | 8 ++--- .../admincommandhandlers/AdminPledge.java | 2 +- .../handlers/effecthandlers/CallPc.java | 4 +-- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 6 ++-- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../HandysBlockCheckerManager.java | 2 +- .../l2jmobius/gameserver/model/L2Party.java | 4 +-- .../gameserver/model/actor/L2Attackable.java | 2 +- .../model/actor/instance/L2PcInstance.java | 2 +- .../model/actor/instance/L2TrapInstance.java | 2 +- .../model/actor/status/PetStatus.java | 2 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../conditions/ConditionDistance.java | 2 +- .../conditions/ConditionItem.java | 2 +- .../conditions/ConditionLevel.java | 2 +- .../conditions/ConditionQuest.java | 2 +- .../conditions/ConditionReenter.java | 2 +- .../gameserver/model/stats/Formulas.java | 20 +++++------ .../RequestCancelPostAttachment.java | 2 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestJoinParty.java | 6 ++-- .../clientpackets/RequestPostAttachment.java | 4 +-- .../RequestRejectPostAttachment.java | 2 +- .../network/clientpackets/TradeRequest.java | 4 +-- .../friend/RequestAnswerFriendInvite.java | 2 +- .../friend/RequestFriendInvite.java | 2 +- .../mentoring/ConfirmMenteeAdd.java | 14 ++++---- .../mentoring/RequestMenteeAdd.java | 2 +- .../serverpackets/AbstractMessagePacket.java | 34 ------------------- .../ai/others/MentorGuide/MentorGuide.java | 8 ++--- .../admincommandhandlers/AdminPledge.java | 2 +- .../handlers/effecthandlers/CallPc.java | 4 +-- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 6 ++-- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../HandysBlockCheckerManager.java | 2 +- .../l2jmobius/gameserver/model/L2Party.java | 4 +-- .../gameserver/model/actor/L2Attackable.java | 2 +- .../model/actor/instance/L2PcInstance.java | 2 +- .../model/actor/instance/L2TrapInstance.java | 2 +- .../model/actor/status/PetStatus.java | 2 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../conditions/ConditionDistance.java | 2 +- .../conditions/ConditionItem.java | 2 +- .../conditions/ConditionLevel.java | 2 +- .../conditions/ConditionQuest.java | 2 +- .../conditions/ConditionReenter.java | 2 +- .../gameserver/model/stats/Formulas.java | 20 +++++------ .../RequestCancelPostAttachment.java | 2 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestJoinParty.java | 6 ++-- .../clientpackets/RequestPostAttachment.java | 4 +-- .../RequestRejectPostAttachment.java | 2 +- .../network/clientpackets/TradeRequest.java | 4 +-- .../friend/RequestAnswerFriendInvite.java | 2 +- .../friend/RequestFriendInvite.java | 2 +- .../mentoring/ConfirmMenteeAdd.java | 14 ++++---- .../mentoring/RequestMenteeAdd.java | 2 +- .../serverpackets/AbstractMessagePacket.java | 34 ------------------- .../ai/others/MentorGuide/MentorGuide.java | 8 ++--- .../admincommandhandlers/AdminPledge.java | 2 +- .../handlers/effecthandlers/CallPc.java | 4 +-- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 6 ++-- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../HandysBlockCheckerManager.java | 2 +- .../l2jmobius/gameserver/model/L2Party.java | 4 +-- .../gameserver/model/actor/L2Attackable.java | 2 +- .../model/actor/instance/L2PcInstance.java | 2 +- .../model/actor/instance/L2TrapInstance.java | 2 +- .../model/actor/status/PetStatus.java | 2 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../conditions/ConditionDistance.java | 2 +- .../conditions/ConditionItem.java | 2 +- .../conditions/ConditionLevel.java | 2 +- .../conditions/ConditionQuest.java | 2 +- .../conditions/ConditionReenter.java | 2 +- .../gameserver/model/stats/Formulas.java | 20 +++++------ .../RequestCancelPostAttachment.java | 2 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestJoinParty.java | 6 ++-- .../clientpackets/RequestPostAttachment.java | 4 +-- .../RequestRejectPostAttachment.java | 2 +- .../network/clientpackets/TradeRequest.java | 4 +-- .../friend/RequestAnswerFriendInvite.java | 2 +- .../friend/RequestFriendInvite.java | 2 +- .../mentoring/ConfirmMenteeAdd.java | 14 ++++---- .../mentoring/RequestMenteeAdd.java | 2 +- .../serverpackets/AbstractMessagePacket.java | 34 ------------------- .../ai/others/MentorGuide/MentorGuide.java | 8 ++--- .../admincommandhandlers/AdminPledge.java | 2 +- .../handlers/effecthandlers/CallPc.java | 4 +-- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 6 ++-- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../HandysBlockCheckerManager.java | 2 +- .../l2jmobius/gameserver/model/L2Party.java | 4 +-- .../gameserver/model/actor/L2Attackable.java | 2 +- .../model/actor/instance/L2PcInstance.java | 2 +- .../model/actor/instance/L2TrapInstance.java | 2 +- .../model/actor/status/PetStatus.java | 2 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../conditions/ConditionDistance.java | 2 +- .../conditions/ConditionItem.java | 2 +- .../conditions/ConditionLevel.java | 2 +- .../conditions/ConditionQuest.java | 2 +- .../conditions/ConditionReenter.java | 2 +- .../gameserver/model/stats/Formulas.java | 20 +++++------ .../RequestCancelPostAttachment.java | 2 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestJoinParty.java | 6 ++-- .../clientpackets/RequestPostAttachment.java | 4 +-- .../RequestRejectPostAttachment.java | 2 +- .../network/clientpackets/TradeRequest.java | 4 +-- .../friend/RequestAnswerFriendInvite.java | 2 +- .../friend/RequestFriendInvite.java | 2 +- .../mentoring/ConfirmMenteeAdd.java | 14 ++++---- .../mentoring/RequestMenteeAdd.java | 2 +- .../serverpackets/AbstractMessagePacket.java | 34 ------------------- .../admincommandhandlers/AdminPledge.java | 2 +- .../handlers/effecthandlers/CallPc.java | 4 +-- .../scripts/handlers/effecthandlers/Cp.java | 2 +- .../handlers/effecthandlers/HealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Hp.java | 2 +- .../effecthandlers/MagicalAttackMp.java | 6 ++-- .../handlers/effecthandlers/ManaHeal.java | 2 +- .../effecthandlers/ManaHealByLevel.java | 2 +- .../effecthandlers/ManaHealPercent.java | 2 +- .../scripts/handlers/effecthandlers/Mp.java | 2 +- .../effecthandlers/TeleportToPlayer.java | 2 +- .../HandysBlockCheckerManager.java | 2 +- .../l2jmobius/gameserver/model/L2Party.java | 4 +-- .../gameserver/model/actor/L2Attackable.java | 2 +- .../model/actor/instance/L2PcInstance.java | 2 +- .../model/actor/instance/L2TrapInstance.java | 2 +- .../model/actor/status/PetStatus.java | 2 +- .../ceremonyofchaos/CeremonyOfChaosEvent.java | 2 +- .../conditions/ConditionDistance.java | 2 +- .../conditions/ConditionItem.java | 2 +- .../conditions/ConditionLevel.java | 2 +- .../conditions/ConditionQuest.java | 2 +- .../conditions/ConditionReenter.java | 2 +- .../gameserver/model/stats/Formulas.java | 20 +++++------ .../RequestCancelPostAttachment.java | 2 +- .../clientpackets/RequestEnchantItem.java | 2 +- .../clientpackets/RequestJoinParty.java | 6 ++-- .../clientpackets/RequestPostAttachment.java | 4 +-- .../RequestRejectPostAttachment.java | 2 +- .../network/clientpackets/TradeRequest.java | 4 +-- .../friend/RequestAnswerFriendInvite.java | 2 +- .../friend/RequestFriendInvite.java | 2 +- .../mentoring/ConfirmMenteeAdd.java | 14 ++++---- .../mentoring/RequestMenteeAdd.java | 2 +- .../serverpackets/AbstractMessagePacket.java | 34 ------------------- 179 files changed, 301 insertions(+), 471 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index 8499c186a1..49e8094f6d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -267,7 +267,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader // Add the mentee skill handleMenteeSkills(player); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_CONNECTED).addCharName(player)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_CONNECTED).addString(player.getName())); mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance())); } } @@ -283,7 +283,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader MentorManager.getInstance().cancelAllMentoringBuffs(mentor.getPlayerInstance()); } - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addCharName(player)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addString(player.getName())); mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance())); } } @@ -319,7 +319,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader } } - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_CONNECTED).addCharName(player)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_CONNECTED).addString(player.getName())); mentee.sendPacket(new ExMentorList(mentee.getPlayerInstance())); }); @@ -342,7 +342,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader startQuestTimer("REMOVE_BUFFS " + player.getObjectId(), 5 * 60 * 1000, null, null); MentorManager.getInstance().getMentees(player.getObjectId()).stream().filter(Objects::nonNull).filter(L2Mentee::isOnline).forEach(mentee -> { - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_DISCONNECTED).addCharName(player)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_DISCONNECTED).addString(player.getName())); mentee.sendPacket(new ExMentorList(mentee.getPlayerInstance())); }); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java index 8f7f36bebe..d0efd7413e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java @@ -111,7 +111,7 @@ public class AdminPledge implements IAdminCommandHandler if (!targetPlayer.isClanLeader()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER); - sm.addCharName(targetPlayer); + sm.addString(targetPlayer.getName()); activeChar.sendPacket(sm); showMainPage(activeChar); return false; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e456330ff3..8526524efd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -80,7 +80,7 @@ public final class CallPc extends AbstractEffect target.addScript(new SummonRequestHolder(activeChar, skill)); final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId()); - confirm.addCharName(activeChar); + confirm.addString(activeChar.getName()); confirm.addZoneName(activeChar.getX(), activeChar.getY(), activeChar.getZ()); confirm.addTime(30000); confirm.addRequesterId(activeChar.getObjectId()); @@ -134,7 +134,7 @@ public final class CallPc extends AbstractEffect if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2); - sm.addCharName(target); + sm.addString(target.getName()); activeChar.sendPacket(sm); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java index b45bcdf653..a39da1c0eb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -81,7 +81,7 @@ public final class Cp extends AbstractEffect if ((effector != null) && (effector != effected)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); sm.addInt((int) amount); effected.sendPacket(sm); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6edc4fe3c8..b7231e71be 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -78,7 +78,7 @@ public final class HealPercent extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 5e9db7f727..f19d9dec50 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -82,7 +82,7 @@ public final class Hp extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 63f00f87d9..115e5138a4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -67,8 +67,8 @@ public final class MagicalAttackMp extends AbstractEffect if (effected.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_C2_S_DRAIN); - sm.addCharName(effected); - sm.addCharName(effector); + sm.addString(effected.getName()); + sm.addString(effector.getName()); effected.sendPacket(sm); } return false; @@ -112,7 +112,7 @@ public final class MagicalAttackMp extends AbstractEffect if (effected.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S_MP_HAS_BEEN_DRAINED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); sm.addInt((int) mp); effected.sendPacket(sm); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index ad67df3f6f..47b003ec45 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -75,7 +75,7 @@ public final class ManaHeal extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 03d00a766b..bb66d60d5e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -128,7 +128,7 @@ public final class ManaHealByLevel extends AbstractEffect final SystemMessage sm = SystemMessage.getSystemMessage(effector.getObjectId() != effected.getObjectId() ? SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1 : SystemMessageId.S1_MP_HAS_BEEN_RESTORED); if (effector.getObjectId() != effected.getObjectId()) { - sm.addCharName(effector); + sm.addString(effector.getName()); } sm.addInt((int) amount); effected.sendPacket(sm); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 756649b992..b3b7aa52ba 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -75,7 +75,7 @@ public final class ManaHealPercent extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29f236dd54..713af002bc 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -82,7 +82,7 @@ public final class Mp extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 291578b7c8..5799fbb221 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -95,7 +95,7 @@ public class TeleportToPlayer extends AbstractEffect if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2); - sm.addCharName(target); + sm.addString(target.getName()); effector.sendPacket(sm); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java index a77eb2d2d7..dbcfdb4423 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java @@ -158,7 +158,7 @@ public final class HandysBlockCheckerManager if (_arenaPlayers[i].getAllPlayers().contains(player)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST); - msg.addCharName(player); + msg.addString(player.getName()); player.sendPacket(msg); return false; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java index 6bd41572d8..5b6e9281fe 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Party.java @@ -436,7 +436,7 @@ public class L2Party extends AbstractPlayerGroup final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2); sm.addPcName(activeChar); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); getMembers().forEach(m -> @@ -459,7 +459,7 @@ public class L2Party extends AbstractPlayerGroup final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2); sm.addPcName(activeChar); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); getMembers().forEach(m -> diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index 976203d745..a5f89f607f 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -1030,7 +1030,7 @@ public class L2Attackable extends L2Npc if (isRaid() && !isRaidMinion()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); - sm.addCharName(this); + sm.addString(getName()); sm.addItemName(item); sm.addLong(drop.getCount()); broadcastPacket(sm); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 1028a4fcb9..ae87650510 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11509,7 +11509,7 @@ public final class L2PcInstance extends L2Playable { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK); sm.addPcName(target.getActingPlayer()); - sm.addCharName(this); + sm.addString(getName()); target.sendPacket(sm); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ATTACK_WENT_ASTRAY); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index 4ab075905b..4a222f4eb9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -272,7 +272,7 @@ public final class L2TrapInstance extends L2Npc else { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4); - sm.addCharName(this); + sm.addString(getName()); sm.addString(target.getName()); sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1)); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java index f1c20a33eb..76c6d6f9bb 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java @@ -52,7 +52,7 @@ public class PetStatus extends SummonStatus if (!isDOT && (getActiveChar().getOwner() != null)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_BY_C1); - sm.addCharName(attacker); + sm.addString(attacker.getName()); sm.addInt((int) value); getActiveChar().sendPacket(sm); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 8d423decc8..b574b7143e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -287,7 +287,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent else { msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); - msg.addCharName(winners.get(0).getPlayer()); + msg.addString(winners.get(0).getPlayer().getName()); } for (CeremonyOfChaosMember member : getMembers().values()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index 29c6c47ec1..69bd4f131c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -31,7 +31,7 @@ public final class ConditionDistance extends Condition public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); - setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 26f95be4e9..f6e41a273d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -40,7 +40,7 @@ public final class ConditionItem extends Condition _count = parameters.getLong("count"); _take = parameters.getBoolean("take", false); // Set message - setSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (msg, player) -> msg.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (msg, player) -> msg.addString(player.getName())); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index c85399fdf8..070cb346b3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -38,7 +38,7 @@ public final class ConditionLevel extends Condition _min = parameters.getInt("min", 1); _max = parameters.getInt("max", Integer.MAX_VALUE); // Set message - setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 743377691f..9a82901565 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -35,7 +35,7 @@ public final class ConditionQuest extends Condition { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message - setSystemMessage(SystemMessageId.C1_S_QUEST_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_QUEST_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 91fff12af7..076d585031 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -33,7 +33,7 @@ public final class ConditionReenter extends Condition public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); - setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 66ca7e3c01..5a966224c4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -175,7 +175,7 @@ public final class Formulas else { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); damage = 1; @@ -185,7 +185,7 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm = (skill.hasEffectType(L2EffectType.HP_DRAIN)) ? SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_DRAIN) : SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_MAGIC); - sm.addCharName(attacker); + sm.addString(attacker.getName()); target.sendPacket(sm); } } @@ -674,7 +674,7 @@ public final class Formulas if (resisted) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); return false; @@ -705,7 +705,7 @@ public final class Formulas if ((finalRate <= Rnd.get(100)) && (target != attacker)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); return false; @@ -837,8 +837,8 @@ public final class Formulas if (attacker.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DAMAGE_IS_DECREASED_BECAUSE_C1_RESISTED_C2_S_MAGIC); - sm.addCharName(target); - sm.addCharName(attacker); + sm.addString(target.getName()); + sm.addString(attacker.getName()); attacker.sendPacket(sm); damage /= 2; } @@ -846,8 +846,8 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.C1_WEAKLY_RESISTED_C2_S_MAGIC); - sm2.addCharName(target); - sm2.addCharName(attacker); + sm2.addString(target.getName()); + sm2.addString(attacker.getName()); target.sendPacket(sm2); } } @@ -976,13 +976,13 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_COUNTERED_C1_S_ATTACK); - sm.addCharName(attacker); + sm.addString(attacker.getName()); target.sendPacket(sm); } if (attacker.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PERFORMING_A_COUNTERATTACK); - sm.addCharName(target); + sm.addString(target.getName()); attacker.sendPacket(sm); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9a84b31ae4..cb27698f70 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -210,7 +210,7 @@ public final class RequestCancelPostAttachment implements IClientIncomingPacket if (receiver != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANCELED_THE_SENT_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); receiver.sendPacket(sm); receiver.sendPacket(new ExChangePostState(true, _msgId, Message.DELETED)); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 268f576c00..5675a9a37e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -233,7 +233,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket if ((item.getEnchantLevel() == minEnchantAnnounce) || (item.getEnchantLevel() == maxEnchantAnnounce)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_SUCCESSFULLY_ENCHANTED_A_S2_S3); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sm.addInt(item.getEnchantLevel()); sm.addItemName(item); activeChar.broadcastPacket(sm); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java index c0042d45c5..aa110b024b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java @@ -115,7 +115,7 @@ public final class RequestJoinParty implements IClientIncomingPacket if (target.isPartyBanned()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_CANNOT_JOIN_A_PARTY); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); return; } @@ -144,7 +144,7 @@ public final class RequestJoinParty implements IClientIncomingPacket if (BlockList.isBlocked(target, requestor)) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); return; } @@ -177,7 +177,7 @@ public final class RequestJoinParty implements IClientIncomingPacket } sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_INVITED_TO_THE_PARTY); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); if (!requestor.isInParty()) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 10f2f8906d..236bc251a2 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -244,7 +244,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket sender.addAdena("PayMail", adena, activeChar, false); sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HAS_MADE_A_PAYMENT_OF_S1_ADENA_PER_YOUR_PAYMENT_REQUEST_MAIL); sm.addLong(adena); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } else @@ -259,7 +259,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket else if (sender != null) { sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ACQUIRED_THE_ATTACHED_ITEM_TO_YOUR_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 566b570b58..fab65aaf02 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -95,7 +95,7 @@ public final class RequestRejectPostAttachment implements IClientIncomingPacket if (sender != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_RETURNED_THE_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 09c1d6ea32..7675b1221d 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -160,7 +160,7 @@ public final class TradeRequest implements IClientIncomingPacket if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED); - sm.addCharName(partner); + sm.addString(partner.getName()); client.sendPacket(sm); client.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -217,7 +217,7 @@ public final class TradeRequest implements IClientIncomingPacket if (BlockList.isBlocked(partner, player)) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST); - sm.addCharName(partner); + sm.addString(partner.getName()); client.sendPacket(sm); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 7dc7faf77a..076d40a420 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -66,7 +66,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket || requestor.getFriendList().contains(player.getObjectId())) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_ON_YOUR_FRIEND_LIST); - sm.addCharName(player); + sm.addString(player.getName()); requestor.sendPacket(sm); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java index 530a6d7a01..f14c3fa651 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java @@ -116,7 +116,7 @@ public final class RequestFriendInvite implements IClientIncomingPacket if (BlockList.isBlocked(activeChar, friend)) { sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_BLOCKED_C1); - sm.addCharName(friend); + sm.addString(friend.getName()); activeChar.sendPacket(sm); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 0c907de10f..29a252aa5e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -69,8 +69,8 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket if (_confirmed == 0) { - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLINED_S1_S_MENTORING_OFFER).addCharName(mentor)); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLINED_BECOMING_YOUR_MENTEE).addCharName(mentee)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLINED_S1_S_MENTORING_OFFER).addString(mentor.getName())); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLINED_BECOMING_YOUR_MENTEE).addString(mentee.getName())); } else if (validate(mentor, mentee)) { @@ -86,10 +86,10 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerMenteeAdd(mentor, mentee), mentor); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addString(mentee.getName())); mentor.sendPacket(new ExMentorList(mentor)); - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addCharName(mentor)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addString(mentor.getName())); mentee.sendPacket(new ExMentorList(mentee)); } catch (Exception e) @@ -142,7 +142,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } else if (mentee.getLevel() >= 86) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addString(mentee.getName())); return false; } else if (mentee.isSubClassActive()) @@ -153,7 +153,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket // else if (mentee.getInventory().getItemByItemId(MENTEE_CERT) == null) // { - // mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_HAVE_THE_ITEM_NEEDED_TO_BECOME_A_MENTEE).addCharName(mentee)); + // mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_HAVE_THE_ITEM_NEEDED_TO_BECOME_A_MENTEE).addString(mentee)); // return false; // } else if ((MentorManager.getInstance().getMentees(mentor.getObjectId()) != null) && (MentorManager.getInstance().getMentees(mentor.getObjectId()).size() >= 3)) @@ -163,7 +163,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } else if (mentee.isMentee()) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_HAS_A_MENTOR).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_HAS_A_MENTOR).addString(mentee.getName())); return false; } return true; diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java index 9e3aecbff4..1667a2042e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java @@ -56,7 +56,7 @@ public class RequestMenteeAdd implements IClientIncomingPacket if (ConfirmMenteeAdd.validate(mentor, mentee)) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OFFERED_TO_BECOME_S1_S_MENTOR).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OFFERED_TO_BECOME_S1_S_MENTOR).addString(mentee.getName())); mentee.sendPacket(new ExMentorAdd(mentor)); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index bcc078c8e4..075fbfa083 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -21,10 +21,8 @@ import java.util.Arrays; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.datatables.ItemTable; -import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; -import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.model.items.L2Item; @@ -182,38 +180,6 @@ public abstract class AbstractMessagePacket> return (T) this; } - public final T addCharName(L2Character cha) - { - if (cha.isNpc()) - { - final L2Npc npc = (L2Npc) cha; - if (npc.getTemplate().isUsingServerSideName()) - { - return addString(npc.getTemplate().getName()); - } - return addNpcName(npc); - } - else if (cha.isPlayer()) - { - return addPcName(cha.getActingPlayer()); - } - else if (cha.isSummon()) - { - final L2Summon summon = (L2Summon) cha; - if (summon.getTemplate().isUsingServerSideName()) - { - return addString(summon.getTemplate().getName()); - } - return addNpcName(summon); - } - else if (cha.isDoor()) - { - final L2DoorInstance door = (L2DoorInstance) cha; - return addDoorName(door.getId()); - } - return addString(cha.getName()); - } - public final T addPcName(L2PcInstance pc) { append(new SMParam(TYPE_PLAYER_NAME, pc.getAppearance().getVisibleName())); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index 8499c186a1..49e8094f6d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -267,7 +267,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader // Add the mentee skill handleMenteeSkills(player); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_CONNECTED).addCharName(player)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_CONNECTED).addString(player.getName())); mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance())); } } @@ -283,7 +283,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader MentorManager.getInstance().cancelAllMentoringBuffs(mentor.getPlayerInstance()); } - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addCharName(player)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addString(player.getName())); mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance())); } } @@ -319,7 +319,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader } } - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_CONNECTED).addCharName(player)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_CONNECTED).addString(player.getName())); mentee.sendPacket(new ExMentorList(mentee.getPlayerInstance())); }); @@ -342,7 +342,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader startQuestTimer("REMOVE_BUFFS " + player.getObjectId(), 5 * 60 * 1000, null, null); MentorManager.getInstance().getMentees(player.getObjectId()).stream().filter(Objects::nonNull).filter(L2Mentee::isOnline).forEach(mentee -> { - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_DISCONNECTED).addCharName(player)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_DISCONNECTED).addString(player.getName())); mentee.sendPacket(new ExMentorList(mentee.getPlayerInstance())); }); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java index 8f7f36bebe..d0efd7413e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java @@ -111,7 +111,7 @@ public class AdminPledge implements IAdminCommandHandler if (!targetPlayer.isClanLeader()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER); - sm.addCharName(targetPlayer); + sm.addString(targetPlayer.getName()); activeChar.sendPacket(sm); showMainPage(activeChar); return false; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e456330ff3..8526524efd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -80,7 +80,7 @@ public final class CallPc extends AbstractEffect target.addScript(new SummonRequestHolder(activeChar, skill)); final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId()); - confirm.addCharName(activeChar); + confirm.addString(activeChar.getName()); confirm.addZoneName(activeChar.getX(), activeChar.getY(), activeChar.getZ()); confirm.addTime(30000); confirm.addRequesterId(activeChar.getObjectId()); @@ -134,7 +134,7 @@ public final class CallPc extends AbstractEffect if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2); - sm.addCharName(target); + sm.addString(target.getName()); activeChar.sendPacket(sm); return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java index b45bcdf653..a39da1c0eb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -81,7 +81,7 @@ public final class Cp extends AbstractEffect if ((effector != null) && (effector != effected)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); sm.addInt((int) amount); effected.sendPacket(sm); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6edc4fe3c8..b7231e71be 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -78,7 +78,7 @@ public final class HealPercent extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 5e9db7f727..f19d9dec50 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -82,7 +82,7 @@ public final class Hp extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 63f00f87d9..115e5138a4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -67,8 +67,8 @@ public final class MagicalAttackMp extends AbstractEffect if (effected.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_C2_S_DRAIN); - sm.addCharName(effected); - sm.addCharName(effector); + sm.addString(effected.getName()); + sm.addString(effector.getName()); effected.sendPacket(sm); } return false; @@ -112,7 +112,7 @@ public final class MagicalAttackMp extends AbstractEffect if (effected.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S_MP_HAS_BEEN_DRAINED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); sm.addInt((int) mp); effected.sendPacket(sm); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index ad67df3f6f..47b003ec45 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -75,7 +75,7 @@ public final class ManaHeal extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 03d00a766b..bb66d60d5e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -128,7 +128,7 @@ public final class ManaHealByLevel extends AbstractEffect final SystemMessage sm = SystemMessage.getSystemMessage(effector.getObjectId() != effected.getObjectId() ? SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1 : SystemMessageId.S1_MP_HAS_BEEN_RESTORED); if (effector.getObjectId() != effected.getObjectId()) { - sm.addCharName(effector); + sm.addString(effector.getName()); } sm.addInt((int) amount); effected.sendPacket(sm); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 756649b992..b3b7aa52ba 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -75,7 +75,7 @@ public final class ManaHealPercent extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29f236dd54..713af002bc 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -82,7 +82,7 @@ public final class Mp extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 291578b7c8..5799fbb221 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -95,7 +95,7 @@ public class TeleportToPlayer extends AbstractEffect if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2); - sm.addCharName(target); + sm.addString(target.getName()); effector.sendPacket(sm); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java index a77eb2d2d7..dbcfdb4423 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java @@ -158,7 +158,7 @@ public final class HandysBlockCheckerManager if (_arenaPlayers[i].getAllPlayers().contains(player)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST); - msg.addCharName(player); + msg.addString(player.getName()); player.sendPacket(msg); return false; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java index 6bd41572d8..5b6e9281fe 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Party.java @@ -436,7 +436,7 @@ public class L2Party extends AbstractPlayerGroup final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2); sm.addPcName(activeChar); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); getMembers().forEach(m -> @@ -459,7 +459,7 @@ public class L2Party extends AbstractPlayerGroup final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2); sm.addPcName(activeChar); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); getMembers().forEach(m -> diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index b0e622b61a..ff1e71cd62 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -1026,7 +1026,7 @@ public class L2Attackable extends L2Npc if (isRaid() && !isRaidMinion()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); - sm.addCharName(this); + sm.addString(getName()); sm.addItemName(item); sm.addLong(drop.getCount()); broadcastPacket(sm); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index e99727d27c..f3f40ed240 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11510,7 +11510,7 @@ public final class L2PcInstance extends L2Playable { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK); sm.addPcName(target.getActingPlayer()); - sm.addCharName(this); + sm.addString(getName()); target.sendPacket(sm); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ATTACK_WENT_ASTRAY); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index 4ab075905b..4a222f4eb9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -272,7 +272,7 @@ public final class L2TrapInstance extends L2Npc else { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4); - sm.addCharName(this); + sm.addString(getName()); sm.addString(target.getName()); sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1)); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java index f1c20a33eb..76c6d6f9bb 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java @@ -52,7 +52,7 @@ public class PetStatus extends SummonStatus if (!isDOT && (getActiveChar().getOwner() != null)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_BY_C1); - sm.addCharName(attacker); + sm.addString(attacker.getName()); sm.addInt((int) value); getActiveChar().sendPacket(sm); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 8d423decc8..b574b7143e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -287,7 +287,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent else { msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); - msg.addCharName(winners.get(0).getPlayer()); + msg.addString(winners.get(0).getPlayer().getName()); } for (CeremonyOfChaosMember member : getMembers().values()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index 29c6c47ec1..69bd4f131c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -31,7 +31,7 @@ public final class ConditionDistance extends Condition public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); - setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 26f95be4e9..f6e41a273d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -40,7 +40,7 @@ public final class ConditionItem extends Condition _count = parameters.getLong("count"); _take = parameters.getBoolean("take", false); // Set message - setSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (msg, player) -> msg.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (msg, player) -> msg.addString(player.getName())); } @Override diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index c85399fdf8..070cb346b3 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -38,7 +38,7 @@ public final class ConditionLevel extends Condition _min = parameters.getInt("min", 1); _max = parameters.getInt("max", Integer.MAX_VALUE); // Set message - setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); } @Override diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 743377691f..9a82901565 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -35,7 +35,7 @@ public final class ConditionQuest extends Condition { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message - setSystemMessage(SystemMessageId.C1_S_QUEST_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_QUEST_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 91fff12af7..076d585031 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -33,7 +33,7 @@ public final class ConditionReenter extends Condition public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); - setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 66ca7e3c01..5a966224c4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -175,7 +175,7 @@ public final class Formulas else { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); damage = 1; @@ -185,7 +185,7 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm = (skill.hasEffectType(L2EffectType.HP_DRAIN)) ? SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_DRAIN) : SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_MAGIC); - sm.addCharName(attacker); + sm.addString(attacker.getName()); target.sendPacket(sm); } } @@ -674,7 +674,7 @@ public final class Formulas if (resisted) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); return false; @@ -705,7 +705,7 @@ public final class Formulas if ((finalRate <= Rnd.get(100)) && (target != attacker)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); return false; @@ -837,8 +837,8 @@ public final class Formulas if (attacker.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DAMAGE_IS_DECREASED_BECAUSE_C1_RESISTED_C2_S_MAGIC); - sm.addCharName(target); - sm.addCharName(attacker); + sm.addString(target.getName()); + sm.addString(attacker.getName()); attacker.sendPacket(sm); damage /= 2; } @@ -846,8 +846,8 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.C1_WEAKLY_RESISTED_C2_S_MAGIC); - sm2.addCharName(target); - sm2.addCharName(attacker); + sm2.addString(target.getName()); + sm2.addString(attacker.getName()); target.sendPacket(sm2); } } @@ -976,13 +976,13 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_COUNTERED_C1_S_ATTACK); - sm.addCharName(attacker); + sm.addString(attacker.getName()); target.sendPacket(sm); } if (attacker.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PERFORMING_A_COUNTERATTACK); - sm.addCharName(target); + sm.addString(target.getName()); attacker.sendPacket(sm); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9a84b31ae4..cb27698f70 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -210,7 +210,7 @@ public final class RequestCancelPostAttachment implements IClientIncomingPacket if (receiver != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANCELED_THE_SENT_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); receiver.sendPacket(sm); receiver.sendPacket(new ExChangePostState(true, _msgId, Message.DELETED)); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 268f576c00..5675a9a37e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -233,7 +233,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket if ((item.getEnchantLevel() == minEnchantAnnounce) || (item.getEnchantLevel() == maxEnchantAnnounce)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_SUCCESSFULLY_ENCHANTED_A_S2_S3); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sm.addInt(item.getEnchantLevel()); sm.addItemName(item); activeChar.broadcastPacket(sm); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java index c0042d45c5..aa110b024b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java @@ -115,7 +115,7 @@ public final class RequestJoinParty implements IClientIncomingPacket if (target.isPartyBanned()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_CANNOT_JOIN_A_PARTY); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); return; } @@ -144,7 +144,7 @@ public final class RequestJoinParty implements IClientIncomingPacket if (BlockList.isBlocked(target, requestor)) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); return; } @@ -177,7 +177,7 @@ public final class RequestJoinParty implements IClientIncomingPacket } sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_INVITED_TO_THE_PARTY); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); if (!requestor.isInParty()) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 10f2f8906d..236bc251a2 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -244,7 +244,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket sender.addAdena("PayMail", adena, activeChar, false); sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HAS_MADE_A_PAYMENT_OF_S1_ADENA_PER_YOUR_PAYMENT_REQUEST_MAIL); sm.addLong(adena); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } else @@ -259,7 +259,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket else if (sender != null) { sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ACQUIRED_THE_ATTACHED_ITEM_TO_YOUR_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 566b570b58..fab65aaf02 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -95,7 +95,7 @@ public final class RequestRejectPostAttachment implements IClientIncomingPacket if (sender != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_RETURNED_THE_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 09c1d6ea32..7675b1221d 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -160,7 +160,7 @@ public final class TradeRequest implements IClientIncomingPacket if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED); - sm.addCharName(partner); + sm.addString(partner.getName()); client.sendPacket(sm); client.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -217,7 +217,7 @@ public final class TradeRequest implements IClientIncomingPacket if (BlockList.isBlocked(partner, player)) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST); - sm.addCharName(partner); + sm.addString(partner.getName()); client.sendPacket(sm); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 7dc7faf77a..076d40a420 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -66,7 +66,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket || requestor.getFriendList().contains(player.getObjectId())) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_ON_YOUR_FRIEND_LIST); - sm.addCharName(player); + sm.addString(player.getName()); requestor.sendPacket(sm); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java index 530a6d7a01..f14c3fa651 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java @@ -116,7 +116,7 @@ public final class RequestFriendInvite implements IClientIncomingPacket if (BlockList.isBlocked(activeChar, friend)) { sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_BLOCKED_C1); - sm.addCharName(friend); + sm.addString(friend.getName()); activeChar.sendPacket(sm); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 0c907de10f..29a252aa5e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -69,8 +69,8 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket if (_confirmed == 0) { - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLINED_S1_S_MENTORING_OFFER).addCharName(mentor)); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLINED_BECOMING_YOUR_MENTEE).addCharName(mentee)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLINED_S1_S_MENTORING_OFFER).addString(mentor.getName())); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLINED_BECOMING_YOUR_MENTEE).addString(mentee.getName())); } else if (validate(mentor, mentee)) { @@ -86,10 +86,10 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerMenteeAdd(mentor, mentee), mentor); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addString(mentee.getName())); mentor.sendPacket(new ExMentorList(mentor)); - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addCharName(mentor)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addString(mentor.getName())); mentee.sendPacket(new ExMentorList(mentee)); } catch (Exception e) @@ -142,7 +142,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } else if (mentee.getLevel() >= 86) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addString(mentee.getName())); return false; } else if (mentee.isSubClassActive()) @@ -153,7 +153,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket // else if (mentee.getInventory().getItemByItemId(MENTEE_CERT) == null) // { - // mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_HAVE_THE_ITEM_NEEDED_TO_BECOME_A_MENTEE).addCharName(mentee)); + // mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_HAVE_THE_ITEM_NEEDED_TO_BECOME_A_MENTEE).addString(mentee)); // return false; // } else if ((MentorManager.getInstance().getMentees(mentor.getObjectId()) != null) && (MentorManager.getInstance().getMentees(mentor.getObjectId()).size() >= 3)) @@ -163,7 +163,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } else if (mentee.isMentee()) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_HAS_A_MENTOR).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_HAS_A_MENTOR).addString(mentee.getName())); return false; } return true; diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java index 9e3aecbff4..1667a2042e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java @@ -56,7 +56,7 @@ public class RequestMenteeAdd implements IClientIncomingPacket if (ConfirmMenteeAdd.validate(mentor, mentee)) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OFFERED_TO_BECOME_S1_S_MENTOR).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OFFERED_TO_BECOME_S1_S_MENTOR).addString(mentee.getName())); mentee.sendPacket(new ExMentorAdd(mentor)); } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 826065a6da..4160658f49 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -21,10 +21,8 @@ import java.util.Arrays; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.datatables.ItemTable; -import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; -import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.model.items.L2Item; @@ -182,38 +180,6 @@ public abstract class AbstractMessagePacket> return (T) this; } - public final T addCharName(L2Character cha) - { - if (cha.isNpc()) - { - final L2Npc npc = (L2Npc) cha; - if (npc.getTemplate().isUsingServerSideName()) - { - return addString(npc.getTemplate().getName()); - } - return addNpcName(npc); - } - else if (cha.isPlayer()) - { - return addPcName(cha.getActingPlayer()); - } - else if (cha.isSummon()) - { - final L2Summon summon = (L2Summon) cha; - if (summon.getTemplate().isUsingServerSideName()) - { - return addString(summon.getTemplate().getName()); - } - return addNpcName(summon); - } - else if (cha.isDoor()) - { - final L2DoorInstance door = (L2DoorInstance) cha; - return addDoorName(door.getId()); - } - return addString(cha.getName()); - } - public final T addPcName(L2PcInstance pc) { append(new SMParam(TYPE_PLAYER_NAME, pc.getAppearance().getVisibleName())); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index 8499c186a1..49e8094f6d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -267,7 +267,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader // Add the mentee skill handleMenteeSkills(player); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_CONNECTED).addCharName(player)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_CONNECTED).addString(player.getName())); mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance())); } } @@ -283,7 +283,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader MentorManager.getInstance().cancelAllMentoringBuffs(mentor.getPlayerInstance()); } - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addCharName(player)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addString(player.getName())); mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance())); } } @@ -319,7 +319,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader } } - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_CONNECTED).addCharName(player)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_CONNECTED).addString(player.getName())); mentee.sendPacket(new ExMentorList(mentee.getPlayerInstance())); }); @@ -342,7 +342,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader startQuestTimer("REMOVE_BUFFS " + player.getObjectId(), 5 * 60 * 1000, null, null); MentorManager.getInstance().getMentees(player.getObjectId()).stream().filter(Objects::nonNull).filter(L2Mentee::isOnline).forEach(mentee -> { - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_DISCONNECTED).addCharName(player)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_DISCONNECTED).addString(player.getName())); mentee.sendPacket(new ExMentorList(mentee.getPlayerInstance())); }); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java index 8f7f36bebe..d0efd7413e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java @@ -111,7 +111,7 @@ public class AdminPledge implements IAdminCommandHandler if (!targetPlayer.isClanLeader()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER); - sm.addCharName(targetPlayer); + sm.addString(targetPlayer.getName()); activeChar.sendPacket(sm); showMainPage(activeChar); return false; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e456330ff3..8526524efd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -80,7 +80,7 @@ public final class CallPc extends AbstractEffect target.addScript(new SummonRequestHolder(activeChar, skill)); final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId()); - confirm.addCharName(activeChar); + confirm.addString(activeChar.getName()); confirm.addZoneName(activeChar.getX(), activeChar.getY(), activeChar.getZ()); confirm.addTime(30000); confirm.addRequesterId(activeChar.getObjectId()); @@ -134,7 +134,7 @@ public final class CallPc extends AbstractEffect if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2); - sm.addCharName(target); + sm.addString(target.getName()); activeChar.sendPacket(sm); return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java index b45bcdf653..a39da1c0eb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -81,7 +81,7 @@ public final class Cp extends AbstractEffect if ((effector != null) && (effector != effected)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); sm.addInt((int) amount); effected.sendPacket(sm); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6edc4fe3c8..b7231e71be 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -78,7 +78,7 @@ public final class HealPercent extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 5e9db7f727..f19d9dec50 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -82,7 +82,7 @@ public final class Hp extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 63f00f87d9..115e5138a4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -67,8 +67,8 @@ public final class MagicalAttackMp extends AbstractEffect if (effected.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_C2_S_DRAIN); - sm.addCharName(effected); - sm.addCharName(effector); + sm.addString(effected.getName()); + sm.addString(effector.getName()); effected.sendPacket(sm); } return false; @@ -112,7 +112,7 @@ public final class MagicalAttackMp extends AbstractEffect if (effected.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S_MP_HAS_BEEN_DRAINED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); sm.addInt((int) mp); effected.sendPacket(sm); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index ad67df3f6f..47b003ec45 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -75,7 +75,7 @@ public final class ManaHeal extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 03d00a766b..bb66d60d5e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -128,7 +128,7 @@ public final class ManaHealByLevel extends AbstractEffect final SystemMessage sm = SystemMessage.getSystemMessage(effector.getObjectId() != effected.getObjectId() ? SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1 : SystemMessageId.S1_MP_HAS_BEEN_RESTORED); if (effector.getObjectId() != effected.getObjectId()) { - sm.addCharName(effector); + sm.addString(effector.getName()); } sm.addInt((int) amount); effected.sendPacket(sm); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 756649b992..b3b7aa52ba 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -75,7 +75,7 @@ public final class ManaHealPercent extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29f236dd54..713af002bc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -82,7 +82,7 @@ public final class Mp extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 291578b7c8..5799fbb221 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -95,7 +95,7 @@ public class TeleportToPlayer extends AbstractEffect if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2); - sm.addCharName(target); + sm.addString(target.getName()); effector.sendPacket(sm); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java index a77eb2d2d7..dbcfdb4423 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java @@ -158,7 +158,7 @@ public final class HandysBlockCheckerManager if (_arenaPlayers[i].getAllPlayers().contains(player)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST); - msg.addCharName(player); + msg.addString(player.getName()); player.sendPacket(msg); return false; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java index 6bd41572d8..5b6e9281fe 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Party.java @@ -436,7 +436,7 @@ public class L2Party extends AbstractPlayerGroup final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2); sm.addPcName(activeChar); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); getMembers().forEach(m -> @@ -459,7 +459,7 @@ public class L2Party extends AbstractPlayerGroup final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2); sm.addPcName(activeChar); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); getMembers().forEach(m -> diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index b0e622b61a..ff1e71cd62 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -1026,7 +1026,7 @@ public class L2Attackable extends L2Npc if (isRaid() && !isRaidMinion()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); - sm.addCharName(this); + sm.addString(getName()); sm.addItemName(item); sm.addLong(drop.getCount()); broadcastPacket(sm); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 1231001706..131816f962 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11520,7 +11520,7 @@ public final class L2PcInstance extends L2Playable { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK); sm.addPcName(target.getActingPlayer()); - sm.addCharName(this); + sm.addString(getName()); target.sendPacket(sm); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ATTACK_WENT_ASTRAY); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index 4ab075905b..4a222f4eb9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -272,7 +272,7 @@ public final class L2TrapInstance extends L2Npc else { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4); - sm.addCharName(this); + sm.addString(getName()); sm.addString(target.getName()); sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1)); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java index f1c20a33eb..76c6d6f9bb 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java @@ -52,7 +52,7 @@ public class PetStatus extends SummonStatus if (!isDOT && (getActiveChar().getOwner() != null)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_BY_C1); - sm.addCharName(attacker); + sm.addString(attacker.getName()); sm.addInt((int) value); getActiveChar().sendPacket(sm); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 8d423decc8..b574b7143e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -287,7 +287,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent else { msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); - msg.addCharName(winners.get(0).getPlayer()); + msg.addString(winners.get(0).getPlayer().getName()); } for (CeremonyOfChaosMember member : getMembers().values()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index 29c6c47ec1..69bd4f131c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -31,7 +31,7 @@ public final class ConditionDistance extends Condition public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); - setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 26f95be4e9..f6e41a273d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -40,7 +40,7 @@ public final class ConditionItem extends Condition _count = parameters.getLong("count"); _take = parameters.getBoolean("take", false); // Set message - setSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (msg, player) -> msg.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (msg, player) -> msg.addString(player.getName())); } @Override diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index c85399fdf8..070cb346b3 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -38,7 +38,7 @@ public final class ConditionLevel extends Condition _min = parameters.getInt("min", 1); _max = parameters.getInt("max", Integer.MAX_VALUE); // Set message - setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); } @Override diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 743377691f..9a82901565 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -35,7 +35,7 @@ public final class ConditionQuest extends Condition { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message - setSystemMessage(SystemMessageId.C1_S_QUEST_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_QUEST_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 91fff12af7..076d585031 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -33,7 +33,7 @@ public final class ConditionReenter extends Condition public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); - setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 66ca7e3c01..5a966224c4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -175,7 +175,7 @@ public final class Formulas else { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); damage = 1; @@ -185,7 +185,7 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm = (skill.hasEffectType(L2EffectType.HP_DRAIN)) ? SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_DRAIN) : SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_MAGIC); - sm.addCharName(attacker); + sm.addString(attacker.getName()); target.sendPacket(sm); } } @@ -674,7 +674,7 @@ public final class Formulas if (resisted) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); return false; @@ -705,7 +705,7 @@ public final class Formulas if ((finalRate <= Rnd.get(100)) && (target != attacker)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); return false; @@ -837,8 +837,8 @@ public final class Formulas if (attacker.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DAMAGE_IS_DECREASED_BECAUSE_C1_RESISTED_C2_S_MAGIC); - sm.addCharName(target); - sm.addCharName(attacker); + sm.addString(target.getName()); + sm.addString(attacker.getName()); attacker.sendPacket(sm); damage /= 2; } @@ -846,8 +846,8 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.C1_WEAKLY_RESISTED_C2_S_MAGIC); - sm2.addCharName(target); - sm2.addCharName(attacker); + sm2.addString(target.getName()); + sm2.addString(attacker.getName()); target.sendPacket(sm2); } } @@ -976,13 +976,13 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_COUNTERED_C1_S_ATTACK); - sm.addCharName(attacker); + sm.addString(attacker.getName()); target.sendPacket(sm); } if (attacker.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PERFORMING_A_COUNTERATTACK); - sm.addCharName(target); + sm.addString(target.getName()); attacker.sendPacket(sm); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9a84b31ae4..cb27698f70 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -210,7 +210,7 @@ public final class RequestCancelPostAttachment implements IClientIncomingPacket if (receiver != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANCELED_THE_SENT_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); receiver.sendPacket(sm); receiver.sendPacket(new ExChangePostState(true, _msgId, Message.DELETED)); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 268f576c00..5675a9a37e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -233,7 +233,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket if ((item.getEnchantLevel() == minEnchantAnnounce) || (item.getEnchantLevel() == maxEnchantAnnounce)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_SUCCESSFULLY_ENCHANTED_A_S2_S3); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sm.addInt(item.getEnchantLevel()); sm.addItemName(item); activeChar.broadcastPacket(sm); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java index c0042d45c5..aa110b024b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java @@ -115,7 +115,7 @@ public final class RequestJoinParty implements IClientIncomingPacket if (target.isPartyBanned()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_CANNOT_JOIN_A_PARTY); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); return; } @@ -144,7 +144,7 @@ public final class RequestJoinParty implements IClientIncomingPacket if (BlockList.isBlocked(target, requestor)) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); return; } @@ -177,7 +177,7 @@ public final class RequestJoinParty implements IClientIncomingPacket } sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_INVITED_TO_THE_PARTY); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); if (!requestor.isInParty()) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 10f2f8906d..236bc251a2 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -244,7 +244,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket sender.addAdena("PayMail", adena, activeChar, false); sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HAS_MADE_A_PAYMENT_OF_S1_ADENA_PER_YOUR_PAYMENT_REQUEST_MAIL); sm.addLong(adena); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } else @@ -259,7 +259,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket else if (sender != null) { sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ACQUIRED_THE_ATTACHED_ITEM_TO_YOUR_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 566b570b58..fab65aaf02 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -95,7 +95,7 @@ public final class RequestRejectPostAttachment implements IClientIncomingPacket if (sender != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_RETURNED_THE_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 09c1d6ea32..7675b1221d 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -160,7 +160,7 @@ public final class TradeRequest implements IClientIncomingPacket if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED); - sm.addCharName(partner); + sm.addString(partner.getName()); client.sendPacket(sm); client.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -217,7 +217,7 @@ public final class TradeRequest implements IClientIncomingPacket if (BlockList.isBlocked(partner, player)) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST); - sm.addCharName(partner); + sm.addString(partner.getName()); client.sendPacket(sm); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 7dc7faf77a..076d40a420 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -66,7 +66,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket || requestor.getFriendList().contains(player.getObjectId())) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_ON_YOUR_FRIEND_LIST); - sm.addCharName(player); + sm.addString(player.getName()); requestor.sendPacket(sm); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java index 530a6d7a01..f14c3fa651 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java @@ -116,7 +116,7 @@ public final class RequestFriendInvite implements IClientIncomingPacket if (BlockList.isBlocked(activeChar, friend)) { sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_BLOCKED_C1); - sm.addCharName(friend); + sm.addString(friend.getName()); activeChar.sendPacket(sm); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 0c907de10f..29a252aa5e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -69,8 +69,8 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket if (_confirmed == 0) { - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLINED_S1_S_MENTORING_OFFER).addCharName(mentor)); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLINED_BECOMING_YOUR_MENTEE).addCharName(mentee)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLINED_S1_S_MENTORING_OFFER).addString(mentor.getName())); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLINED_BECOMING_YOUR_MENTEE).addString(mentee.getName())); } else if (validate(mentor, mentee)) { @@ -86,10 +86,10 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerMenteeAdd(mentor, mentee), mentor); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addString(mentee.getName())); mentor.sendPacket(new ExMentorList(mentor)); - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addCharName(mentor)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addString(mentor.getName())); mentee.sendPacket(new ExMentorList(mentee)); } catch (Exception e) @@ -142,7 +142,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } else if (mentee.getLevel() >= 86) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addString(mentee.getName())); return false; } else if (mentee.isSubClassActive()) @@ -153,7 +153,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket // else if (mentee.getInventory().getItemByItemId(MENTEE_CERT) == null) // { - // mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_HAVE_THE_ITEM_NEEDED_TO_BECOME_A_MENTEE).addCharName(mentee)); + // mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_HAVE_THE_ITEM_NEEDED_TO_BECOME_A_MENTEE).addString(mentee)); // return false; // } else if ((MentorManager.getInstance().getMentees(mentor.getObjectId()) != null) && (MentorManager.getInstance().getMentees(mentor.getObjectId()).size() >= 3)) @@ -163,7 +163,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } else if (mentee.isMentee()) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_HAS_A_MENTOR).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_HAS_A_MENTOR).addString(mentee.getName())); return false; } return true; diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java index 9e3aecbff4..1667a2042e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java @@ -56,7 +56,7 @@ public class RequestMenteeAdd implements IClientIncomingPacket if (ConfirmMenteeAdd.validate(mentor, mentee)) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OFFERED_TO_BECOME_S1_S_MENTOR).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OFFERED_TO_BECOME_S1_S_MENTOR).addString(mentee.getName())); mentee.sendPacket(new ExMentorAdd(mentor)); } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 826065a6da..4160658f49 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -21,10 +21,8 @@ import java.util.Arrays; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.datatables.ItemTable; -import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; -import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.model.items.L2Item; @@ -182,38 +180,6 @@ public abstract class AbstractMessagePacket> return (T) this; } - public final T addCharName(L2Character cha) - { - if (cha.isNpc()) - { - final L2Npc npc = (L2Npc) cha; - if (npc.getTemplate().isUsingServerSideName()) - { - return addString(npc.getTemplate().getName()); - } - return addNpcName(npc); - } - else if (cha.isPlayer()) - { - return addPcName(cha.getActingPlayer()); - } - else if (cha.isSummon()) - { - final L2Summon summon = (L2Summon) cha; - if (summon.getTemplate().isUsingServerSideName()) - { - return addString(summon.getTemplate().getName()); - } - return addNpcName(summon); - } - else if (cha.isDoor()) - { - final L2DoorInstance door = (L2DoorInstance) cha; - return addDoorName(door.getId()); - } - return addString(cha.getName()); - } - public final T addPcName(L2PcInstance pc) { append(new SMParam(TYPE_PLAYER_NAME, pc.getAppearance().getVisibleName())); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java index 8499c186a1..49e8094f6d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/MentorGuide/MentorGuide.java @@ -267,7 +267,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader // Add the mentee skill handleMenteeSkills(player); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_CONNECTED).addCharName(player)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_CONNECTED).addString(player.getName())); mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance())); } } @@ -283,7 +283,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader MentorManager.getInstance().cancelAllMentoringBuffs(mentor.getPlayerInstance()); } - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addCharName(player)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTEE_S1_HAS_DISCONNECTED).addString(player.getName())); mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance())); } } @@ -319,7 +319,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader } } - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_CONNECTED).addCharName(player)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_CONNECTED).addString(player.getName())); mentee.sendPacket(new ExMentorList(mentee.getPlayerInstance())); }); @@ -342,7 +342,7 @@ public final class MentorGuide extends AbstractNpcAI implements IGameXmlReader startQuestTimer("REMOVE_BUFFS " + player.getObjectId(), 5 * 60 * 1000, null, null); MentorManager.getInstance().getMentees(player.getObjectId()).stream().filter(Objects::nonNull).filter(L2Mentee::isOnline).forEach(mentee -> { - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_DISCONNECTED).addCharName(player)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOUR_MENTOR_S1_HAS_DISCONNECTED).addString(player.getName())); mentee.sendPacket(new ExMentorList(mentee.getPlayerInstance())); }); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java index 8f7f36bebe..d0efd7413e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java @@ -111,7 +111,7 @@ public class AdminPledge implements IAdminCommandHandler if (!targetPlayer.isClanLeader()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER); - sm.addCharName(targetPlayer); + sm.addString(targetPlayer.getName()); activeChar.sendPacket(sm); showMainPage(activeChar); return false; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e456330ff3..8526524efd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -80,7 +80,7 @@ public final class CallPc extends AbstractEffect target.addScript(new SummonRequestHolder(activeChar, skill)); final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId()); - confirm.addCharName(activeChar); + confirm.addString(activeChar.getName()); confirm.addZoneName(activeChar.getX(), activeChar.getY(), activeChar.getZ()); confirm.addTime(30000); confirm.addRequesterId(activeChar.getObjectId()); @@ -134,7 +134,7 @@ public final class CallPc extends AbstractEffect if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2); - sm.addCharName(target); + sm.addString(target.getName()); activeChar.sendPacket(sm); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java index b45bcdf653..a39da1c0eb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -81,7 +81,7 @@ public final class Cp extends AbstractEffect if ((effector != null) && (effector != effected)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); sm.addInt((int) amount); effected.sendPacket(sm); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6edc4fe3c8..b7231e71be 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -78,7 +78,7 @@ public final class HealPercent extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 5e9db7f727..f19d9dec50 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -82,7 +82,7 @@ public final class Hp extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 63f00f87d9..115e5138a4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -67,8 +67,8 @@ public final class MagicalAttackMp extends AbstractEffect if (effected.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_C2_S_DRAIN); - sm.addCharName(effected); - sm.addCharName(effector); + sm.addString(effected.getName()); + sm.addString(effector.getName()); effected.sendPacket(sm); } return false; @@ -112,7 +112,7 @@ public final class MagicalAttackMp extends AbstractEffect if (effected.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S_MP_HAS_BEEN_DRAINED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); sm.addInt((int) mp); effected.sendPacket(sm); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index ad67df3f6f..47b003ec45 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -75,7 +75,7 @@ public final class ManaHeal extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 03d00a766b..bb66d60d5e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -128,7 +128,7 @@ public final class ManaHealByLevel extends AbstractEffect final SystemMessage sm = SystemMessage.getSystemMessage(effector.getObjectId() != effected.getObjectId() ? SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1 : SystemMessageId.S1_MP_HAS_BEEN_RESTORED); if (effector.getObjectId() != effected.getObjectId()) { - sm.addCharName(effector); + sm.addString(effector.getName()); } sm.addInt((int) amount); effected.sendPacket(sm); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 756649b992..b3b7aa52ba 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -75,7 +75,7 @@ public final class ManaHealPercent extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29f236dd54..713af002bc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -82,7 +82,7 @@ public final class Mp extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 291578b7c8..5799fbb221 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -95,7 +95,7 @@ public class TeleportToPlayer extends AbstractEffect if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2); - sm.addCharName(target); + sm.addString(target.getName()); effector.sendPacket(sm); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java index a77eb2d2d7..dbcfdb4423 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java @@ -158,7 +158,7 @@ public final class HandysBlockCheckerManager if (_arenaPlayers[i].getAllPlayers().contains(player)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST); - msg.addCharName(player); + msg.addString(player.getName()); player.sendPacket(msg); return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java index 6bd41572d8..5b6e9281fe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Party.java @@ -436,7 +436,7 @@ public class L2Party extends AbstractPlayerGroup final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2); sm.addPcName(activeChar); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); getMembers().forEach(m -> @@ -459,7 +459,7 @@ public class L2Party extends AbstractPlayerGroup final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2); sm.addPcName(activeChar); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); getMembers().forEach(m -> diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index b0e622b61a..ff1e71cd62 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -1026,7 +1026,7 @@ public class L2Attackable extends L2Npc if (isRaid() && !isRaidMinion()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); - sm.addCharName(this); + sm.addString(getName()); sm.addItemName(item); sm.addLong(drop.getCount()); broadcastPacket(sm); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 21c4b0e1a7..92dc30a1c1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11503,7 +11503,7 @@ public final class L2PcInstance extends L2Playable { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK); sm.addPcName(target.getActingPlayer()); - sm.addCharName(this); + sm.addString(getName()); target.sendPacket(sm); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ATTACK_WENT_ASTRAY); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index 4ab075905b..4a222f4eb9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -272,7 +272,7 @@ public final class L2TrapInstance extends L2Npc else { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4); - sm.addCharName(this); + sm.addString(getName()); sm.addString(target.getName()); sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1)); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java index f1c20a33eb..76c6d6f9bb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java @@ -52,7 +52,7 @@ public class PetStatus extends SummonStatus if (!isDOT && (getActiveChar().getOwner() != null)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_BY_C1); - sm.addCharName(attacker); + sm.addString(attacker.getName()); sm.addInt((int) value); getActiveChar().sendPacket(sm); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 8d423decc8..b574b7143e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -287,7 +287,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent else { msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); - msg.addCharName(winners.get(0).getPlayer()); + msg.addString(winners.get(0).getPlayer().getName()); } for (CeremonyOfChaosMember member : getMembers().values()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index 29c6c47ec1..69bd4f131c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -31,7 +31,7 @@ public final class ConditionDistance extends Condition public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); - setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 26f95be4e9..f6e41a273d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -40,7 +40,7 @@ public final class ConditionItem extends Condition _count = parameters.getLong("count"); _take = parameters.getBoolean("take", false); // Set message - setSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (msg, player) -> msg.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (msg, player) -> msg.addString(player.getName())); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index c85399fdf8..070cb346b3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -38,7 +38,7 @@ public final class ConditionLevel extends Condition _min = parameters.getInt("min", 1); _max = parameters.getInt("max", Integer.MAX_VALUE); // Set message - setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 743377691f..9a82901565 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -35,7 +35,7 @@ public final class ConditionQuest extends Condition { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message - setSystemMessage(SystemMessageId.C1_S_QUEST_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_QUEST_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 91fff12af7..076d585031 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -33,7 +33,7 @@ public final class ConditionReenter extends Condition public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); - setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 36bcd1d2de..30f652af5a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -175,7 +175,7 @@ public final class Formulas else { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); damage = 1; @@ -185,7 +185,7 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm = (skill.hasEffectType(L2EffectType.HP_DRAIN)) ? SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_DRAIN) : SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_MAGIC); - sm.addCharName(attacker); + sm.addString(attacker.getName()); target.sendPacket(sm); } } @@ -674,7 +674,7 @@ public final class Formulas if (resisted) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); return false; @@ -705,7 +705,7 @@ public final class Formulas if ((finalRate <= Rnd.get(100)) && (target != attacker)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); return false; @@ -837,8 +837,8 @@ public final class Formulas if (attacker.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DAMAGE_IS_DECREASED_BECAUSE_C1_RESISTED_C2_S_MAGIC); - sm.addCharName(target); - sm.addCharName(attacker); + sm.addString(target.getName()); + sm.addString(attacker.getName()); attacker.sendPacket(sm); damage /= 2; } @@ -846,8 +846,8 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.C1_WEAKLY_RESISTED_C2_S_MAGIC); - sm2.addCharName(target); - sm2.addCharName(attacker); + sm2.addString(target.getName()); + sm2.addString(attacker.getName()); target.sendPacket(sm2); } } @@ -976,13 +976,13 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_COUNTERED_C1_S_ATTACK); - sm.addCharName(attacker); + sm.addString(attacker.getName()); target.sendPacket(sm); } if (attacker.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PERFORMING_A_COUNTERATTACK); - sm.addCharName(target); + sm.addString(target.getName()); attacker.sendPacket(sm); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9a84b31ae4..cb27698f70 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -210,7 +210,7 @@ public final class RequestCancelPostAttachment implements IClientIncomingPacket if (receiver != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANCELED_THE_SENT_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); receiver.sendPacket(sm); receiver.sendPacket(new ExChangePostState(true, _msgId, Message.DELETED)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 268f576c00..5675a9a37e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -233,7 +233,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket if ((item.getEnchantLevel() == minEnchantAnnounce) || (item.getEnchantLevel() == maxEnchantAnnounce)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_SUCCESSFULLY_ENCHANTED_A_S2_S3); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sm.addInt(item.getEnchantLevel()); sm.addItemName(item); activeChar.broadcastPacket(sm); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java index c0042d45c5..aa110b024b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java @@ -115,7 +115,7 @@ public final class RequestJoinParty implements IClientIncomingPacket if (target.isPartyBanned()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_CANNOT_JOIN_A_PARTY); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); return; } @@ -144,7 +144,7 @@ public final class RequestJoinParty implements IClientIncomingPacket if (BlockList.isBlocked(target, requestor)) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); return; } @@ -177,7 +177,7 @@ public final class RequestJoinParty implements IClientIncomingPacket } sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_INVITED_TO_THE_PARTY); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); if (!requestor.isInParty()) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 10f2f8906d..236bc251a2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -244,7 +244,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket sender.addAdena("PayMail", adena, activeChar, false); sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HAS_MADE_A_PAYMENT_OF_S1_ADENA_PER_YOUR_PAYMENT_REQUEST_MAIL); sm.addLong(adena); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } else @@ -259,7 +259,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket else if (sender != null) { sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ACQUIRED_THE_ATTACHED_ITEM_TO_YOUR_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 566b570b58..fab65aaf02 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -95,7 +95,7 @@ public final class RequestRejectPostAttachment implements IClientIncomingPacket if (sender != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_RETURNED_THE_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 09c1d6ea32..7675b1221d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -160,7 +160,7 @@ public final class TradeRequest implements IClientIncomingPacket if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED); - sm.addCharName(partner); + sm.addString(partner.getName()); client.sendPacket(sm); client.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -217,7 +217,7 @@ public final class TradeRequest implements IClientIncomingPacket if (BlockList.isBlocked(partner, player)) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST); - sm.addCharName(partner); + sm.addString(partner.getName()); client.sendPacket(sm); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 7dc7faf77a..076d40a420 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -66,7 +66,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket || requestor.getFriendList().contains(player.getObjectId())) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_ON_YOUR_FRIEND_LIST); - sm.addCharName(player); + sm.addString(player.getName()); requestor.sendPacket(sm); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java index 530a6d7a01..f14c3fa651 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java @@ -116,7 +116,7 @@ public final class RequestFriendInvite implements IClientIncomingPacket if (BlockList.isBlocked(activeChar, friend)) { sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_BLOCKED_C1); - sm.addCharName(friend); + sm.addString(friend.getName()); activeChar.sendPacket(sm); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 0c907de10f..29a252aa5e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -69,8 +69,8 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket if (_confirmed == 0) { - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLINED_S1_S_MENTORING_OFFER).addCharName(mentor)); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLINED_BECOMING_YOUR_MENTEE).addCharName(mentee)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLINED_S1_S_MENTORING_OFFER).addString(mentor.getName())); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLINED_BECOMING_YOUR_MENTEE).addString(mentee.getName())); } else if (validate(mentor, mentee)) { @@ -86,10 +86,10 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerMenteeAdd(mentor, mentee), mentor); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addString(mentee.getName())); mentor.sendPacket(new ExMentorList(mentor)); - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addCharName(mentor)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addString(mentor.getName())); mentee.sendPacket(new ExMentorList(mentee)); } catch (Exception e) @@ -142,7 +142,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } else if (mentee.getLevel() >= 86) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addString(mentee.getName())); return false; } else if (mentee.isSubClassActive()) @@ -153,7 +153,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket // else if (mentee.getInventory().getItemByItemId(MENTEE_CERT) == null) // { - // mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_HAVE_THE_ITEM_NEEDED_TO_BECOME_A_MENTEE).addCharName(mentee)); + // mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_HAVE_THE_ITEM_NEEDED_TO_BECOME_A_MENTEE).addString(mentee)); // return false; // } else if ((MentorManager.getInstance().getMentees(mentor.getObjectId()) != null) && (MentorManager.getInstance().getMentees(mentor.getObjectId()).size() >= 3)) @@ -163,7 +163,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } else if (mentee.isMentee()) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_HAS_A_MENTOR).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_HAS_A_MENTOR).addString(mentee.getName())); return false; } return true; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java index 9e3aecbff4..1667a2042e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java @@ -56,7 +56,7 @@ public class RequestMenteeAdd implements IClientIncomingPacket if (ConfirmMenteeAdd.validate(mentor, mentee)) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OFFERED_TO_BECOME_S1_S_MENTOR).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OFFERED_TO_BECOME_S1_S_MENTOR).addString(mentee.getName())); mentee.sendPacket(new ExMentorAdd(mentor)); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 62d5c3076e..106d602916 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -21,10 +21,8 @@ import java.util.Arrays; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.datatables.ItemTable; -import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; -import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.model.items.L2Item; @@ -183,38 +181,6 @@ public abstract class AbstractMessagePacket> return (T) this; } - public final T addCharName(L2Character cha) - { - if (cha.isNpc()) - { - final L2Npc npc = (L2Npc) cha; - if (npc.getTemplate().isUsingServerSideName()) - { - return addString(npc.getTemplate().getName()); - } - return addNpcName(npc); - } - else if (cha.isPlayer()) - { - return addPcName(cha.getActingPlayer()); - } - else if (cha.isSummon()) - { - final L2Summon summon = (L2Summon) cha; - if (summon.getTemplate().isUsingServerSideName()) - { - return addString(summon.getTemplate().getName()); - } - return addNpcName(summon); - } - else if (cha.isDoor()) - { - final L2DoorInstance door = (L2DoorInstance) cha; - return addDoorName(door.getId()); - } - return addString(cha.getName()); - } - public final T addPcName(L2PcInstance pc) { append(new SMParam(TYPE_PLAYER_NAME, pc.getAppearance().getVisibleName())); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java index 8f7f36bebe..d0efd7413e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminPledge.java @@ -111,7 +111,7 @@ public class AdminPledge implements IAdminCommandHandler if (!targetPlayer.isClanLeader()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER); - sm.addCharName(targetPlayer); + sm.addString(targetPlayer.getName()); activeChar.sendPacket(sm); showMainPage(activeChar); return false; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java index e456330ff3..8526524efd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallPc.java @@ -80,7 +80,7 @@ public final class CallPc extends AbstractEffect target.addScript(new SummonRequestHolder(activeChar, skill)); final ConfirmDlg confirm = new ConfirmDlg(SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId()); - confirm.addCharName(activeChar); + confirm.addString(activeChar.getName()); confirm.addZoneName(activeChar.getX(), activeChar.getY(), activeChar.getZ()); confirm.addTime(30000); confirm.addRequesterId(activeChar.getObjectId()); @@ -134,7 +134,7 @@ public final class CallPc extends AbstractEffect if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2); - sm.addCharName(target); + sm.addString(target.getName()); activeChar.sendPacket(sm); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java index b45bcdf653..a39da1c0eb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Cp.java @@ -81,7 +81,7 @@ public final class Cp extends AbstractEffect if ((effector != null) && (effector != effected)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); sm.addInt((int) amount); effected.sendPacket(sm); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java index 6edc4fe3c8..b7231e71be 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java @@ -78,7 +78,7 @@ public final class HealPercent extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java index 5e9db7f727..f19d9dec50 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hp.java @@ -82,7 +82,7 @@ public final class Hp extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java index 63f00f87d9..115e5138a4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java @@ -67,8 +67,8 @@ public final class MagicalAttackMp extends AbstractEffect if (effected.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_C2_S_DRAIN); - sm.addCharName(effected); - sm.addCharName(effector); + sm.addString(effected.getName()); + sm.addString(effector.getName()); effected.sendPacket(sm); } return false; @@ -112,7 +112,7 @@ public final class MagicalAttackMp extends AbstractEffect if (effected.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S_MP_HAS_BEEN_DRAINED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); sm.addInt((int) mp); effected.sendPacket(sm); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java index ad67df3f6f..47b003ec45 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java @@ -75,7 +75,7 @@ public final class ManaHeal extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java index 03d00a766b..bb66d60d5e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealByLevel.java @@ -128,7 +128,7 @@ public final class ManaHealByLevel extends AbstractEffect final SystemMessage sm = SystemMessage.getSystemMessage(effector.getObjectId() != effected.getObjectId() ? SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1 : SystemMessageId.S1_MP_HAS_BEEN_RESTORED); if (effector.getObjectId() != effected.getObjectId()) { - sm.addCharName(effector); + sm.addString(effector.getName()); } sm.addInt((int) amount); effected.sendPacket(sm); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java index 756649b992..b3b7aa52ba 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaHealPercent.java @@ -75,7 +75,7 @@ public final class ManaHealPercent extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java index 29f236dd54..713af002bc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mp.java @@ -82,7 +82,7 @@ public final class Mp extends AbstractEffect if (effector.getObjectId() != effected.getObjectId()) { sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MP_HAS_BEEN_RESTORED_BY_C1); - sm.addCharName(effector); + sm.addString(effector.getName()); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java index 291578b7c8..5799fbb221 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TeleportToPlayer.java @@ -95,7 +95,7 @@ public class TeleportToPlayer extends AbstractEffect if (target.inObserverMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING_OR_TELEPORTING2); - sm.addCharName(target); + sm.addString(target.getName()); effector.sendPacket(sm); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java index a77eb2d2d7..dbcfdb4423 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/HandysBlockCheckerManager.java @@ -158,7 +158,7 @@ public final class HandysBlockCheckerManager if (_arenaPlayers[i].getAllPlayers().contains(player)) { final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST); - msg.addCharName(player); + msg.addString(player.getName()); player.sendPacket(msg); return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java index 6bd41572d8..5b6e9281fe 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Party.java @@ -436,7 +436,7 @@ public class L2Party extends AbstractPlayerGroup final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2); sm.addPcName(activeChar); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); getMembers().forEach(m -> @@ -459,7 +459,7 @@ public class L2Party extends AbstractPlayerGroup final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_USED_S3_ON_C2); sm.addPcName(activeChar); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSystemString(TACTICAL_SYS_STRINGS[tacticalSignId]); getMembers().forEach(m -> diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java index cca8dcef2d..f1fe7fdd71 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java @@ -1026,7 +1026,7 @@ public class L2Attackable extends L2Npc if (isRaid() && !isRaidMinion()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_AND_DROPPED_S3_S2_S); - sm.addCharName(this); + sm.addString(getName()); sm.addItemName(item); sm.addLong(drop.getCount()); broadcastPacket(sm); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 739cab590f..10e06ecce7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -11443,7 +11443,7 @@ public final class L2PcInstance extends L2Playable { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_EVADED_C2_S_ATTACK); sm.addPcName(target.getActingPlayer()); - sm.addCharName(this); + sm.addString(getName()); target.sendPacket(sm); } final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_S_ATTACK_WENT_ASTRAY); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java index 4ab075905b..4a222f4eb9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2TrapInstance.java @@ -272,7 +272,7 @@ public final class L2TrapInstance extends L2Npc else { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_INFLICTED_S3_DAMAGE_ON_C2_S4); - sm.addCharName(this); + sm.addString(getName()); sm.addString(target.getName()); sm.addInt(damage); sm.addPopup(target.getObjectId(), getObjectId(), (damage * -1)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java index f1c20a33eb..76c6d6f9bb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/status/PetStatus.java @@ -52,7 +52,7 @@ public class PetStatus extends SummonStatus if (!isDOT && (getActiveChar().getOwner() != null)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_PET_RECEIVED_S2_DAMAGE_BY_C1); - sm.addCharName(attacker); + sm.addString(attacker.getName()); sm.addInt((int) value); getActiveChar().sendPacket(sm); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java index 8d423decc8..b574b7143e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java @@ -287,7 +287,7 @@ public class CeremonyOfChaosEvent extends AbstractEvent else { msg = SystemMessage.getSystemMessage(SystemMessageId.CONGRATULATIONS_C1_YOU_WIN_THE_MATCH); - msg.addCharName(winners.get(0).getPlayer()); + msg.addString(winners.get(0).getPlayer().getName()); } for (CeremonyOfChaosMember member : getMembers().values()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java index 29c6c47ec1..69bd4f131c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionDistance.java @@ -31,7 +31,7 @@ public final class ConditionDistance extends Condition public ConditionDistance(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); - setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java index 26f95be4e9..f6e41a273d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionItem.java @@ -40,7 +40,7 @@ public final class ConditionItem extends Condition _count = parameters.getLong("count"); _take = parameters.getBoolean("take", false); // Set message - setSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (msg, player) -> msg.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_ITEM_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (msg, player) -> msg.addString(player.getName())); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java index c85399fdf8..070cb346b3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionLevel.java @@ -38,7 +38,7 @@ public final class ConditionLevel extends Condition _min = parameters.getInt("min", 1); _max = parameters.getInt("max", Integer.MAX_VALUE); // Set message - setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_LEVEL_DOES_NOT_CORRESPOND_TO_THE_REQUIREMENTS_FOR_ENTRY, (msg, player) -> msg.addString(player.getName())); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java index 743377691f..9a82901565 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionQuest.java @@ -35,7 +35,7 @@ public final class ConditionQuest extends Condition { super(template, parameters, onlyLeader, showMessageAndHtml); // Set message - setSystemMessage(SystemMessageId.C1_S_QUEST_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_S_QUEST_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java index 91fff12af7..076d585031 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/instancezone/conditions/ConditionReenter.java @@ -33,7 +33,7 @@ public final class ConditionReenter extends Condition public ConditionReenter(InstanceTemplate template, StatsSet parameters, boolean onlyLeader, boolean showMessageAndHtml) { super(template, parameters, onlyLeader, showMessageAndHtml); - setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addCharName(player)); + setSystemMessage(SystemMessageId.C1_MAY_NOT_RE_ENTER_YET, (message, player) -> message.addString(player.getName())); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 66ca7e3c01..5a966224c4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -175,7 +175,7 @@ public final class Formulas else { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); damage = 1; @@ -185,7 +185,7 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm = (skill.hasEffectType(L2EffectType.HP_DRAIN)) ? SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_DRAIN) : SystemMessage.getSystemMessage(SystemMessageId.YOU_RESISTED_C1_S_MAGIC); - sm.addCharName(attacker); + sm.addString(attacker.getName()); target.sendPacket(sm); } } @@ -674,7 +674,7 @@ public final class Formulas if (resisted) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); return false; @@ -705,7 +705,7 @@ public final class Formulas if ((finalRate <= Rnd.get(100)) && (target != attacker)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2); - sm.addCharName(target); + sm.addString(target.getName()); sm.addSkillName(skill); attacker.sendPacket(sm); return false; @@ -837,8 +837,8 @@ public final class Formulas if (attacker.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DAMAGE_IS_DECREASED_BECAUSE_C1_RESISTED_C2_S_MAGIC); - sm.addCharName(target); - sm.addCharName(attacker); + sm.addString(target.getName()); + sm.addString(attacker.getName()); attacker.sendPacket(sm); damage /= 2; } @@ -846,8 +846,8 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.C1_WEAKLY_RESISTED_C2_S_MAGIC); - sm2.addCharName(target); - sm2.addCharName(attacker); + sm2.addString(target.getName()); + sm2.addString(attacker.getName()); target.sendPacket(sm2); } } @@ -976,13 +976,13 @@ public final class Formulas if (target.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_COUNTERED_C1_S_ATTACK); - sm.addCharName(attacker); + sm.addString(attacker.getName()); target.sendPacket(sm); } if (attacker.isPlayer()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PERFORMING_A_COUNTERATTACK); - sm.addCharName(target); + sm.addString(target.getName()); attacker.sendPacket(sm); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java index 9a84b31ae4..cb27698f70 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestCancelPostAttachment.java @@ -210,7 +210,7 @@ public final class RequestCancelPostAttachment implements IClientIncomingPacket if (receiver != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANCELED_THE_SENT_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); receiver.sendPacket(sm); receiver.sendPacket(new ExChangePostState(true, _msgId, Message.DELETED)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 268f576c00..5675a9a37e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -233,7 +233,7 @@ public final class RequestEnchantItem implements IClientIncomingPacket if ((item.getEnchantLevel() == minEnchantAnnounce) || (item.getEnchantLevel() == maxEnchantAnnounce)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_SUCCESSFULLY_ENCHANTED_A_S2_S3); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sm.addInt(item.getEnchantLevel()); sm.addItemName(item); activeChar.broadcastPacket(sm); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java index c0042d45c5..aa110b024b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java @@ -115,7 +115,7 @@ public final class RequestJoinParty implements IClientIncomingPacket if (target.isPartyBanned()) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_CANNOT_JOIN_A_PARTY); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); return; } @@ -144,7 +144,7 @@ public final class RequestJoinParty implements IClientIncomingPacket if (BlockList.isBlocked(target, requestor)) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); return; } @@ -177,7 +177,7 @@ public final class RequestJoinParty implements IClientIncomingPacket } sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_INVITED_TO_THE_PARTY); - sm.addCharName(target); + sm.addString(target.getName()); requestor.sendPacket(sm); if (!requestor.isInParty()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java index 10f2f8906d..236bc251a2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPostAttachment.java @@ -244,7 +244,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket sender.addAdena("PayMail", adena, activeChar, false); sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HAS_MADE_A_PAYMENT_OF_S1_ADENA_PER_YOUR_PAYMENT_REQUEST_MAIL); sm.addLong(adena); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } else @@ -259,7 +259,7 @@ public final class RequestPostAttachment implements IClientIncomingPacket else if (sender != null) { sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ACQUIRED_THE_ATTACHED_ITEM_TO_YOUR_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java index 566b570b58..fab65aaf02 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestRejectPostAttachment.java @@ -95,7 +95,7 @@ public final class RequestRejectPostAttachment implements IClientIncomingPacket if (sender != null) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_RETURNED_THE_MAIL); - sm.addCharName(activeChar); + sm.addString(activeChar.getName()); sender.sendPacket(sm); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java index 09c1d6ea32..7675b1221d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/TradeRequest.java @@ -160,7 +160,7 @@ public final class TradeRequest implements IClientIncomingPacket if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID)) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_REPORTED_AS_AN_ILLEGAL_PROGRAM_USER_AND_IS_CURRENTLY_BEING_INVESTIGATED); - sm.addCharName(partner); + sm.addString(partner.getName()); client.sendPacket(sm); client.sendPacket(ActionFailed.STATIC_PACKET); return; @@ -217,7 +217,7 @@ public final class TradeRequest implements IClientIncomingPacket if (BlockList.isBlocked(partner, player)) { sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_PLACED_YOU_ON_HIS_HER_IGNORE_LIST); - sm.addCharName(partner); + sm.addString(partner.getName()); client.sendPacket(sm); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java index 7dc7faf77a..076d40a420 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestAnswerFriendInvite.java @@ -66,7 +66,7 @@ public final class RequestAnswerFriendInvite implements IClientIncomingPacket || requestor.getFriendList().contains(player.getObjectId())) { final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_ON_YOUR_FRIEND_LIST); - sm.addCharName(player); + sm.addString(player.getName()); requestor.sendPacket(sm); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java index 530a6d7a01..f14c3fa651 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/friend/RequestFriendInvite.java @@ -116,7 +116,7 @@ public final class RequestFriendInvite implements IClientIncomingPacket if (BlockList.isBlocked(activeChar, friend)) { sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_BLOCKED_C1); - sm.addCharName(friend); + sm.addString(friend.getName()); activeChar.sendPacket(sm); return; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java index 0c907de10f..29a252aa5e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/ConfirmMenteeAdd.java @@ -69,8 +69,8 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket if (_confirmed == 0) { - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLINED_S1_S_MENTORING_OFFER).addCharName(mentor)); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLINED_BECOMING_YOUR_MENTEE).addCharName(mentee)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_DECLINED_S1_S_MENTORING_OFFER).addString(mentor.getName())); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DECLINED_BECOMING_YOUR_MENTEE).addString(mentee.getName())); } else if (validate(mentor, mentee)) { @@ -86,10 +86,10 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket // Notify to scripts EventDispatcher.getInstance().notifyEventAsync(new OnPlayerMenteeAdd(mentor, mentee), mentor); - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTEE).addString(mentee.getName())); mentor.sendPacket(new ExMentorList(mentor)); - mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addCharName(mentor)); + mentee.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FROM_NOW_ON_S1_WILL_BE_YOUR_MENTOR).addString(mentor.getName())); mentee.sendPacket(new ExMentorList(mentee)); } catch (Exception e) @@ -142,7 +142,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } else if (mentee.getLevel() >= 86) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_IS_ABOVE_LEVEL_85_AND_CANNOT_BECOME_A_MENTEE).addString(mentee.getName())); return false; } else if (mentee.isSubClassActive()) @@ -153,7 +153,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket // else if (mentee.getInventory().getItemByItemId(MENTEE_CERT) == null) // { - // mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_HAVE_THE_ITEM_NEEDED_TO_BECOME_A_MENTEE).addCharName(mentee)); + // mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_HAVE_THE_ITEM_NEEDED_TO_BECOME_A_MENTEE).addString(mentee)); // return false; // } else if ((MentorManager.getInstance().getMentees(mentor.getObjectId()) != null) && (MentorManager.getInstance().getMentees(mentor.getObjectId()).size() >= 3)) @@ -163,7 +163,7 @@ public class ConfirmMenteeAdd implements IClientIncomingPacket } else if (mentee.isMentee()) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_HAS_A_MENTOR).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_HAS_A_MENTOR).addString(mentee.getName())); return false; } return true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java index 9e3aecbff4..1667a2042e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/mentoring/RequestMenteeAdd.java @@ -56,7 +56,7 @@ public class RequestMenteeAdd implements IClientIncomingPacket if (ConfirmMenteeAdd.validate(mentor, mentee)) { - mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OFFERED_TO_BECOME_S1_S_MENTOR).addCharName(mentee)); + mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_OFFERED_TO_BECOME_S1_S_MENTOR).addString(mentee.getName())); mentee.sendPacket(new ExMentorAdd(mentor)); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java index 826065a6da..4160658f49 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AbstractMessagePacket.java @@ -21,10 +21,8 @@ import java.util.Arrays; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.datatables.ItemTable; -import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; -import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.model.items.L2Item; @@ -182,38 +180,6 @@ public abstract class AbstractMessagePacket> return (T) this; } - public final T addCharName(L2Character cha) - { - if (cha.isNpc()) - { - final L2Npc npc = (L2Npc) cha; - if (npc.getTemplate().isUsingServerSideName()) - { - return addString(npc.getTemplate().getName()); - } - return addNpcName(npc); - } - else if (cha.isPlayer()) - { - return addPcName(cha.getActingPlayer()); - } - else if (cha.isSummon()) - { - final L2Summon summon = (L2Summon) cha; - if (summon.getTemplate().isUsingServerSideName()) - { - return addString(summon.getTemplate().getName()); - } - return addNpcName(summon); - } - else if (cha.isDoor()) - { - final L2DoorInstance door = (L2DoorInstance) cha; - return addDoorName(door.getId()); - } - return addString(cha.getName()); - } - public final T addPcName(L2PcInstance pc) { append(new SMParam(TYPE_PLAYER_NAME, pc.getAppearance().getVisibleName()));