From 8779759ad6f612227e8ada1ae026ececedb66258 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 14 Nov 2021 13:04:00 +0000 Subject: [PATCH] Set sender name for CreatureSay method using NpcStringId. --- .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ .../gameserver/network/serverpackets/CreatureSay.java | 4 ++++ 23 files changed, 92 insertions(+) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7b0dc3945a..1f329897da 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -94,6 +94,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7b0dc3945a..1f329897da 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -94,6 +94,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7b0dc3945a..1f329897da 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -94,6 +94,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7b0dc3945a..1f329897da 100644 --- a/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -94,6 +94,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 630bcd63c5..dc0001912c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -50,6 +50,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 29a4f3fd29..166c475615 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -50,6 +50,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7b0dc3945a..1f329897da 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -94,6 +94,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7bc0203ca2..cc8677d303 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -92,6 +92,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7b0dc3945a..1f329897da 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -94,6 +94,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7b0dc3945a..1f329897da 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -94,6 +94,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 7b0dc3945a..1f329897da 100644 --- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -94,6 +94,10 @@ public class CreatureSay implements IClientOutgoingPacket _sender = sender; _chatType = chatType; _messageId = npcStringId.getId(); + if (sender != null) + { + _senderName = sender.getName(); + } } public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId)