From f8acdcace78a7f3ae76361376eba309611dbb5e1 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 4 Jan 2020 05:11:01 +0000 Subject: [PATCH] CreatureSay cleanup and improvements. --- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 4 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../Q00457_LostAndFound.java | 2 +- .../data/scripts/vehicles/BoatGludinRune.java | 44 +++---- .../scripts/vehicles/BoatInnadrilTour.java | 20 +-- .../scripts/vehicles/BoatRunePrimeval.java | 14 +-- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 4 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../Q00457_LostAndFound.java | 2 +- .../data/scripts/vehicles/BoatGludinRune.java | 44 +++---- .../scripts/vehicles/BoatInnadrilTour.java | 20 +-- .../scripts/vehicles/BoatRunePrimeval.java | 14 +-- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 4 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../Q00457_LostAndFound.java | 2 +- .../data/scripts/vehicles/BoatGludinRune.java | 44 +++---- .../scripts/vehicles/BoatInnadrilTour.java | 20 +-- .../scripts/vehicles/BoatRunePrimeval.java | 14 +-- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 4 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../Q00457_LostAndFound.java | 2 +- .../data/scripts/vehicles/BoatGludinRune.java | 44 +++---- .../scripts/vehicles/BoatInnadrilTour.java | 20 +-- .../scripts/vehicles/BoatRunePrimeval.java | 14 +-- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 4 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 23 ++-- .../chathandlers/ChatPartyRoomCommander.java | 23 ++-- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../Q00457_LostAndFound.java | 2 +- .../data/scripts/vehicles/BoatGludinRune.java | 44 +++---- .../scripts/vehicles/BoatInnadrilTour.java | 20 +-- .../scripts/vehicles/BoatRunePrimeval.java | 14 +-- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 4 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../data/scripts/vehicles/BoatGludinRune.java | 44 +++---- .../scripts/vehicles/BoatInnadrilTour.java | 20 +-- .../scripts/vehicles/BoatRunePrimeval.java | 14 +-- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 4 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../data/scripts/vehicles/BoatGludinRune.java | 44 +++---- .../scripts/vehicles/BoatInnadrilTour.java | 20 +-- .../scripts/vehicles/BoatRunePrimeval.java | 14 +-- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 4 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../data/scripts/vehicles/BoatGludinRune.java | 44 +++---- .../scripts/vehicles/BoatInnadrilTour.java | 20 +-- .../scripts/vehicles/BoatRunePrimeval.java | 14 +-- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 114 ++++++------------ .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../network/serverpackets/CreatureSay.java | 1 - .../ai/others/PolymorphingOnAttack.java | 2 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../chathandlers/ChatBattlefield.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWhisper.java | 6 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../CrystalCaverns/CrystalCaverns.java | 8 +- .../Q00335_TheSongOfTheHunter.java | 26 ++-- .../scripts/vehicles/BoatGiranTalking.java | 44 +++---- .../data/scripts/vehicles/BoatGludinRune.java | 44 +++---- .../scripts/vehicles/BoatInnadrilTour.java | 20 +-- .../scripts/vehicles/BoatRunePrimeval.java | 14 +-- .../scripts/vehicles/BoatTalkingGludin.java | 42 +++---- .../gameserver/SevenSignsFestival.java | 22 ++-- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../actor/instance/SepulcherNpcInstance.java | 2 +- .../gameserver/model/entity/TvTEvent.java | 2 +- .../model/instancezone/Instance.java | 4 +- .../model/olympiad/OlympiadGame.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 81 ++++--------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 2 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../FreyaCelebration/FreyaCelebration.java | 4 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../chathandlers/ChatBattlefield.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWhisper.java | 6 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../CrystalCaverns/CrystalCaverns.java | 8 +- .../Q00335_TheSongOfTheHunter.java | 26 ++-- .../Q00457_LostAndFound.java | 2 +- .../scripts/vehicles/BoatGiranTalking.java | 44 +++---- .../data/scripts/vehicles/BoatGludinRune.java | 44 +++---- .../scripts/vehicles/BoatInnadrilTour.java | 20 +-- .../scripts/vehicles/BoatRunePrimeval.java | 14 +-- .../scripts/vehicles/BoatTalkingGludin.java | 42 +++---- .../gameserver/SevenSignsFestival.java | 22 ++-- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../actor/instance/SepulcherNpcInstance.java | 2 +- .../gameserver/model/entity/TvTEvent.java | 2 +- .../model/instancezone/Instance.java | 4 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 79 ++++-------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 6 +- .../events/SquashEvent/SquashEvent.java | 6 +- .../WatermelonNinja/WatermelonNinja.java | 6 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 6 +- .../events/SquashEvent/SquashEvent.java | 6 +- .../WatermelonNinja/WatermelonNinja.java | 6 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 6 +- .../events/SquashEvent/SquashEvent.java | 6 +- .../WatermelonNinja/WatermelonNinja.java | 6 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 6 +- .../events/SquashEvent/SquashEvent.java | 6 +- .../WatermelonNinja/WatermelonNinja.java | 6 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 6 +- .../events/SquashEvent/SquashEvent.java | 6 +- .../WatermelonNinja/WatermelonNinja.java | 6 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 6 +- .../events/SquashEvent/SquashEvent.java | 6 +- .../WatermelonNinja/WatermelonNinja.java | 6 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 114 ++++++------------ .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- .../ai/others/PolymorphingOnAttack.java | 3 +- .../data/scripts/custom/events/Race/Race.java | 2 +- .../events/MerrySquashmas/MerrySquashmas.java | 6 +- .../events/SquashEvent/SquashEvent.java | 6 +- .../WatermelonNinja/WatermelonNinja.java | 6 +- .../admincommandhandlers/AdminAdmin.java | 2 +- .../admincommandhandlers/AdminGmChat.java | 2 +- .../admincommandhandlers/AdminTargetSay.java | 2 +- .../handlers/bypasshandlers/FindPvP.java | 4 +- .../handlers/chathandlers/ChatAlliance.java | 2 +- .../handlers/chathandlers/ChatClan.java | 2 +- .../handlers/chathandlers/ChatGeneral.java | 4 +- .../handlers/chathandlers/ChatHeroVoice.java | 2 +- .../handlers/chathandlers/ChatParty.java | 2 +- .../chathandlers/ChatPartyMatchRoom.java | 2 +- .../chathandlers/ChatPartyRoomAll.java | 2 +- .../chathandlers/ChatPartyRoomCommander.java | 2 +- .../handlers/chathandlers/ChatShout.java | 2 +- .../handlers/chathandlers/ChatTrade.java | 2 +- .../handlers/chathandlers/ChatWorld.java | 2 +- .../handlers/telnethandlers/chat/GMChat.java | 2 +- .../handlers/telnethandlers/chat/Msg.java | 2 +- .../scripts/vehicles/BoatGiranTalking.java | 44 +++---- .../scripts/vehicles/BoatInnadrilTour.java | 20 +-- .../scripts/vehicles/BoatRunePrimeval.java | 14 +-- .../scripts/vehicles/BoatTalkingGludin.java | 42 +++---- .../data/sql/impl/AnnouncementsTable.java | 4 +- .../FakePlayerChatManager.java | 2 +- .../instancemanager/PetitionManager.java | 6 +- .../gameserver/model/actor/Attackable.java | 2 +- .../model/votereward/VoteSystem.java | 2 +- .../network/clientpackets/EnterWorld.java | 2 +- .../clientpackets/RequestPetitionCancel.java | 2 +- .../network/serverpackets/CreatureSay.java | 104 +++++----------- .../l2jmobius/gameserver/util/Broadcast.java | 2 +- .../gameserver/util/BuilderUtil.java | 4 +- 581 files changed, 1810 insertions(+), 2528 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index 7baa5d8734..effbeaa1ac 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -95,8 +95,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index c34c1c2c11..450f0a2b0d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -123,7 +123,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getRandom(100) < 5) { - final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); + final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); cs.addStringParameter(caster.getName()); npc.broadcastPacket(cs); @@ -132,7 +132,7 @@ public class FreyaCelebration extends LongTimeEvent } else if (getRandom(10) < 2) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), getRandomEntry(FREYA_TEXT))); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, getRandomEntry(FREYA_TEXT))); } } return super.onSkillSee(npc, caster, skill, targets, isSummon); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index fcc2c5df98..fbf99259a4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index a57206cca5..611fa8d584 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 633c0e101c..b5b9b4a3da 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 0af8f6ed9e..7aa68e7ac8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 3240459f0c..ca46bd2b9e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 63d91115f7..bd745507c1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 548f97f47f..aa5b0d1550 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 11c0bad380..39787eeb42 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index 706720dc61..7f34099a19 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index 8cfbf1bd25..95fa898ad9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 22b8f071fe..7198d826ab 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index e010b8f944..4acbce06a3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -145,7 +145,7 @@ public class Q00457_LostAndFound extends Quest startQuestTimer("STOP", 1000, npc, player); startQuestTimer("BYE", 3000, npc, player); cancelQuestTimer("CHECK", npc, player); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.AH_FRESH_AIR)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.AH_FRESH_AIR)); broadcastNpcSay(npc, player, NpcStringId.AH_FRESH_AIR, false); giveItems(player, PACKAGED_BOOK, 1); qs.exitQuest(QuestType.DAILY, true); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatGludinRune.java index 9ab005152d..92bfaeadbb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -138,29 +138,29 @@ public class BoatGludinRune implements Runnable { _boat = boat; - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_RUNE0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_RUNE0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_RUNE15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_RUNE10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GLUDIN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index d1aa5ebdd3..1726f5e7fa 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -94,17 +94,17 @@ public class BoatInnadrilTour implements Runnable { _boat = boat; - ARRIVED_AT_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); - LEAVE_INNADRIL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); - LEAVE_INNADRIL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); - LEAVE_INNADRIL0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); - LEAVING_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); + ARRIVED_AT_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); + LEAVE_INNADRIL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); + LEAVE_INNADRIL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); + LEAVE_INNADRIL0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); + LEAVING_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); - ARRIVAL20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); INNADRIL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), DOCK.getX(), DOCK.getY(), DOCK.getZ()); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index b71c8722f9..fadac432d0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -90,13 +90,13 @@ public class BoatRunePrimeval implements Runnable { _boat = boat; - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); PRIMEVAL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), PRIMEVAL_DOCK.getX(), PRIMEVAL_DOCK.getY(), PRIMEVAL_DOCK.getZ()); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 99012419d3..5097c0ea60 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -226,7 +226,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index e21a9098df..d40f770034 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -476,7 +476,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 794c554426..ea16b5f7cc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 170f0a41c8..d85d56251c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index 7baa5d8734..effbeaa1ac 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -95,8 +95,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index c34c1c2c11..450f0a2b0d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -123,7 +123,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getRandom(100) < 5) { - final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); + final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); cs.addStringParameter(caster.getName()); npc.broadcastPacket(cs); @@ -132,7 +132,7 @@ public class FreyaCelebration extends LongTimeEvent } else if (getRandom(10) < 2) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), getRandomEntry(FREYA_TEXT))); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, getRandomEntry(FREYA_TEXT))); } } return super.onSkillSee(npc, caster, skill, targets, isSummon); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index fcc2c5df98..fbf99259a4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index a57206cca5..611fa8d584 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 633c0e101c..b5b9b4a3da 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 0af8f6ed9e..7aa68e7ac8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 3240459f0c..ca46bd2b9e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 63d91115f7..bd745507c1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 548f97f47f..aa5b0d1550 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 11c0bad380..39787eeb42 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index 706720dc61..7f34099a19 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index 8cfbf1bd25..95fa898ad9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 22b8f071fe..7198d826ab 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index e010b8f944..4acbce06a3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -145,7 +145,7 @@ public class Q00457_LostAndFound extends Quest startQuestTimer("STOP", 1000, npc, player); startQuestTimer("BYE", 3000, npc, player); cancelQuestTimer("CHECK", npc, player); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.AH_FRESH_AIR)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.AH_FRESH_AIR)); broadcastNpcSay(npc, player, NpcStringId.AH_FRESH_AIR, false); giveItems(player, PACKAGED_BOOK, 1); qs.exitQuest(QuestType.DAILY, true); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatGludinRune.java index 9ab005152d..92bfaeadbb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -138,29 +138,29 @@ public class BoatGludinRune implements Runnable { _boat = boat; - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_RUNE0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_RUNE0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_RUNE15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_RUNE10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GLUDIN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index d1aa5ebdd3..1726f5e7fa 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -94,17 +94,17 @@ public class BoatInnadrilTour implements Runnable { _boat = boat; - ARRIVED_AT_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); - LEAVE_INNADRIL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); - LEAVE_INNADRIL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); - LEAVE_INNADRIL0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); - LEAVING_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); + ARRIVED_AT_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); + LEAVE_INNADRIL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); + LEAVE_INNADRIL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); + LEAVE_INNADRIL0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); + LEAVING_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); - ARRIVAL20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); INNADRIL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), DOCK.getX(), DOCK.getY(), DOCK.getZ()); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index b71c8722f9..fadac432d0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -90,13 +90,13 @@ public class BoatRunePrimeval implements Runnable { _boat = boat; - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); PRIMEVAL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), PRIMEVAL_DOCK.getX(), PRIMEVAL_DOCK.getY(), PRIMEVAL_DOCK.getZ()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 20ef4b2033..aa609d8ac6 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -222,7 +222,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0cd3a06039..0f62bf036f 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -481,7 +481,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 794c554426..ea16b5f7cc 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 170f0a41c8..d85d56251c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index 7baa5d8734..effbeaa1ac 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -95,8 +95,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index c34c1c2c11..450f0a2b0d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -123,7 +123,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getRandom(100) < 5) { - final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); + final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); cs.addStringParameter(caster.getName()); npc.broadcastPacket(cs); @@ -132,7 +132,7 @@ public class FreyaCelebration extends LongTimeEvent } else if (getRandom(10) < 2) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), getRandomEntry(FREYA_TEXT))); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, getRandomEntry(FREYA_TEXT))); } } return super.onSkillSee(npc, caster, skill, targets, isSummon); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index c554c35ced..fdc2615ac2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index 02c8dbd4f7..2d3d1f04ff 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 65ce62dae2..73e1d84195 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 3bf769b287..e9937ebabe 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 6e38eda3ec..14a50b8cef 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index ee7020827a..7c6598b6bc 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index eaf4c3cb77..30fcaee630 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index d5a286a826..c0d73d703c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index f97d38710f..63e784eec4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index 9dc220ad07..d8060f852e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 84358f1442..9ac0bf868f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index e010b8f944..4acbce06a3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -145,7 +145,7 @@ public class Q00457_LostAndFound extends Quest startQuestTimer("STOP", 1000, npc, player); startQuestTimer("BYE", 3000, npc, player); cancelQuestTimer("CHECK", npc, player); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.AH_FRESH_AIR)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.AH_FRESH_AIR)); broadcastNpcSay(npc, player, NpcStringId.AH_FRESH_AIR, false); giveItems(player, PACKAGED_BOOK, 1); qs.exitQuest(QuestType.DAILY, true); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatGludinRune.java index 9ab005152d..92bfaeadbb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -138,29 +138,29 @@ public class BoatGludinRune implements Runnable { _boat = boat; - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_RUNE0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_RUNE0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_RUNE15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_RUNE10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GLUDIN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index d1aa5ebdd3..1726f5e7fa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -94,17 +94,17 @@ public class BoatInnadrilTour implements Runnable { _boat = boat; - ARRIVED_AT_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); - LEAVE_INNADRIL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); - LEAVE_INNADRIL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); - LEAVE_INNADRIL0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); - LEAVING_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); + ARRIVED_AT_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); + LEAVE_INNADRIL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); + LEAVE_INNADRIL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); + LEAVE_INNADRIL0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); + LEAVING_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); - ARRIVAL20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); INNADRIL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), DOCK.getX(), DOCK.getY(), DOCK.getZ()); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index b71c8722f9..fadac432d0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -90,13 +90,13 @@ public class BoatRunePrimeval implements Runnable { _boat = boat; - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); PRIMEVAL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), PRIMEVAL_DOCK.getX(), PRIMEVAL_DOCK.getY(), PRIMEVAL_DOCK.getZ()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 20ef4b2033..aa609d8ac6 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -222,7 +222,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0cd3a06039..0f62bf036f 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -481,7 +481,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 794c554426..ea16b5f7cc 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 170f0a41c8..d85d56251c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index 7baa5d8734..effbeaa1ac 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -95,8 +95,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index c34c1c2c11..450f0a2b0d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -123,7 +123,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getRandom(100) < 5) { - final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); + final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); cs.addStringParameter(caster.getName()); npc.broadcastPacket(cs); @@ -132,7 +132,7 @@ public class FreyaCelebration extends LongTimeEvent } else if (getRandom(10) < 2) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), getRandomEntry(FREYA_TEXT))); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, getRandomEntry(FREYA_TEXT))); } } return super.onSkillSee(npc, caster, skill, targets, isSummon); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index c554c35ced..fdc2615ac2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index 02c8dbd4f7..2d3d1f04ff 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 65ce62dae2..73e1d84195 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 3bf769b287..e9937ebabe 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 6e38eda3ec..14a50b8cef 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index ee7020827a..7c6598b6bc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index eaf4c3cb77..30fcaee630 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index d5a286a826..c0d73d703c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index f97d38710f..63e784eec4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index 9dc220ad07..d8060f852e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 84358f1442..9ac0bf868f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index e010b8f944..4acbce06a3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -145,7 +145,7 @@ public class Q00457_LostAndFound extends Quest startQuestTimer("STOP", 1000, npc, player); startQuestTimer("BYE", 3000, npc, player); cancelQuestTimer("CHECK", npc, player); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.AH_FRESH_AIR)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.AH_FRESH_AIR)); broadcastNpcSay(npc, player, NpcStringId.AH_FRESH_AIR, false); giveItems(player, PACKAGED_BOOK, 1); qs.exitQuest(QuestType.DAILY, true); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatGludinRune.java index 9ab005152d..92bfaeadbb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -138,29 +138,29 @@ public class BoatGludinRune implements Runnable { _boat = boat; - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_RUNE0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_RUNE0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_RUNE15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_RUNE10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GLUDIN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index d1aa5ebdd3..1726f5e7fa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -94,17 +94,17 @@ public class BoatInnadrilTour implements Runnable { _boat = boat; - ARRIVED_AT_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); - LEAVE_INNADRIL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); - LEAVE_INNADRIL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); - LEAVE_INNADRIL0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); - LEAVING_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); + ARRIVED_AT_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); + LEAVE_INNADRIL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); + LEAVE_INNADRIL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); + LEAVE_INNADRIL0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); + LEAVING_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); - ARRIVAL20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); INNADRIL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), DOCK.getX(), DOCK.getY(), DOCK.getZ()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index b71c8722f9..fadac432d0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -90,13 +90,13 @@ public class BoatRunePrimeval implements Runnable { _boat = boat; - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); PRIMEVAL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), PRIMEVAL_DOCK.getX(), PRIMEVAL_DOCK.getY(), PRIMEVAL_DOCK.getZ()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 20ef4b2033..aa609d8ac6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -222,7 +222,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index aa168adf6b..97e44bde3b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -481,7 +481,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 794c554426..ea16b5f7cc 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BuilderUtil.java index f59365a0f1..ab560388e6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index 7baa5d8734..effbeaa1ac 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -95,8 +95,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 9a4ddffb95..e87b766e51 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -123,7 +123,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getRandom(100) < 5) { - final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); + final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); cs.addStringParameter(caster.getName()); npc.broadcastPacket(cs); @@ -132,7 +132,7 @@ public class FreyaCelebration extends LongTimeEvent } else if (getRandom(10) < 2) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), getRandomEntry(FREYA_TEXT))); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, getRandomEntry(FREYA_TEXT))); } } return super.onSkillSee(npc, caster, skill, targets, isSummon); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index cf684740ff..dc17f964a9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index 75acbd05c1..4b05d3d934 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 438459778a..ed3a722b77 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 75e4cf7273..41778d7a35 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index ba0c17d049..e65e6d04d8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 2c0213bb5f..275999111f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 1cb68887e8..575e82ad47 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -38,22 +38,19 @@ public class ChatPartyRoomAll implements IChatHandler @Override public void handleChat(ChatType type, PlayerInstance activeChar, String target, String text) { - if (activeChar.isInParty()) + if (activeChar.isInParty() && activeChar.getParty().isInCommandChannel() && activeChar.getParty().isLeader(activeChar)) { - if (activeChar.getParty().isInCommandChannel() && activeChar.getParty().isLeader(activeChar)) + if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type)) { - if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type)) - { - activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SEC); - return; - } - if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS)) - { - activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); - return; - } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SEC); + return; } + if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS)) + { + activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); + return; + } + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 5955bb6dc8..1ad8f148f4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -38,22 +38,19 @@ public class ChatPartyRoomCommander implements IChatHandler @Override public void handleChat(ChatType type, PlayerInstance activeChar, String target, String text) { - if (activeChar.isInParty()) + if (activeChar.isInParty() && activeChar.getParty().isInCommandChannel() && activeChar.getParty().getCommandChannel().getLeader().equals(activeChar)) { - if (activeChar.getParty().isInCommandChannel() && activeChar.getParty().getCommandChannel().getLeader().equals(activeChar)) + if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type)) { - if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type)) - { - activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SEC); - return; - } - if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS)) - { - activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); - return; - } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED_IF_YOU_TRY_TO_CHAT_BEFORE_THE_PROHIBITION_IS_REMOVED_THE_PROHIBITION_TIME_WILL_INCREASE_EVEN_FURTHER_CHATTING_BAN_TIME_REMAINING_S1_SEC); + return; } + if (Config.JAIL_DISABLE_CHAT && activeChar.isJailed() && !activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS)) + { + activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); + return; + } + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index 606e68b0cd..67bfe3f9ec 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index 8330a1f23a..6caf7e6c8c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 4bcc544d90..7753b7e9db 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index e010b8f944..4acbce06a3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -145,7 +145,7 @@ public class Q00457_LostAndFound extends Quest startQuestTimer("STOP", 1000, npc, player); startQuestTimer("BYE", 3000, npc, player); cancelQuestTimer("CHECK", npc, player); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.AH_FRESH_AIR)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.AH_FRESH_AIR)); broadcastNpcSay(npc, player, NpcStringId.AH_FRESH_AIR, false); giveItems(player, PACKAGED_BOOK, 1); qs.exitQuest(QuestType.DAILY, true); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatGludinRune.java index ac72aaee6f..1f5b7effa8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -138,29 +138,29 @@ public class BoatGludinRune implements Runnable { _boat = boat; - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MIN); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MIN); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MIN); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MIN); - LEAVE_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MIN); - LEAVE_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MIN); - LEAVE_RUNE0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MIN); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MIN); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MIN); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MIN); + LEAVE_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MIN); + LEAVE_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MIN); + LEAVE_RUNE0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MIN); - ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MIN); - ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MIN); - ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MIN); - ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MIN); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MIN); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MIN); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MIN); + ARRIVAL_RUNE15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MIN); + ARRIVAL_RUNE10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MIN); + ARRIVAL_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MIN); + ARRIVAL_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MIN); + ARRIVAL_GLUDIN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MIN); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MIN); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MIN); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MIN); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index 525bb8468d..4f6588e8f1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -94,17 +94,17 @@ public class BoatInnadrilTour implements Runnable { _boat = boat; - ARRIVED_AT_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MIN); - LEAVE_INNADRIL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MIN); - LEAVE_INNADRIL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MIN); - LEAVE_INNADRIL0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); - LEAVING_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); + ARRIVED_AT_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MIN); + LEAVE_INNADRIL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MIN); + LEAVE_INNADRIL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MIN); + LEAVE_INNADRIL0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); + LEAVING_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); - ARRIVAL20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MIN); - ARRIVAL15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MIN); - ARRIVAL10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MIN); - ARRIVAL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MIN); - ARRIVAL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MIN); + ARRIVAL20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MIN); + ARRIVAL15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MIN); + ARRIVAL10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MIN); + ARRIVAL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MIN); + ARRIVAL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MIN); INNADRIL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), DOCK.getX(), DOCK.getY(), DOCK.getZ()); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index 9110845798..7482584dca 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -90,13 +90,13 @@ public class BoatRunePrimeval implements Runnable { _boat = boat; - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MIN); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MIN); - LEAVING_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MIN); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MIN); + LEAVING_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); PRIMEVAL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), PRIMEVAL_DOCK.getX(), PRIMEVAL_DOCK.getY(), PRIMEVAL_DOCK.getZ()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java index a9c63cdc92..f3f863081b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -221,7 +221,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 21765e8735..328acd8555 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -481,7 +481,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 794c554426..ea16b5f7cc 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/BuilderUtil.java index f59365a0f1..ab560388e6 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index 7baa5d8734..effbeaa1ac 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -95,8 +95,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index c34c1c2c11..450f0a2b0d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -123,7 +123,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getRandom(100) < 5) { - final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); + final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); cs.addStringParameter(caster.getName()); npc.broadcastPacket(cs); @@ -132,7 +132,7 @@ public class FreyaCelebration extends LongTimeEvent } else if (getRandom(10) < 2) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), getRandomEntry(FREYA_TEXT))); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, getRandomEntry(FREYA_TEXT))); } } return super.onSkillSee(npc, caster, skill, targets, isSummon); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index c554c35ced..fdc2615ac2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index 02c8dbd4f7..2d3d1f04ff 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index bda8491bf9..3422ed3f24 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 3bf769b287..e9937ebabe 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 6e38eda3ec..14a50b8cef 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index ee7020827a..7c6598b6bc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index eaf4c3cb77..30fcaee630 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index d5a286a826..c0d73d703c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index e3c6febcbd..578079d7e1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index 1d4f208485..0eaa323c46 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 22500033f4..28980af116 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatGludinRune.java index 9ab005152d..92bfaeadbb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -138,29 +138,29 @@ public class BoatGludinRune implements Runnable { _boat = boat; - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_RUNE0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_RUNE0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_RUNE15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_RUNE10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GLUDIN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index d1aa5ebdd3..1726f5e7fa 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -94,17 +94,17 @@ public class BoatInnadrilTour implements Runnable { _boat = boat; - ARRIVED_AT_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); - LEAVE_INNADRIL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); - LEAVE_INNADRIL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); - LEAVE_INNADRIL0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); - LEAVING_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); + ARRIVED_AT_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); + LEAVE_INNADRIL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); + LEAVE_INNADRIL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); + LEAVE_INNADRIL0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); + LEAVING_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); - ARRIVAL20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); INNADRIL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), DOCK.getX(), DOCK.getY(), DOCK.getZ()); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index b71c8722f9..fadac432d0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -90,13 +90,13 @@ public class BoatRunePrimeval implements Runnable { _boat = boat; - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); PRIMEVAL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), PRIMEVAL_DOCK.getX(), PRIMEVAL_DOCK.getY(), PRIMEVAL_DOCK.getZ()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java index a9c63cdc92..f3f863081b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -221,7 +221,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 2133836966..7490f3f252 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -481,7 +481,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 794c554426..ea16b5f7cc 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/BuilderUtil.java index f59365a0f1..ab560388e6 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index 7baa5d8734..effbeaa1ac 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -95,8 +95,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index c34c1c2c11..450f0a2b0d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -123,7 +123,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getRandom(100) < 5) { - final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); + final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); cs.addStringParameter(caster.getName()); npc.broadcastPacket(cs); @@ -132,7 +132,7 @@ public class FreyaCelebration extends LongTimeEvent } else if (getRandom(10) < 2) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), getRandomEntry(FREYA_TEXT))); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, getRandomEntry(FREYA_TEXT))); } } return super.onSkillSee(npc, caster, skill, targets, isSummon); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index c554c35ced..fdc2615ac2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index 02c8dbd4f7..2d3d1f04ff 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index bda8491bf9..3422ed3f24 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 3bf769b287..e9937ebabe 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 6e38eda3ec..14a50b8cef 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index ee7020827a..7c6598b6bc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index eaf4c3cb77..30fcaee630 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index d5a286a826..c0d73d703c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index e3c6febcbd..578079d7e1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index 1d4f208485..0eaa323c46 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 22500033f4..28980af116 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatGludinRune.java index 9ab005152d..92bfaeadbb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -138,29 +138,29 @@ public class BoatGludinRune implements Runnable { _boat = boat; - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_RUNE0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_RUNE0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_RUNE15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_RUNE10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GLUDIN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index d1aa5ebdd3..1726f5e7fa 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -94,17 +94,17 @@ public class BoatInnadrilTour implements Runnable { _boat = boat; - ARRIVED_AT_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); - LEAVE_INNADRIL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); - LEAVE_INNADRIL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); - LEAVE_INNADRIL0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); - LEAVING_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); + ARRIVED_AT_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); + LEAVE_INNADRIL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); + LEAVE_INNADRIL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); + LEAVE_INNADRIL0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); + LEAVING_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); - ARRIVAL20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); INNADRIL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), DOCK.getX(), DOCK.getY(), DOCK.getZ()); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index b71c8722f9..fadac432d0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -90,13 +90,13 @@ public class BoatRunePrimeval implements Runnable { _boat = boat; - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); PRIMEVAL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), PRIMEVAL_DOCK.getX(), PRIMEVAL_DOCK.getY(), PRIMEVAL_DOCK.getZ()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java index a9c63cdc92..f3f863081b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -221,7 +221,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 2133836966..7490f3f252 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -481,7 +481,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 794c554426..ea16b5f7cc 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/BuilderUtil.java index f59365a0f1..ab560388e6 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index cb3018c0ce..79702928f6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -95,8 +95,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index c34c1c2c11..450f0a2b0d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -123,7 +123,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getRandom(100) < 5) { - final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); + final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); cs.addStringParameter(caster.getName()); npc.broadcastPacket(cs); @@ -132,7 +132,7 @@ public class FreyaCelebration extends LongTimeEvent } else if (getRandom(10) < 2) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), getRandomEntry(FREYA_TEXT))); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, getRandomEntry(FREYA_TEXT))); } } return super.onSkillSee(npc, caster, skill, targets, isSummon); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index c554c35ced..fdc2615ac2 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index 02c8dbd4f7..2d3d1f04ff 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index bda8491bf9..3422ed3f24 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 3bf769b287..e9937ebabe 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 6e38eda3ec..14a50b8cef 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index ee7020827a..7c6598b6bc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index eaf4c3cb77..30fcaee630 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index d5a286a826..c0d73d703c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index e3c6febcbd..578079d7e1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index 1d4f208485..0eaa323c46 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 84358f1442..9ac0bf868f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatGludinRune.java index 1dd5690413..f06a98f967 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -138,29 +138,29 @@ public class BoatGludinRune implements Runnable { _boat = boat; - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_RUNE0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_RUNE0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES_2); - ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES_2); - ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES_2); - ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE_2); - ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_RUNE15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES_2); + ARRIVAL_RUNE10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES_2); + ARRIVAL_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES_2); + ARRIVAL_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE_2); + ARRIVAL_GLUDIN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index d1aa5ebdd3..1726f5e7fa 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -94,17 +94,17 @@ public class BoatInnadrilTour implements Runnable { _boat = boat; - ARRIVED_AT_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); - LEAVE_INNADRIL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); - LEAVE_INNADRIL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); - LEAVE_INNADRIL0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); - LEAVING_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); + ARRIVED_AT_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); + LEAVE_INNADRIL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); + LEAVE_INNADRIL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); + LEAVE_INNADRIL0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); + LEAVING_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); - ARRIVAL20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); INNADRIL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), DOCK.getX(), DOCK.getY(), DOCK.getZ()); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index b71c8722f9..fadac432d0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -90,13 +90,13 @@ public class BoatRunePrimeval implements Runnable { _boat = boat; - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); PRIMEVAL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), PRIMEVAL_DOCK.getX(), PRIMEVAL_DOCK.getY(), PRIMEVAL_DOCK.getZ()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index cde301fa0a..7f6df99ca8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java index ec38377e2a..28eb92158c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -221,7 +221,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 8c02a5d828..d1bec81a8e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -482,7 +482,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index 5fb5c1223b..7812175c08 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -23,39 +23,38 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.instancemanager.RankManager; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; + private final Creature _sender; private final ChatType _chatType; - private String _charName = null; - private int _charId = 0; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _chatType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -83,66 +82,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _chatType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _chatType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _chatType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _chatType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _chatType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _chatType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -163,26 +123,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); - if (_charName != null) + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_chatType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -195,15 +155,15 @@ public class CreatureSay implements IClientOutgoingPacket } // Rank - final PlayerInstance player = World.getInstance().getPlayer(_objectId); - if (player != null) + if ((_sender != null) && _sender.isPlayer()) { - if ((player.getClan() != null) && ((_chatType == ChatType.CLAN) || (_chatType == ChatType.ALLIANCE))) + final Clan clan = _sender.getClan(); + if ((clan != null) && ((_chatType == ChatType.CLAN) || (_chatType == ChatType.ALLIANCE))) { packet.writeC(0); // unknown clan byte } - final int rank = RankManager.getInstance().getPlayerGlobalRank(player); + final int rank = RankManager.getInstance().getPlayerGlobalRank(_sender.getActingPlayer()); if ((rank == 0) || (rank > 100)) { packet.writeC(0); @@ -221,9 +181,9 @@ public class CreatureSay implements IClientOutgoingPacket packet.writeC(3); } - if (player.getClan() != null) + if (clan != null) { - packet.writeC(player.getClan().getCastleId()); + packet.writeC(_sender.getClan().getCastleId()); } else { @@ -243,7 +203,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_chatType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BuilderUtil.java index f59365a0f1..ab560388e6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java index d3e58c95e2..9e71983028 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/CreatureSay.java @@ -40,7 +40,6 @@ public class CreatureSay extends GameServerPacket _textType = messageType; _charName = charName; _text = text; - // setLifeTime(0); } @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index 2ff5c3fcaf..93d38f63b3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -93,7 +93,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java index 5182085d5d..636f6e72a4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java @@ -371,7 +371,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.BATTLEFIELD, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.BATTLEFIELD, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 19b7080d3e..965cab9d2c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 36e703e0f9..99e83242b9 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), (target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL), target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, (target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL), target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index 026c74fcc9..14f1c8e514 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java index da32b9d733..3bc5d415a7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java @@ -47,7 +47,7 @@ public class ChatBattlefield implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if (player.getSiegeSide() == activeChar.getSiegeSide()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index fda713770e..d2be3d8fd7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index a75c0fb87a..980c8afbe0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -86,8 +86,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 1567d4c77a..ae2f790082 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 7d6b7a31c2..23637447f6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 6cc581ce7c..7b87002977 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -60,7 +60,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance member : room.getPartyMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 9e8fa78f4d..b36bee938e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -52,7 +52,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 7abc99d5d9..859e9e31b0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -52,7 +52,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index ea2d22f0b8..3f9f895372 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -57,7 +57,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index 41ef41352a..b7844d45ff 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -57,7 +57,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java index 460f8d99d8..dcc9ca9310 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java @@ -67,7 +67,7 @@ public class ChatWhisper implements IChatHandler if (Config.FAKE_PLAYER_CHAT) { final String name = FakePlayerData.getInstance().getProperName(target); - activeChar.sendPacket(new CreatureSay(activeChar.getObjectId(), type, "->" + name, text)); + activeChar.sendPacket(new CreatureSay(activeChar, type, "->" + name, text)); FakePlayerChatManager.getInstance().manageChat(activeChar, name, text); } else @@ -114,8 +114,8 @@ public class ChatWhisper implements IChatHandler activeChar.addSilenceModeExcluded(receiver.getObjectId()); } - receiver.sendPacket(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); - activeChar.sendPacket(new CreatureSay(activeChar.getObjectId(), type, "->" + receiver.getName(), text)); + receiver.sendPacket(new CreatureSay(activeChar, type, activeChar.getName(), text)); + activeChar.sendPacket(new CreatureSay(activeChar, type, "->" + receiver.getName(), text)); } else { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index 2bbbc8a90d..63485b8a17 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -1288,7 +1288,7 @@ public class CrystalCaverns extends AbstractInstance world._alarm = addSpawn(ALARM, spawnLoc[0], spawnLoc[1], spawnLoc[2], 10800, false, 0, false, world.getInstanceId()); world._alarm.disableCoreAI(true); world._alarm.setIsImmobilized(true); - world._alarm.broadcastPacket(new CreatureSay(world._alarm.getObjectId(), ChatType.SHOUT, world._alarm.getName(), NpcStringId.AN_ALARM_HAS_BEEN_SET_OFF_EVERYBODY_WILL_BE_IN_DANGER_IF_THEY_ARE_NOT_TAKEN_CARE_OF_IMMEDIATELY)); + world._alarm.broadcastPacket(new CreatureSay(world._alarm, ChatType.SHOUT, NpcStringId.AN_ALARM_HAS_BEEN_SET_OFF_EVERYBODY_WILL_BE_IN_DANGER_IF_THEY_ARE_NOT_TAKEN_CARE_OF_IMMEDIATELY)); } } else if (event.equalsIgnoreCase("baylor_skill")) @@ -1308,12 +1308,12 @@ public class CrystalCaverns extends AbstractInstance if ((nowHp < (maxHp * 0.15)) && (world._raidStatus == 2)) { npc.doCast(SkillData.getInstance().getSkill(5225, 1)); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.SHOUT, npc.getName(), NpcStringId.DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.SHOUT, NpcStringId.DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH)); } else if ((rand < 10) || (nowHp < (maxHp * 0.15))) { npc.doCast(SkillData.getInstance().getSkill(5225, 1)); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.SHOUT, npc.getName(), NpcStringId.DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.SHOUT, NpcStringId.DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH)); startQuestTimer("baylor_remove_invul", 30000, world._baylor, null); } } @@ -1380,7 +1380,7 @@ public class CrystalCaverns extends AbstractInstance { if (getRandom(100) < 5) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.SHOUT, npc.getName(), NpcStringId.AH_I_M_HUNGRY)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.SHOUT, NpcStringId.AH_I_M_HUNGRY)); } startQuestTimer("autoFood", 2000, npc, null); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java index 16454e41c6..7764716acb 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java @@ -1372,7 +1372,7 @@ public class Q00335_TheSongOfTheHunter extends Quest if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_7C) && (getQuestItemsCount(qs.getPlayer(), TEMPEST_SHARD) < 40) && (getRandom(20) < 2)) { addSpawn(GREMLIN_FILCHER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); } break; } @@ -1381,7 +1381,7 @@ public class Q00335_TheSongOfTheHunter extends Quest if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_10C) && (getQuestItemsCount(qs.getPlayer(), HAMADRYAD_SHARD) < 40) && (getRandom(20) < 2)) { addSpawn(GREMLIN_FILCHER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); } break; } @@ -1406,7 +1406,7 @@ public class Q00335_TheSongOfTheHunter extends Quest if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_3B) && (getQuestItemsCount(qs.getPlayer(), NARCISSUSS_SOULSTONE) < 40) && (getRandom(20) < 2)) { addSpawn(GREMLIN_FILCHER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); } break; } @@ -1415,7 +1415,7 @@ public class Q00335_TheSongOfTheHunter extends Quest if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_5C) && (getQuestItemsCount(qs.getPlayer(), COIN_OF_OLD_EMPIRE) < 20) && (getRandom(20) < 2)) { addSpawn(GREMLIN_FILCHER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); } break; } @@ -1424,7 +1424,7 @@ public class Q00335_TheSongOfTheHunter extends Quest if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_5C) && (getQuestItemsCount(qs.getPlayer(), COIN_OF_OLD_EMPIRE) < 20) && (getRandom(20) < 2)) { addSpawn(GREMLIN_FILCHER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); } if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_2A) && !hasQuestItems(qs.getPlayer(), BUST_OF_TRAVIS) && (getRandom(10) < 2)) @@ -1450,7 +1450,7 @@ public class Q00335_TheSongOfTheHunter extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); } - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.PRETTY_GOOD)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.PRETTY_GOOD)); } if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_8C) && (getQuestItemsCount(qs.getPlayer(), TSUNAMI_SHARD) < 40)) @@ -1460,7 +1460,7 @@ public class Q00335_TheSongOfTheHunter extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); } - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.PRETTY_GOOD)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.PRETTY_GOOD)); } if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_10C) && (getQuestItemsCount(qs.getPlayer(), HAMADRYAD_SHARD) < 40)) @@ -1470,7 +1470,7 @@ public class Q00335_TheSongOfTheHunter extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); } - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.PRETTY_GOOD)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.PRETTY_GOOD)); } if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_3B) && (getQuestItemsCount(qs.getPlayer(), NARCISSUSS_SOULSTONE) < 40)) @@ -1480,7 +1480,7 @@ public class Q00335_TheSongOfTheHunter extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); } - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.PRETTY_GOOD)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.PRETTY_GOOD)); } if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_5C) && (getQuestItemsCount(qs.getPlayer(), COIN_OF_OLD_EMPIRE) < 20)) @@ -1490,7 +1490,7 @@ public class Q00335_TheSongOfTheHunter extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); } - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.PRETTY_GOOD)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.PRETTY_GOOD)); } break; } @@ -1500,7 +1500,7 @@ public class Q00335_TheSongOfTheHunter extends Quest { addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); } break; } @@ -1510,7 +1510,7 @@ public class Q00335_TheSongOfTheHunter extends Quest { addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); } break; } @@ -1520,7 +1520,7 @@ public class Q00335_TheSongOfTheHunter extends Quest { addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); } break; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatGiranTalking.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatGiranTalking.java index a0f8f29097..fc5dbeb111 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatGiranTalking.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatGiranTalking.java @@ -124,29 +124,29 @@ public class BoatGiranTalking implements Runnable { _boat = boat; - ARRIVED_AT_GIRAN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GIRAN_HARBOR); - ARRIVED_AT_GIRAN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GIRAN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); - LEAVE_GIRAN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); - LEAVE_GIRAN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); - LEAVING_GIRAN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); - ARRIVED_AT_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); - ARRIVED_AT_TALKING_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_FIVE_MINUTES); - LEAVE_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_ONE_MINUTE); - LEAVE_TALKING0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GIRAN_HARBOR); - LEAVING_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GIRAN_HARBOR); - BUSY_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); + ARRIVED_AT_GIRAN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GIRAN_HARBOR); + ARRIVED_AT_GIRAN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GIRAN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); + LEAVE_GIRAN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); + LEAVE_GIRAN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); + LEAVING_GIRAN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); + ARRIVED_AT_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); + ARRIVED_AT_TALKING_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_FIVE_MINUTES); + LEAVE_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_ONE_MINUTE); + LEAVE_TALKING0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GIRAN_HARBOR); + LEAVING_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GIRAN_HARBOR); + BUSY_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); - ARRIVAL_TALKING15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_TALKING10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_GIRAN20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL_GIRAN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GIRAN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GIRAN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GIRAN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_TALKING15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_TALKING10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GIRAN20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL_GIRAN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GIRAN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GIRAN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GIRAN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GIRAN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GIRAN_DOCK.getX(), GIRAN_DOCK.getY(), GIRAN_DOCK.getZ()); TALKING_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), TALKING_DOCK[0].getX(), TALKING_DOCK[0].getY(), TALKING_DOCK[0].getZ()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatGludinRune.java index 4f9925f035..eb4320b4f1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -139,29 +139,29 @@ public class BoatGludinRune implements Runnable { _boat = boat; - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_RUNE0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_RUNE0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_RUNE15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_RUNE10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GLUDIN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index 0d71b93262..dcc88b24c6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -95,17 +95,17 @@ public class BoatInnadrilTour implements Runnable { _boat = boat; - ARRIVED_AT_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); - LEAVE_INNADRIL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); - LEAVE_INNADRIL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); - LEAVE_INNADRIL0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); - LEAVING_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); + ARRIVED_AT_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); + LEAVE_INNADRIL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); + LEAVE_INNADRIL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); + LEAVE_INNADRIL0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); + LEAVING_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); - ARRIVAL20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); INNADRIL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), DOCK.getX(), DOCK.getY(), DOCK.getZ()); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index 94594a555c..98bf374403 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -91,13 +91,13 @@ public class BoatRunePrimeval implements Runnable { _boat = boat; - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); PRIMEVAL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), PRIMEVAL_DOCK.getX(), PRIMEVAL_DOCK.getY(), PRIMEVAL_DOCK.getZ()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatTalkingGludin.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatTalkingGludin.java index a41864766c..b9f6af8722 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatTalkingGludin.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/vehicles/BoatTalkingGludin.java @@ -109,28 +109,28 @@ public class BoatTalkingGludin implements Runnable _boat = boat; _cycle = 0; - ARRIVED_AT_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); - ARRIVED_AT_TALKING_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_FIVE_MINUTES); - LEAVE_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_ONE_MINUTE); - LEAVE_TALKING1_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THOSE_WISHING_TO_RIDE_THE_FERRY_SHOULD_MAKE_HASTE_TO_GET_ON); - LEAVE_TALKING0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GLUDIN_HARBOR); - LEAVING_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); - BUSY_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); + ARRIVED_AT_TALKING_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_FIVE_MINUTES); + LEAVE_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_ONE_MINUTE); + LEAVE_TALKING1_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THOSE_WISHING_TO_RIDE_THE_FERRY_SHOULD_MAKE_HASTE_TO_GET_ON); + LEAVE_TALKING0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GLUDIN_HARBOR); + LEAVING_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); + BUSY_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_ARRIVE_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_TALKING10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_ARRIVE_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_TALKING10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); TALKING_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), TALKING_DOCK[0].getX(), TALKING_DOCK[0].getY(), TALKING_DOCK[0].getZ()); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java index 8a1361975b..abf2125c22 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/SevenSignsFestival.java @@ -1687,28 +1687,26 @@ public class SevenSignsFestival implements SpawnListener /** * Used to send a "shout" message to all players currently present in an Oracle.
* Primarily used for Festival Guide and Witch related speech. - * @param senderName * @param npcString */ - public void sendMessageToAll(String senderName, NpcStringId npcString) + public void sendMessageToAll(NpcStringId npcString) { if ((_dawnChatGuide == null) || (_duskChatGuide == null)) { return; } - sendMessageToAll(senderName, npcString, _dawnChatGuide); - sendMessageToAll(senderName, npcString, _duskChatGuide); + sendMessageToAll(npcString, _dawnChatGuide); + sendMessageToAll(npcString, _duskChatGuide); } /** - * @param senderName * @param npcString * @param npc */ - public void sendMessageToAll(String senderName, NpcStringId npcString, Npc npc) + public void sendMessageToAll(NpcStringId npcString, Npc npc) { - final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_SHOUT, senderName, npcString); + final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_SHOUT, npcString); if (npcString.getParamCount() == 1) { cs.addStringParameter(String.valueOf(getMinsToNextFestival())); @@ -1795,7 +1793,7 @@ public class SevenSignsFestival implements SpawnListener } else if (getMinsToNextFestival() == 2) { - sendMessageToAll("Festival Guide", NpcStringId.THE_MAIN_EVENT_WILL_START_IN_2_MINUTES_PLEASE_REGISTER_NOW); + sendMessageToAll(NpcStringId.THE_MAIN_EVENT_WILL_START_IN_2_MINUTES_PLEASE_REGISTER_NOW); } // Stand by until the allowed signup period has elapsed. @@ -1872,7 +1870,7 @@ public class SevenSignsFestival implements SpawnListener _festivalInitialized = true; setNextFestivalStart(Config.ALT_FESTIVAL_CYCLE_LENGTH); - sendMessageToAll("Festival Guide", NpcStringId.THE_MAIN_EVENT_IS_NOW_STARTING); + sendMessageToAll(NpcStringId.THE_MAIN_EVENT_IS_NOW_STARTING); // Stand by for a short length of time before starting the festival. try @@ -2007,7 +2005,7 @@ public class SevenSignsFestival implements SpawnListener // Allow signups for the next festival cycle. _festivalInitialized = false; - sendMessageToAll("Festival Witch", NpcStringId.THAT_WILL_DO_I_LL_MOVE_YOU_TO_THE_OUTSIDE_SOON); + sendMessageToAll(NpcStringId.THAT_WILL_DO_I_LL_MOVE_YOU_TO_THE_OUTSIDE_SOON); } catch (Exception e) { @@ -2315,7 +2313,7 @@ public class SevenSignsFestival implements SpawnListener { if ((_participants != null) && !_participants.isEmpty()) { - _witchInst.broadcastPacket(new CreatureSay(_witchInst.getObjectId(), ChatType.NPC_GENERAL, "Festival Witch", npcStringId)); + _witchInst.broadcastPacket(new CreatureSay(_witchInst, ChatType.NPC_GENERAL, npcStringId)); } } @@ -2323,7 +2321,7 @@ public class SevenSignsFestival implements SpawnListener { if ((_participants != null) && !_participants.isEmpty()) { - _witchInst.broadcastPacket(new CreatureSay(_witchInst.getObjectId(), ChatType.NPC_GENERAL, "Festival Witch", npcString)); + _witchInst.broadcastPacket(new CreatureSay(_witchInst, ChatType.NPC_GENERAL, "Festival Witch", npcString)); } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index 09570ad378..07737b8f94 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -327,7 +327,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -337,7 +337,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -411,7 +411,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 2159fc7d86..67aff5ee58 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -246,7 +246,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java index 2449d8ace2..4ca2f03fee 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java @@ -430,7 +430,7 @@ public class SepulcherNpcInstance extends Npc return; // wrong usage } - final CreatureSay creatureSay = new CreatureSay(0, ChatType.NPC_SHOUT, getName(), msg); + final CreatureSay creatureSay = new CreatureSay(this, ChatType.NPC_SHOUT, msg); for (PlayerInstance player : World.getInstance().getPlayers()) { if (Util.checkIfInRange(15000, player, this, true)) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/TvTEvent.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/TvTEvent.java index 8c53b0508c..80b6acce6c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/TvTEvent.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/entity/TvTEvent.java @@ -827,7 +827,7 @@ public class TvTEvent killerTeam.increasePoints(); - final CreatureSay cs = new CreatureSay(killerPlayerInstance.getObjectId(), ChatType.WHISPER, killerPlayerInstance.getName(), "I have killed " + killedPlayerInstance.getName() + "!"); + final CreatureSay cs = new CreatureSay(killerPlayerInstance, ChatType.WHISPER, killerPlayerInstance.getName(), "I have killed " + killedPlayerInstance.getName() + "!"); for (PlayerInstance playerInstance : _teams[killerTeamId].getParticipatedPlayers().values()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 8962d754f8..81b0896aa3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -826,14 +826,14 @@ public class Instance { timeLeft = remaining / 1000; interval = 30000; - cs = new CreatureSay(0, ChatType.ALLIANCE, "Notice", timeLeft + " seconds left."); + cs = new CreatureSay(null, ChatType.ALLIANCE, "Notice", timeLeft + " seconds left."); remaining -= 30000; } else { timeLeft = remaining / 1000; interval = 10000; - cs = new CreatureSay(0, ChatType.ALLIANCE, "Notice", timeLeft + " seconds left."); + cs = new CreatureSay(null, ChatType.ALLIANCE, "Notice", timeLeft + " seconds left."); remaining -= 10000; } if (cs != null) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index e7ebfcd5ec..75b9659d86 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -1083,7 +1083,7 @@ class OlympiadGame final Npc manager = spawn.getLastSpawn(); if (manager != null) { - manager.broadcastPacket(new CreatureSay(manager.getObjectId(), ChatType.NPC_SHOUT, manager.getName(), "Olympiad " + gameType + " is going to begin in Arena " + (_stadiumID + 1) + " in a moment.")); + manager.broadcastPacket(new CreatureSay(manager, ChatType.NPC_SHOUT, manager.getName(), "Olympiad " + gameType + " is going to begin in Arena " + (_stadiumID + 1) + " in a moment.")); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 581981aa84..d819cd249e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -469,7 +469,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 15961b93a3..16c3583f2b 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -81,7 +81,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { 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 e3fea22af7..630bcd63c5 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 @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,65 +29,35 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _msgId = 0; + private int _charId = 0; + private int _messageId = 0; private List _parameters; - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _textType = messageType; - _charName = name; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _text = npcString.getText(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = npcString.getText(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _msgId = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -107,19 +77,20 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - if (_msgId != 0) + if (_messageId != 0) { - packet.writeD(_msgId); + packet.writeD(_messageId); } else if (_text != null) { @@ -140,7 +111,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java index c14276efe0..b6216d939a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -175,7 +175,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toPlayersInInstance(IClientOutgoingPacket packet, int instanceId) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 70a7892d7c..48f0a9a267 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -40,7 +40,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -55,7 +55,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index 2ff5c3fcaf..93d38f63b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -93,7 +93,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java index 5182085d5d..636f6e72a4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Race/Race.java @@ -371,7 +371,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.BATTLEFIELD, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.BATTLEFIELD, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 5522996bab..ef59b51033 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -123,7 +123,7 @@ public class FreyaCelebration extends LongTimeEvent { if (getRandom(100) < 5) { - final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); + final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERE_S_NOTHING_STRANGE_ABOUT_IT_IT_S_JUST_A_BIT_OF_MY_CAPRICIOUSNESS); cs.addStringParameter(caster.getName()); npc.broadcastPacket(cs); @@ -132,7 +132,7 @@ public class FreyaCelebration extends LongTimeEvent } else if (getRandom(10) < 2) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), getRandomEntry(FREYA_TEXT))); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, getRandomEntry(FREYA_TEXT))); } } return super.onSkillSee(npc, caster, skill, targets, isSummon); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 19b7080d3e..965cab9d2c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 36e703e0f9..99e83242b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), (target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL), target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, (target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL), target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index 026c74fcc9..14f1c8e514 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java index da32b9d733..3bc5d415a7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatBattlefield.java @@ -47,7 +47,7 @@ public class ChatBattlefield implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if (player.getSiegeSide() == activeChar.getSiegeSide()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index fda713770e..d2be3d8fd7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index a75c0fb87a..980c8afbe0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -86,8 +86,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 1567d4c77a..ae2f790082 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 7d6b7a31c2..23637447f6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 6cc581ce7c..7b87002977 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -60,7 +60,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance member : room.getPartyMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 9e8fa78f4d..b36bee938e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -52,7 +52,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 7abc99d5d9..859e9e31b0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -52,7 +52,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index ea2d22f0b8..3f9f895372 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -57,7 +57,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index 41ef41352a..b7844d45ff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -57,7 +57,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java index 460f8d99d8..dcc9ca9310 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatWhisper.java @@ -67,7 +67,7 @@ public class ChatWhisper implements IChatHandler if (Config.FAKE_PLAYER_CHAT) { final String name = FakePlayerData.getInstance().getProperName(target); - activeChar.sendPacket(new CreatureSay(activeChar.getObjectId(), type, "->" + name, text)); + activeChar.sendPacket(new CreatureSay(activeChar, type, "->" + name, text)); FakePlayerChatManager.getInstance().manageChat(activeChar, name, text); } else @@ -114,8 +114,8 @@ public class ChatWhisper implements IChatHandler activeChar.addSilenceModeExcluded(receiver.getObjectId()); } - receiver.sendPacket(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); - activeChar.sendPacket(new CreatureSay(activeChar.getObjectId(), type, "->" + receiver.getName(), text)); + receiver.sendPacket(new CreatureSay(activeChar, type, activeChar.getName(), text)); + activeChar.sendPacket(new CreatureSay(activeChar, type, "->" + receiver.getName(), text)); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index 2bbbc8a90d..63485b8a17 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -1288,7 +1288,7 @@ public class CrystalCaverns extends AbstractInstance world._alarm = addSpawn(ALARM, spawnLoc[0], spawnLoc[1], spawnLoc[2], 10800, false, 0, false, world.getInstanceId()); world._alarm.disableCoreAI(true); world._alarm.setIsImmobilized(true); - world._alarm.broadcastPacket(new CreatureSay(world._alarm.getObjectId(), ChatType.SHOUT, world._alarm.getName(), NpcStringId.AN_ALARM_HAS_BEEN_SET_OFF_EVERYBODY_WILL_BE_IN_DANGER_IF_THEY_ARE_NOT_TAKEN_CARE_OF_IMMEDIATELY)); + world._alarm.broadcastPacket(new CreatureSay(world._alarm, ChatType.SHOUT, NpcStringId.AN_ALARM_HAS_BEEN_SET_OFF_EVERYBODY_WILL_BE_IN_DANGER_IF_THEY_ARE_NOT_TAKEN_CARE_OF_IMMEDIATELY)); } } else if (event.equalsIgnoreCase("baylor_skill")) @@ -1308,12 +1308,12 @@ public class CrystalCaverns extends AbstractInstance if ((nowHp < (maxHp * 0.15)) && (world._raidStatus == 2)) { npc.doCast(SkillData.getInstance().getSkill(5225, 1)); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.SHOUT, npc.getName(), NpcStringId.DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.SHOUT, NpcStringId.DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH)); } else if ((rand < 10) || (nowHp < (maxHp * 0.15))) { npc.doCast(SkillData.getInstance().getSkill(5225, 1)); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.SHOUT, npc.getName(), NpcStringId.DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.SHOUT, NpcStringId.DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH)); startQuestTimer("baylor_remove_invul", 30000, world._baylor, null); } } @@ -1380,7 +1380,7 @@ public class CrystalCaverns extends AbstractInstance { if (getRandom(100) < 5) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.SHOUT, npc.getName(), NpcStringId.AH_I_M_HUNGRY)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.SHOUT, NpcStringId.AH_I_M_HUNGRY)); } startQuestTimer("autoFood", 2000, npc, null); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java index 16454e41c6..7764716acb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00335_TheSongOfTheHunter/Q00335_TheSongOfTheHunter.java @@ -1372,7 +1372,7 @@ public class Q00335_TheSongOfTheHunter extends Quest if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_7C) && (getQuestItemsCount(qs.getPlayer(), TEMPEST_SHARD) < 40) && (getRandom(20) < 2)) { addSpawn(GREMLIN_FILCHER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); } break; } @@ -1381,7 +1381,7 @@ public class Q00335_TheSongOfTheHunter extends Quest if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_10C) && (getQuestItemsCount(qs.getPlayer(), HAMADRYAD_SHARD) < 40) && (getRandom(20) < 2)) { addSpawn(GREMLIN_FILCHER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); } break; } @@ -1406,7 +1406,7 @@ public class Q00335_TheSongOfTheHunter extends Quest if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_3B) && (getQuestItemsCount(qs.getPlayer(), NARCISSUSS_SOULSTONE) < 40) && (getRandom(20) < 2)) { addSpawn(GREMLIN_FILCHER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); } break; } @@ -1415,7 +1415,7 @@ public class Q00335_TheSongOfTheHunter extends Quest if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_5C) && (getQuestItemsCount(qs.getPlayer(), COIN_OF_OLD_EMPIRE) < 20) && (getRandom(20) < 2)) { addSpawn(GREMLIN_FILCHER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); } break; } @@ -1424,7 +1424,7 @@ public class Q00335_TheSongOfTheHunter extends Quest if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_5C) && (getQuestItemsCount(qs.getPlayer(), COIN_OF_OLD_EMPIRE) < 20) && (getRandom(20) < 2)) { addSpawn(GREMLIN_FILCHER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEY_RE_ALL_MINE)); } if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_2A) && !hasQuestItems(qs.getPlayer(), BUST_OF_TRAVIS) && (getRandom(10) < 2)) @@ -1450,7 +1450,7 @@ public class Q00335_TheSongOfTheHunter extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); } - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.PRETTY_GOOD)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.PRETTY_GOOD)); } if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_8C) && (getQuestItemsCount(qs.getPlayer(), TSUNAMI_SHARD) < 40)) @@ -1460,7 +1460,7 @@ public class Q00335_TheSongOfTheHunter extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); } - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.PRETTY_GOOD)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.PRETTY_GOOD)); } if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_10C) && (getQuestItemsCount(qs.getPlayer(), HAMADRYAD_SHARD) < 40)) @@ -1470,7 +1470,7 @@ public class Q00335_TheSongOfTheHunter extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); } - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.PRETTY_GOOD)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.PRETTY_GOOD)); } if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_3B) && (getQuestItemsCount(qs.getPlayer(), NARCISSUSS_SOULSTONE) < 40)) @@ -1480,7 +1480,7 @@ public class Q00335_TheSongOfTheHunter extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); } - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.PRETTY_GOOD)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.PRETTY_GOOD)); } if (hasQuestItems(qs.getPlayer(), SECOND_CIRCLE_REQUEST_5C) && (getQuestItemsCount(qs.getPlayer(), COIN_OF_OLD_EMPIRE) < 20)) @@ -1490,7 +1490,7 @@ public class Q00335_TheSongOfTheHunter extends Quest playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); } - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.PRETTY_GOOD)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.PRETTY_GOOD)); } break; } @@ -1500,7 +1500,7 @@ public class Q00335_TheSongOfTheHunter extends Quest { addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); } break; } @@ -1510,7 +1510,7 @@ public class Q00335_TheSongOfTheHunter extends Quest { addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); } break; } @@ -1520,7 +1520,7 @@ public class Q00335_TheSongOfTheHunter extends Quest { addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); addSpawn(BLACK_LEGION_STORMTROOPER, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.WE_LL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE)); } break; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index 0e2e0a3db2..b5d6d58b37 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -145,7 +145,7 @@ public class Q00457_LostAndFound extends Quest startQuestTimer("STOP", 1000, npc, player); startQuestTimer("BYE", 3000, npc, player); cancelQuestTimer("CHECK", npc, player); - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), NpcStringId.AH_FRESH_AIR)); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, NpcStringId.AH_FRESH_AIR)); broadcastNpcSay(npc, player, NpcStringId.AH_FRESH_AIR, false); giveItems(player, PACKAGED_BOOK, 1); qs.exitQuest(QuestType.DAILY, true); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java index a0f8f29097..fc5dbeb111 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGiranTalking.java @@ -124,29 +124,29 @@ public class BoatGiranTalking implements Runnable { _boat = boat; - ARRIVED_AT_GIRAN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GIRAN_HARBOR); - ARRIVED_AT_GIRAN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GIRAN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); - LEAVE_GIRAN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); - LEAVE_GIRAN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); - LEAVING_GIRAN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); - ARRIVED_AT_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); - ARRIVED_AT_TALKING_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_FIVE_MINUTES); - LEAVE_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_ONE_MINUTE); - LEAVE_TALKING0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GIRAN_HARBOR); - LEAVING_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GIRAN_HARBOR); - BUSY_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); + ARRIVED_AT_GIRAN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GIRAN_HARBOR); + ARRIVED_AT_GIRAN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GIRAN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); + LEAVE_GIRAN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); + LEAVE_GIRAN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); + LEAVING_GIRAN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); + ARRIVED_AT_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); + ARRIVED_AT_TALKING_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_FIVE_MINUTES); + LEAVE_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_ONE_MINUTE); + LEAVE_TALKING0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GIRAN_HARBOR); + LEAVING_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GIRAN_HARBOR); + BUSY_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); - ARRIVAL_TALKING15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_TALKING10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_GIRAN20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL_GIRAN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GIRAN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GIRAN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GIRAN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_TALKING15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_TALKING10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GIRAN20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL_GIRAN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GIRAN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GIRAN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GIRAN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GIRAN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GIRAN_DOCK.getX(), GIRAN_DOCK.getY(), GIRAN_DOCK.getZ()); TALKING_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), TALKING_DOCK[0].getX(), TALKING_DOCK[0].getY(), TALKING_DOCK[0].getZ()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java index 4f9925f035..eb4320b4f1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -139,29 +139,29 @@ public class BoatGludinRune implements Runnable { _boat = boat; - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); - LEAVE_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); - LEAVE_RUNE0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_RUNE_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY_2); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_FIVE_MINUTES); + LEAVE_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.DEPARTURE_FOR_GLUDIN_HARBOR_WILL_TAKE_PLACE_IN_ONE_MINUTE); + LEAVE_RUNE0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.MAKE_HASTE_WE_WILL_BE_DEPARTING_FOR_GLUDIN_HARBOR_SHORTLY); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WE_ARE_NOW_DEPARTING_FOR_GLUDIN_HARBOR_HOLD_ON_AND_ENJOY_THE_RIDE); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_RUNE15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_RUNE10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_RUNE5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_RUNE1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_GLUDIN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_RUNE15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_RUNE10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_RUNE5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_RUNE1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_RUNE_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GLUDIN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_RUNE_HARBOR_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index 0d71b93262..dcc88b24c6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -95,17 +95,17 @@ public class BoatInnadrilTour implements Runnable { _boat = boat; - ARRIVED_AT_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); - LEAVE_INNADRIL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); - LEAVE_INNADRIL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); - LEAVE_INNADRIL0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); - LEAVING_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); + ARRIVED_AT_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); + LEAVE_INNADRIL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); + LEAVE_INNADRIL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); + LEAVE_INNADRIL0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); + LEAVING_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); - ARRIVAL20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); INNADRIL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), DOCK.getX(), DOCK.getY(), DOCK.getZ()); } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index 94594a555c..98bf374403 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -91,13 +91,13 @@ public class BoatRunePrimeval implements Runnable { _boat = boat; - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); PRIMEVAL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), PRIMEVAL_DOCK.getX(), PRIMEVAL_DOCK.getY(), PRIMEVAL_DOCK.getZ()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java index a41864766c..b9f6af8722 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/vehicles/BoatTalkingGludin.java @@ -109,28 +109,28 @@ public class BoatTalkingGludin implements Runnable _boat = boat; _cycle = 0; - ARRIVED_AT_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); - ARRIVED_AT_TALKING_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_FIVE_MINUTES); - LEAVE_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_ONE_MINUTE); - LEAVE_TALKING1_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THOSE_WISHING_TO_RIDE_THE_FERRY_SHOULD_MAKE_HASTE_TO_GET_ON); - LEAVE_TALKING0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GLUDIN_HARBOR); - LEAVING_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); - BUSY_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); + ARRIVED_AT_TALKING_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_FIVE_MINUTES); + LEAVE_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_ONE_MINUTE); + LEAVE_TALKING1_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THOSE_WISHING_TO_RIDE_THE_FERRY_SHOULD_MAKE_HASTE_TO_GET_ON); + LEAVE_TALKING0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GLUDIN_HARBOR); + LEAVING_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); + BUSY_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_ARRIVE_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_TALKING10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_ARRIVE_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_TALKING10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); TALKING_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), TALKING_DOCK[0].getX(), TALKING_DOCK[0].getY(), TALKING_DOCK[0].getZ()); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java index 8a1361975b..abf2125c22 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java @@ -1687,28 +1687,26 @@ public class SevenSignsFestival implements SpawnListener /** * Used to send a "shout" message to all players currently present in an Oracle.
* Primarily used for Festival Guide and Witch related speech. - * @param senderName * @param npcString */ - public void sendMessageToAll(String senderName, NpcStringId npcString) + public void sendMessageToAll(NpcStringId npcString) { if ((_dawnChatGuide == null) || (_duskChatGuide == null)) { return; } - sendMessageToAll(senderName, npcString, _dawnChatGuide); - sendMessageToAll(senderName, npcString, _duskChatGuide); + sendMessageToAll(npcString, _dawnChatGuide); + sendMessageToAll(npcString, _duskChatGuide); } /** - * @param senderName * @param npcString * @param npc */ - public void sendMessageToAll(String senderName, NpcStringId npcString, Npc npc) + public void sendMessageToAll(NpcStringId npcString, Npc npc) { - final CreatureSay cs = new CreatureSay(npc.getObjectId(), ChatType.NPC_SHOUT, senderName, npcString); + final CreatureSay cs = new CreatureSay(npc, ChatType.NPC_SHOUT, npcString); if (npcString.getParamCount() == 1) { cs.addStringParameter(String.valueOf(getMinsToNextFestival())); @@ -1795,7 +1793,7 @@ public class SevenSignsFestival implements SpawnListener } else if (getMinsToNextFestival() == 2) { - sendMessageToAll("Festival Guide", NpcStringId.THE_MAIN_EVENT_WILL_START_IN_2_MINUTES_PLEASE_REGISTER_NOW); + sendMessageToAll(NpcStringId.THE_MAIN_EVENT_WILL_START_IN_2_MINUTES_PLEASE_REGISTER_NOW); } // Stand by until the allowed signup period has elapsed. @@ -1872,7 +1870,7 @@ public class SevenSignsFestival implements SpawnListener _festivalInitialized = true; setNextFestivalStart(Config.ALT_FESTIVAL_CYCLE_LENGTH); - sendMessageToAll("Festival Guide", NpcStringId.THE_MAIN_EVENT_IS_NOW_STARTING); + sendMessageToAll(NpcStringId.THE_MAIN_EVENT_IS_NOW_STARTING); // Stand by for a short length of time before starting the festival. try @@ -2007,7 +2005,7 @@ public class SevenSignsFestival implements SpawnListener // Allow signups for the next festival cycle. _festivalInitialized = false; - sendMessageToAll("Festival Witch", NpcStringId.THAT_WILL_DO_I_LL_MOVE_YOU_TO_THE_OUTSIDE_SOON); + sendMessageToAll(NpcStringId.THAT_WILL_DO_I_LL_MOVE_YOU_TO_THE_OUTSIDE_SOON); } catch (Exception e) { @@ -2315,7 +2313,7 @@ public class SevenSignsFestival implements SpawnListener { if ((_participants != null) && !_participants.isEmpty()) { - _witchInst.broadcastPacket(new CreatureSay(_witchInst.getObjectId(), ChatType.NPC_GENERAL, "Festival Witch", npcStringId)); + _witchInst.broadcastPacket(new CreatureSay(_witchInst, ChatType.NPC_GENERAL, npcStringId)); } } @@ -2323,7 +2321,7 @@ public class SevenSignsFestival implements SpawnListener { if ((_participants != null) && !_participants.isEmpty()) { - _witchInst.broadcastPacket(new CreatureSay(_witchInst.getObjectId(), ChatType.NPC_GENERAL, "Festival Witch", npcString)); + _witchInst.broadcastPacket(new CreatureSay(_witchInst, ChatType.NPC_GENERAL, "Festival Witch", npcString)); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index 09570ad378..07737b8f94 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -327,7 +327,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -337,7 +337,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -411,7 +411,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 2159fc7d86..67aff5ee58 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -246,7 +246,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java index 2449d8ace2..4ca2f03fee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherNpcInstance.java @@ -430,7 +430,7 @@ public class SepulcherNpcInstance extends Npc return; // wrong usage } - final CreatureSay creatureSay = new CreatureSay(0, ChatType.NPC_SHOUT, getName(), msg); + final CreatureSay creatureSay = new CreatureSay(this, ChatType.NPC_SHOUT, msg); for (PlayerInstance player : World.getInstance().getPlayers()) { if (Util.checkIfInRange(15000, player, this, true)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/TvTEvent.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/TvTEvent.java index 8c53b0508c..80b6acce6c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/TvTEvent.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/TvTEvent.java @@ -827,7 +827,7 @@ public class TvTEvent killerTeam.increasePoints(); - final CreatureSay cs = new CreatureSay(killerPlayerInstance.getObjectId(), ChatType.WHISPER, killerPlayerInstance.getName(), "I have killed " + killedPlayerInstance.getName() + "!"); + final CreatureSay cs = new CreatureSay(killerPlayerInstance, ChatType.WHISPER, killerPlayerInstance.getName(), "I have killed " + killedPlayerInstance.getName() + "!"); for (PlayerInstance playerInstance : _teams[killerTeamId].getParticipatedPlayers().values()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java index 1c69ce3f65..465487a155 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/Instance.java @@ -826,14 +826,14 @@ public class Instance { timeLeft = remaining / 1000; interval = 30000; - cs = new CreatureSay(0, ChatType.ALLIANCE, "Notice", timeLeft + " seconds left."); + cs = new CreatureSay(null, ChatType.ALLIANCE, "Notice", timeLeft + " seconds left."); remaining -= 30000; } else { timeLeft = remaining / 1000; interval = 10000; - cs = new CreatureSay(0, ChatType.ALLIANCE, "Notice", timeLeft + " seconds left."); + cs = new CreatureSay(null, ChatType.ALLIANCE, "Notice", timeLeft + " seconds left."); remaining -= 10000; } if (cs != null) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index f7a2b01ded..9c10d3224f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -474,7 +474,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 15961b93a3..16c3583f2b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -81,7 +81,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { 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 480a75be43..29a4f3fd29 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 @@ -21,7 +21,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -29,65 +29,35 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private List _parameters; - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _textType = messageType; - _charName = name; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -107,17 +77,18 @@ public class CreatureSay implements IClientOutgoingPacket public boolean write(PacketWriter packet) { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); @@ -137,7 +108,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java index c14276efe0..b6216d939a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -175,7 +175,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toPlayersInInstance(IClientOutgoingPacket packet, int instanceId) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 70a7892d7c..48f0a9a267 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -40,7 +40,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -55,7 +55,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index ac7310cb22..fd55d892db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -91,8 +91,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 2d8dd0fa86..28591234bd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -625,7 +625,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -633,7 +633,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -641,7 +641,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index f678537c08..e473b18636 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -624,7 +624,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -632,7 +632,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -640,7 +640,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 189679a088..3eec283c75 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -612,7 +612,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -620,7 +620,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -628,7 +628,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index fcc2c5df98..fbf99259a4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index a57206cca5..611fa8d584 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 34073e66cf..9c8769d1a0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 0af8f6ed9e..7aa68e7ac8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 3240459f0c..ca46bd2b9e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 63d91115f7..bd745507c1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 548f97f47f..aa5b0d1550 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 11c0bad380..39787eeb42 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index 4b8ca31da6..0ae18b29f2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index d5e10fb412..3491fc1a9b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 22b8f071fe..7198d826ab 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9e59129b20..aeb0433887 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -222,7 +222,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 8f66fe00ee..79be1a68d5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -465,7 +465,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { 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 794c554426..ea16b5f7cc 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 @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 170f0a41c8..d85d56251c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index ac7310cb22..fd55d892db 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -91,8 +91,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 2d8dd0fa86..28591234bd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -625,7 +625,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -633,7 +633,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -641,7 +641,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index f678537c08..e473b18636 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -624,7 +624,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -632,7 +632,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -640,7 +640,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 189679a088..3eec283c75 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -612,7 +612,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -620,7 +620,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -628,7 +628,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index fcc2c5df98..fbf99259a4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index a57206cca5..611fa8d584 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 34073e66cf..9c8769d1a0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 0af8f6ed9e..7aa68e7ac8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 3240459f0c..ca46bd2b9e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 63d91115f7..bd745507c1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 548f97f47f..aa5b0d1550 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 11c0bad380..39787eeb42 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index 4b8ca31da6..0ae18b29f2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index d5e10fb412..3491fc1a9b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 22b8f071fe..7198d826ab 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9e59129b20..aeb0433887 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -222,7 +222,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 3c73c50e62..c65d0d7419 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -465,7 +465,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { 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 794c554426..ea16b5f7cc 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 @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 170f0a41c8..d85d56251c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index ac7310cb22..fd55d892db 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -91,8 +91,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 2d8dd0fa86..28591234bd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -625,7 +625,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -633,7 +633,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -641,7 +641,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index f678537c08..e473b18636 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -624,7 +624,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -632,7 +632,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -640,7 +640,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 189679a088..3eec283c75 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -612,7 +612,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -620,7 +620,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -628,7 +628,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index fcc2c5df98..fbf99259a4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index a57206cca5..611fa8d584 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 34073e66cf..9c8769d1a0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 0af8f6ed9e..7aa68e7ac8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 3240459f0c..ca46bd2b9e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 63d91115f7..bd745507c1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 548f97f47f..aa5b0d1550 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 11c0bad380..39787eeb42 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index 4b8ca31da6..0ae18b29f2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index d5e10fb412..3491fc1a9b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 22b8f071fe..7198d826ab 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9e59129b20..aeb0433887 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -222,7 +222,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0590818968..f82eda6254 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -467,7 +467,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { 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 794c554426..ea16b5f7cc 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 @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 170f0a41c8..d85d56251c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index ac7310cb22..fd55d892db 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -91,8 +91,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 2d8dd0fa86..28591234bd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -625,7 +625,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -633,7 +633,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -641,7 +641,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index f678537c08..e473b18636 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -624,7 +624,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -632,7 +632,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -640,7 +640,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 189679a088..3eec283c75 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -612,7 +612,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -620,7 +620,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -628,7 +628,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index fcc2c5df98..fbf99259a4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index a57206cca5..611fa8d584 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 34073e66cf..9c8769d1a0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 0af8f6ed9e..7aa68e7ac8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 3240459f0c..ca46bd2b9e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 63d91115f7..bd745507c1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 548f97f47f..aa5b0d1550 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 11c0bad380..39787eeb42 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index 4b8ca31da6..0ae18b29f2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index d5e10fb412..3491fc1a9b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 22b8f071fe..7198d826ab 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 75ded27532..bb7c9dc6b7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -224,7 +224,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0590818968..f82eda6254 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -467,7 +467,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { 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 794c554426..ea16b5f7cc 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 @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 170f0a41c8..d85d56251c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index ac7310cb22..fd55d892db 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -91,8 +91,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 2d8dd0fa86..28591234bd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -625,7 +625,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -633,7 +633,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -641,7 +641,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index f678537c08..e473b18636 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -624,7 +624,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -632,7 +632,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -640,7 +640,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 189679a088..3eec283c75 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -612,7 +612,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -620,7 +620,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -628,7 +628,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index fcc2c5df98..fbf99259a4 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index a57206cca5..611fa8d584 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 34073e66cf..9c8769d1a0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 0af8f6ed9e..7aa68e7ac8 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 3240459f0c..ca46bd2b9e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 63d91115f7..bd745507c1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 548f97f47f..aa5b0d1550 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 11c0bad380..39787eeb42 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index 4b8ca31da6..0ae18b29f2 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index d5e10fb412..3491fc1a9b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 22b8f071fe..7198d826ab 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 75ded27532..bb7c9dc6b7 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -224,7 +224,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 0590818968..f82eda6254 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -467,7 +467,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { 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 794c554426..ea16b5f7cc 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 @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 170f0a41c8..d85d56251c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index f1aff1d463..f391fc6d66 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -91,8 +91,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 2d8dd0fa86..28591234bd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -625,7 +625,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -633,7 +633,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -641,7 +641,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index f678537c08..e473b18636 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -624,7 +624,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -632,7 +632,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -640,7 +640,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 189679a088..3eec283c75 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -612,7 +612,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -620,7 +620,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -628,7 +628,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index fcc2c5df98..fbf99259a4 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index a57206cca5..611fa8d584 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 34073e66cf..9c8769d1a0 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 0af8f6ed9e..7aa68e7ac8 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 3240459f0c..ca46bd2b9e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 63d91115f7..bd745507c1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 548f97f47f..aa5b0d1550 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 11c0bad380..39787eeb42 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index 4b8ca31da6..0ae18b29f2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index d5e10fb412..3491fc1a9b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 22b8f071fe..7198d826ab 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 75ded27532..bb7c9dc6b7 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -224,7 +224,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 54730ade9c..5c451751b2 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -468,7 +468,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { 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 5fb5c1223b..7812175c08 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 @@ -23,39 +23,38 @@ import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; import org.l2jmobius.gameserver.instancemanager.RankManager; -import org.l2jmobius.gameserver.model.World; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.clan.Clan; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; + private final Creature _sender; private final ChatType _chatType; - private String _charName = null; - private int _charId = 0; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _chatType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -83,66 +82,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _chatType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _chatType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _chatType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _chatType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _chatType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _chatType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -163,26 +123,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); packet.writeD(_chatType.getClientId()); - if (_charName != null) + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_chatType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -195,15 +155,15 @@ public class CreatureSay implements IClientOutgoingPacket } // Rank - final PlayerInstance player = World.getInstance().getPlayer(_objectId); - if (player != null) + if ((_sender != null) && _sender.isPlayer()) { - if ((player.getClan() != null) && ((_chatType == ChatType.CLAN) || (_chatType == ChatType.ALLIANCE))) + final Clan clan = _sender.getClan(); + if ((clan != null) && ((_chatType == ChatType.CLAN) || (_chatType == ChatType.ALLIANCE))) { packet.writeC(0); // unknown clan byte } - final int rank = RankManager.getInstance().getPlayerGlobalRank(player); + final int rank = RankManager.getInstance().getPlayerGlobalRank(_sender.getActingPlayer()); if ((rank == 0) || (rank > 100)) { packet.writeC(0); @@ -221,9 +181,9 @@ public class CreatureSay implements IClientOutgoingPacket packet.writeC(3); } - if (player.getClan() != null) + if (clan != null) { - packet.writeC(player.getClan().getCastleId()); + packet.writeC(_sender.getClan().getCastleId()); } else { @@ -243,7 +203,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_chatType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 170f0a41c8..d85d56251c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /** diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java index ac7310cb22..fd55d892db 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java @@ -91,8 +91,7 @@ public class PolymorphingOnAttack extends AbstractNpcAI if (tmp.get(3) >= 0) { final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)]; - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString)); - + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npcString)); } npc.deleteMe(); final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Race/Race.java index d9281f6064..cbbde12cd2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Race/Race.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/custom/events/Race/Race.java @@ -380,7 +380,7 @@ public class Race extends Event private void sendMessage(PlayerInstance player, String text) { - player.sendPacket(new CreatureSay(_npc.getObjectId(), ChatType.MPCC_ROOM, _npc.getName(), text)); + player.sendPacket(new CreatureSay(_npc, ChatType.MPCC_ROOM, _npc.getName(), text)); } private void showMenu(PlayerInstance player) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java index 2d8dd0fa86..28591234bd 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java @@ -625,7 +625,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -633,7 +633,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -641,7 +641,7 @@ public class MerrySquashmas extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java index f678537c08..e473b18636 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/SquashEvent/SquashEvent.java @@ -624,7 +624,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -632,7 +632,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -640,7 +640,7 @@ public class SquashEvent extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java index 189679a088..3eec283c75 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java @@ -612,7 +612,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _CHRONO_TEXT[Rnd.get(_CHRONO_TEXT.length)])); } } @@ -620,7 +620,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 20) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NOCHRONO_TEXT[Rnd.get(_NOCHRONO_TEXT.length)])); } } @@ -628,7 +628,7 @@ public class WatermelonNinja extends LongTimeEvent { if (Rnd.get(100) < 30) { - npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); + npc.broadcastPacket(new CreatureSay(npc, ChatType.NPC_GENERAL, npc.getName(), _NECTAR_TEXT[Rnd.get(_NECTAR_TEXT.length)])); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 7412ceb4ce..648dcabe7f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -296,7 +296,7 @@ public class AdminAdmin implements IAdminCommandHandler sb.append(" "); } - final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, sb.toString()); + final CreatureSay cs = new CreatureSay(activeChar, ChatType.WORLD, activeChar.getName(), sb.toString()); World.getInstance().getPlayers().stream().filter(activeChar::isNotBlocked).forEach(cs::sendTo); break; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java index 387920149b..0227946964 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGmChat.java @@ -113,7 +113,7 @@ public class AdminGmChat implements IAdminCommandHandler offset = 13; } text = command.substring(offset); - final CreatureSay cs = new CreatureSay(0, ChatType.ALLIANCE, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(null, ChatType.ALLIANCE, activeChar.getName(), text); AdminData.getInstance().broadcastToGMs(cs); } catch (StringIndexOutOfBoundsException e) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java index 0267429bc4..1d1f54958a 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminTargetSay.java @@ -53,7 +53,7 @@ public class AdminTargetSay implements IAdminCommandHandler final String message = command.substring(16); final Creature target = (Creature) obj; - target.broadcastPacket(new CreatureSay(target.getObjectId(), target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); + target.broadcastPacket(new CreatureSay(target, target.isPlayer() ? ChatType.GENERAL : ChatType.NPC_GENERAL, target.getName(), message)); } catch (StringIndexOutOfBoundsException e) { diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java index f20bb9c950..ff3b82a10f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java @@ -124,7 +124,7 @@ public class FindPvP implements IBypassHandler if (biggestAllyId == allyId) { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, your clan/ally is outnumbering the place already so you can't move there.")); return true; } } @@ -139,7 +139,7 @@ public class FindPvP implements IBypassHandler } else { - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, target.getName(), "Sorry, I can't find anyone in flag status right now.")); } return false; } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java index fcc2c5df98..fbf99259a4 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatAlliance.java @@ -53,7 +53,7 @@ public class ChatAlliance implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text)); + activeChar.getClan().broadcastToOnlineAllyMembers(new CreatureSay(activeChar, type, activeChar.getName(), text)); } @Override diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatClan.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatClan.java index a57206cca5..611fa8d584 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatClan.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatClan.java @@ -54,7 +54,7 @@ public class ChatClan implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getClan().broadcastCSToOnlineMembers(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index 34073e66cf..9c8769d1a0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -87,8 +87,8 @@ public class ChatGeneral implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), text); - final CreatureSay csRandom = new CreatureSay(activeChar.getObjectId(), type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), text); + final CreatureSay csRandom = new CreatureSay(activeChar, type, activeChar.getAppearance().getVisibleName(), ChatRandomizer.randomize(text)); World.getInstance().forEachVisibleObjectInRange(activeChar, PlayerInstance.class, 1250, player -> { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java index 0af8f6ed9e..7aa68e7ac8 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatHeroVoice.java @@ -62,7 +62,7 @@ public class ChatHeroVoice implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance player : World.getInstance().getPlayers()) { if ((player != null) && !BlockList.isBlocked(player, activeChar)) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatParty.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatParty.java index 3240459f0c..ca46bd2b9e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatParty.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatParty.java @@ -54,7 +54,7 @@ public class ChatParty implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } @Override diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 63d91115f7..bd745507c1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -53,7 +53,7 @@ public class ChatPartyMatchRoom implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); for (PlayerInstance _member : room.getMembers()) { if (Config.FACTION_SYSTEM_ENABLED) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java index 548f97f47f..aa5b0d1550 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomAll.java @@ -50,7 +50,7 @@ public class ChatPartyRoomAll implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java index 11c0bad380..39787eeb42 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatPartyRoomCommander.java @@ -50,7 +50,7 @@ public class ChatPartyRoomCommander implements IChatHandler activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED); return; } - activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text), activeChar); + activeChar.getParty().getCommandChannel().broadcastCreatureSay(new CreatureSay(activeChar, type, activeChar.getName(), text), activeChar); } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index 4b8ca31da6..0ae18b29f2 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -58,7 +58,7 @@ public class ChatShout implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_GLOBAL_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java index d5e10fb412..3491fc1a9b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatTrade.java @@ -58,7 +58,7 @@ public class ChatTrade implements IChatHandler return; } - final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("on") || (Config.DEFAULT_TRADE_CHAT.equalsIgnoreCase("gm") && activeChar.canOverrideCond(PlayerCondOverride.CHAT_CONDITIONS))) { final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java index 22b8f071fe..7198d826ab 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/chathandlers/ChatWorld.java @@ -93,7 +93,7 @@ public class ChatWorld implements IChatHandler } } - final CreatureSay cs = new CreatureSay(activeChar, type, text); + final CreatureSay cs = new CreatureSay(activeChar, type, activeChar.getName(), text); if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_SPECIFIC_CHAT) { if (activeChar.isGood()) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java index 575289bb75..7f3566d72f 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/chat/GMChat.java @@ -52,7 +52,7 @@ public class GMChat implements ITelnetCommand { sb.append(str + " "); } - AdminData.getInstance().broadcastToGMs(new CreatureSay(0, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); + AdminData.getInstance().broadcastToGMs(new CreatureSay(null, ChatType.ALLIANCE, "Telnet GM Broadcast", sb.toString())); return "GMChat sent!"; } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java index 9453f39036..79d064e70e 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/telnethandlers/chat/Msg.java @@ -56,7 +56,7 @@ public class Msg implements ITelnetCommand { sb.append(args[i] + " "); } - player.sendPacket(new CreatureSay(0, ChatType.WHISPER, "Telnet Priv", sb.toString())); + player.sendPacket(new CreatureSay(null, ChatType.WHISPER, "Telnet Priv", sb.toString())); return "Announcement sent!"; } return "Couldn't find player with such name."; diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatGiranTalking.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatGiranTalking.java index a0f8f29097..fc5dbeb111 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatGiranTalking.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatGiranTalking.java @@ -124,29 +124,29 @@ public class BoatGiranTalking implements Runnable { _boat = boat; - ARRIVED_AT_GIRAN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GIRAN_HARBOR); - ARRIVED_AT_GIRAN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GIRAN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); - LEAVE_GIRAN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); - LEAVE_GIRAN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); - LEAVING_GIRAN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); - ARRIVED_AT_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); - ARRIVED_AT_TALKING_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_FIVE_MINUTES); - LEAVE_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_ONE_MINUTE); - LEAVE_TALKING0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GIRAN_HARBOR); - LEAVING_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GIRAN_HARBOR); - BUSY_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); + ARRIVED_AT_GIRAN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GIRAN_HARBOR); + ARRIVED_AT_GIRAN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GIRAN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); + LEAVE_GIRAN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); + LEAVE_GIRAN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); + LEAVING_GIRAN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); + ARRIVED_AT_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); + ARRIVED_AT_TALKING_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_FIVE_MINUTES); + LEAVE_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GIRAN_HARBOR_IN_ONE_MINUTE); + LEAVE_TALKING0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GIRAN_HARBOR); + LEAVING_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GIRAN_HARBOR); + BUSY_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); - ARRIVAL_TALKING15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_TALKING10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_GIRAN20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL_GIRAN15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL_GIRAN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GIRAN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GIRAN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_TALKING15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_TALKING10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GIRAN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GIRAN20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL_GIRAN15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL_GIRAN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GIRAN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GIRAN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GIRAN_HARBOR_IN_APPROXIMATELY_1_MINUTE); GIRAN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GIRAN_DOCK.getX(), GIRAN_DOCK.getY(), GIRAN_DOCK.getZ()); TALKING_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), TALKING_DOCK[0].getX(), TALKING_DOCK[0].getY(), TALKING_DOCK[0].getZ()); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index d1aa5ebdd3..1726f5e7fa 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -94,17 +94,17 @@ public class BoatInnadrilTour implements Runnable { _boat = boat; - ARRIVED_AT_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); - LEAVE_INNADRIL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); - LEAVE_INNADRIL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); - LEAVE_INNADRIL0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); - LEAVING_INNADRIL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); + ARRIVED_AT_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_HAS_ARRIVED_IT_WILL_ANCHOR_FOR_TEN_MINUTES); + LEAVE_INNADRIL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_FIVE_MINUTES); + LEAVE_INNADRIL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_LEAVE_IN_ONE_MINUTE); + LEAVE_INNADRIL0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_BE_LEAVING_SOON); + LEAVING_INNADRIL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_IS_LEAVING); - ARRIVAL20 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); - ARRIVAL15 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); - ARRIVAL10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL20 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_20_MINUTES); + ARRIVAL15 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_15_MINUTES); + ARRIVAL10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_INNADRIL_PLEASURE_BOAT_WILL_ARRIVE_IN_APPROXIMATELY_1_MINUTE); INNADRIL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), DOCK.getX(), DOCK.getY(), DOCK.getZ()); } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index b71c8722f9..fadac432d0 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -90,13 +90,13 @@ public class BoatRunePrimeval implements Runnable { _boat = boat; - ARRIVED_AT_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); - ARRIVED_AT_RUNE_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); - ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); - LEAVING_PRIMEVAL = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); - BUSY_RUNE = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.WELCOME_TO_RUNE_HARBOR); + ARRIVED_AT_RUNE_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_PRIMEVAL_ISLE_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_RUNE_HARBOR_FOR_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_PRIMEVAL_ISLE); + ARRIVED_AT_PRIMEVAL_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_RUNE_HARBOR_AFTER_ANCHORING_FOR_THREE_MINUTES); + LEAVING_PRIMEVAL = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_NOW_DEPARTING_PRIMEVAL_ISLE_FOR_RUNE_HARBOR); + BUSY_RUNE = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_PRIMEVAL_ISLE_TO_RUNE_HARBOR_HAS_BEEN_DELAYED); RUNE_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), RUNE_DOCK[0].getX(), RUNE_DOCK[0].getY(), RUNE_DOCK[0].getZ()); PRIMEVAL_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), PRIMEVAL_DOCK.getX(), PRIMEVAL_DOCK.getY(), PRIMEVAL_DOCK.getZ()); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatTalkingGludin.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatTalkingGludin.java index a41864766c..b9f6af8722 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatTalkingGludin.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/vehicles/BoatTalkingGludin.java @@ -109,28 +109,28 @@ public class BoatTalkingGludin implements Runnable _boat = boat; _cycle = 0; - ARRIVED_AT_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); - ARRIVED_AT_TALKING_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_FIVE_MINUTES); - LEAVE_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_ONE_MINUTE); - LEAVE_TALKING1_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THOSE_WISHING_TO_RIDE_THE_FERRY_SHOULD_MAKE_HASTE_TO_GET_ON); - LEAVE_TALKING0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GLUDIN_HARBOR); - LEAVING_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); - ARRIVED_AT_GLUDIN_2 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); - LEAVE_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); - LEAVE_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); - LEAVE_GLUDIN0 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); - LEAVING_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); - BUSY_TALKING = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); - BUSY_GLUDIN = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); + ARRIVED_AT_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_TALKING_ISLAND_HARBOR); + ARRIVED_AT_TALKING_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_FIVE_MINUTES); + LEAVE_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_GLUDIN_HARBOR_IN_ONE_MINUTE); + LEAVE_TALKING1_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THOSE_WISHING_TO_RIDE_THE_FERRY_SHOULD_MAKE_HASTE_TO_GET_ON); + LEAVE_TALKING0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_GLUDIN_HARBOR); + LEAVING_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_HAS_ARRIVED_AT_GLUDIN_HARBOR); + ARRIVED_AT_GLUDIN_2 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_AFTER_ANCHORING_FOR_TEN_MINUTES); + LEAVE_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_FIVE_MINUTES); + LEAVE_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_LEAVE_FOR_TALKING_ISLAND_HARBOR_IN_ONE_MINUTE); + LEAVE_GLUDIN0 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_WILL_BE_LEAVING_SOON_FOR_TALKING_ISLAND_HARBOR); + LEAVING_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_IS_LEAVING_FOR_TALKING_ISLAND_HARBOR); + BUSY_TALKING = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_TO_TALKING_ISLAND_HAS_BEEN_DELAYED); + BUSY_GLUDIN = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_TO_GLUDIN_HARBOR_HAS_BEEN_DELAYED); - ARRIVAL_GLUDIN10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_ARRIVE_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_GLUDIN5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_GLUDIN1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); - ARRIVAL_TALKING10 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); - ARRIVAL_TALKING5 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); - ARRIVAL_TALKING1 = new CreatureSay(0, ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_GLUDIN10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_ARRIVE_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_GLUDIN5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_GLUDIN1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_TALKING_ISLAND_WILL_BE_ARRIVING_AT_GLUDIN_HARBOR_IN_APPROXIMATELY_1_MINUTE); + ARRIVAL_TALKING10 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_10_MINUTES); + ARRIVAL_TALKING5 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_5_MINUTES); + ARRIVAL_TALKING1 = new CreatureSay(ChatType.BOAT, 801, SystemMessageId.THE_FERRY_FROM_GLUDIN_HARBOR_WILL_BE_ARRIVING_AT_TALKING_ISLAND_IN_APPROXIMATELY_1_MINUTE); TALKING_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), TALKING_DOCK[0].getX(), TALKING_DOCK[0].getY(), TALKING_DOCK[0].getZ()); GLUDIN_SOUND = new PlaySound(0, "itemsound.ship_arrival_departure", 1, _boat.getObjectId(), GLUDIN_DOCK[0].getX(), GLUDIN_DOCK[0].getY(), GLUDIN_DOCK[0].getZ()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java index 207c543ffd..47b4f64ac3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/sql/impl/AnnouncementsTable.java @@ -110,9 +110,7 @@ public class AnnouncementsTable { if (announce.isValid() && (announce.getType() == type)) { - player.sendPacket(new CreatureSay(0, // - type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, // - player.getName(), announce.getContent())); + player.sendPacket(new CreatureSay(null, type == AnnouncementType.CRITICAL ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, player.getName(), announce.getContent())); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java index aacdca4387..3dd4e3f652 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/FakePlayerChatManager.java @@ -179,7 +179,7 @@ public class FakePlayerChatManager implements IXmlReader final Npc npc = spawn.getLastSpawn(); if (npc != null) { - player.sendPacket(new CreatureSay(npc, fpcName, ChatType.WHISPER, message)); + player.sendPacket(new CreatureSay(npc, ChatType.WHISPER, fpcName, message)); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java index ee194e93fd..1af1ae9f82 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/instancemanager/PetitionManager.java @@ -339,7 +339,7 @@ public class PetitionManager if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_PLAYER, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_PLAYER, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -349,7 +349,7 @@ public class PetitionManager if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) { - cs = new CreatureSay(player.getObjectId(), ChatType.PETITION_GM, player.getName(), messageText); + cs = new CreatureSay(player, ChatType.PETITION_GM, player.getName(), messageText); currPetition.addLogMessage(cs); currPetition.sendResponderPacket(cs); @@ -423,7 +423,7 @@ public class PetitionManager // Notify all GMs that a new petition has been submitted. final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ")."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner, ChatType.HERO_VOICE, "Petition System", msgContent)); return newPetitionId; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9e59129b20..aeb0433887 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -222,7 +222,7 @@ public class Attackable extends Npc _commandChannelTimer = new CommandChannelTimer(this); _commandChannelLastAttack = System.currentTimeMillis(); ThreadPool.schedule(_commandChannelTimer, 10000); // check for last attack - _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg + _firstCommandChannelAttacked.broadcastPacket(new CreatureSay(null, ChatType.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java index d3148de7b6..1baddbeefd 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java @@ -185,7 +185,7 @@ public abstract class VoteSystem implements Runnable private void announce(String msg) { - final CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg); + final CreatureSay cs = new CreatureSay(null, ChatType.CRITICAL_ANNOUNCE, "", msg); Broadcast.toAllOnlinePlayers(cs); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 2e915a1aa8..a148a514b3 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -464,7 +464,7 @@ public class EnterWorld implements IClientIncomingPacket if ((Config.SERVER_RESTART_SCHEDULE_ENABLED) && (Config.SERVER_RESTART_SCHEDULE_MESSAGE)) { - player.sendPacket(new CreatureSay(2, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); + player.sendPacket(new CreatureSay(null, ChatType.BATTLEFIELD, "[SERVER]", "Next restart is scheduled at " + ServerRestartManager.getInstance().getNextRestartTime() + ".")); } if (showClanNotice) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java index 14ffae4935..e0dee2feea 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestPetitionCancel.java @@ -80,7 +80,7 @@ public class RequestPetitionCancel implements IClientIncomingPacket // Notify all GMs that the player's pending petition has been cancelled. final String msgContent = player.getName() + " has canceled a pending petition."; - AdminData.getInstance().broadcastToGMs(new CreatureSay(player.getObjectId(), ChatType.HERO_VOICE, "Petition System", msgContent)); + AdminData.getInstance().broadcastToGMs(new CreatureSay(player, ChatType.HERO_VOICE, "Petition System", msgContent)); } else { 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 794c554426..ea16b5f7cc 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 @@ -22,7 +22,7 @@ import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.enums.ChatType; import org.l2jmobius.gameserver.instancemanager.MentorManager; -import org.l2jmobius.gameserver.model.actor.Npc; +import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.OutgoingPackets; @@ -30,30 +30,29 @@ import org.l2jmobius.gameserver.network.SystemMessageId; public class CreatureSay implements IClientOutgoingPacket { - private final int _objectId; - private final ChatType _textType; - private String _charName = null; - private int _charId = 0; + private final Creature _sender; + private final ChatType _chatType; + private String _senderName = null; private String _text = null; - private int _npcString = -1; + private int _charId = 0; + private int _messageId = -1; private int _mask; - private int _charLevel = -1; private List _parameters; /** * @param sender * @param receiver * @param name - * @param messageType + * @param chatType * @param text */ - public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType messageType, String text) + public CreatureSay(PlayerInstance sender, PlayerInstance receiver, String name, ChatType chatType, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _senderName = name; + _chatType = chatType; _text = text; + if (receiver != null) { if (receiver.getFriendList().contains(sender.getObjectId())) @@ -81,66 +80,27 @@ public class CreatureSay implements IClientOutgoingPacket } } - /** - * Used by fake players. - * @param sender - * @param name - * @param messageType - * @param text - */ - public CreatureSay(Npc sender, String name, ChatType messageType, String text) + public CreatureSay(Creature sender, ChatType chatType, String senderName, String text) { - _objectId = sender.getObjectId(); - _charName = name; - _charLevel = sender.getLevel(); - _textType = messageType; + _sender = sender; + _chatType = chatType; + _senderName = senderName; _text = text; } - /** - * @param objectId - * @param messageType - * @param charName - * @param text - */ - public CreatureSay(int objectId, ChatType messageType, String charName, String text) + public CreatureSay(Creature sender, ChatType chatType, NpcStringId npcStringId) { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _text = text; + _sender = sender; + _chatType = chatType; + _messageId = npcStringId.getId(); } - public CreatureSay(PlayerInstance player, ChatType messageType, String text) + public CreatureSay(ChatType chatType, int charId, SystemMessageId systemMessageId) { - _objectId = player.getObjectId(); - _textType = messageType; - _charName = player.getAppearance().getVisibleName(); - _text = text; - } - - public CreatureSay(int objectId, ChatType messageType, int charId, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; + _sender = null; + _chatType = chatType; _charId = charId; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, String charName, NpcStringId npcString) - { - _objectId = objectId; - _textType = messageType; - _charName = charName; - _npcString = npcString.getId(); - } - - public CreatureSay(int objectId, ChatType messageType, int charId, SystemMessageId sysString) - { - _objectId = objectId; - _textType = messageType; - _charId = charId; - _npcString = sysString.getId(); + _messageId = systemMessageId.getId(); } /** @@ -161,26 +121,26 @@ public class CreatureSay implements IClientOutgoingPacket { OutgoingPackets.SAY2.writeId(packet); - packet.writeD(_objectId); - packet.writeD(_textType.getClientId()); - if (_charName != null) + packet.writeD(_sender == null ? 0 : _sender.getObjectId()); + packet.writeD(_chatType.getClientId()); + if (_senderName != null) { - packet.writeS(_charName); + packet.writeS(_senderName); } else { packet.writeD(_charId); } - packet.writeD(_npcString); // High Five NPCString ID + packet.writeD(_messageId); // High Five NPCString ID if (_text != null) { packet.writeS(_text); - if ((_charLevel > 0) && (_textType == ChatType.WHISPER)) + if ((_sender != null) && (_sender.isPlayer() || _sender.isFakePlayer()) && (_chatType == ChatType.WHISPER)) { packet.writeC(_mask); if ((_mask & 0x10) == 0) { - packet.writeC(_charLevel); + packet.writeC(_sender.getLevel()); } } } @@ -199,7 +159,7 @@ public class CreatureSay implements IClientOutgoingPacket { if (player != null) { - player.broadcastSnoop(_textType, _charName, _text); + player.broadcastSnoop(_chatType, _senderName, _text); } } } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java index 9f578fceb1..60eb0ff361 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/Broadcast.java @@ -184,7 +184,7 @@ public class Broadcast public static void toAllOnlinePlayers(String text, boolean isCritical) { - toAllOnlinePlayers(new CreatureSay(0, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); + toAllOnlinePlayers(new CreatureSay(null, isCritical ? ChatType.CRITICAL_ANNOUNCE : ChatType.ANNOUNCEMENT, "", text)); } public static void toAllOnlinePlayersOnScreen(String text) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java index 170f0a41c8..d85d56251c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java @@ -41,7 +41,7 @@ public class BuilderUtil { if (Config.GM_STARTUP_BUILDER_HIDE) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message)); } else { @@ -56,7 +56,7 @@ public class BuilderUtil */ public static void sendHtmlMessage(PlayerInstance player, String message) { - player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "HTML", message)); + player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "HTML", message)); } /**