aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Handlers')
-rw-r--r--src/server/game/Handlers/CalendarHandler.cpp4
-rw-r--r--src/server/game/Handlers/ChannelHandler.cpp6
-rw-r--r--src/server/game/Handlers/CharacterHandler.cpp10
-rw-r--r--src/server/game/Handlers/ChatHandler.cpp35
-rw-r--r--src/server/game/Handlers/MiscHandler.cpp6
5 files changed, 5 insertions, 56 deletions
diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp
index bf9ddd12b7b..887bc6b4742 100644
--- a/src/server/game/Handlers/CalendarHandler.cpp
+++ b/src/server/game/Handlers/CalendarHandler.cpp
@@ -124,10 +124,10 @@ void WorldSession::HandleCalendarGetEvent(WorldPackets::Calendar::CalendarGetEve
sCalendarMgr->SendCalendarCommandResult(_player->GetGUID(), CALENDAR_ERROR_EVENT_INVALID);
}
-void WorldSession::HandleCalendarGuildFilter(WorldPackets::Calendar::CalendarGuildFilter& calendarGuildFilter)
+void WorldSession::HandleCalendarCommunityFilter(WorldPackets::Calendar::CalendarCommunityFilter& calendarCommunityFilter)
{
if (Guild* guild = sGuildMgr->GetGuildById(_player->GetGuildId()))
- guild->MassInviteToEvent(this, calendarGuildFilter.MinLevel, calendarGuildFilter.MaxLevel, calendarGuildFilter.MaxRankOrder);
+ guild->MassInviteToEvent(this, calendarCommunityFilter.MinLevel, calendarCommunityFilter.MaxLevel, calendarCommunityFilter.MaxRankOrder);
}
void WorldSession::HandleCalendarAddEvent(WorldPackets::Calendar::CalendarAddEvent& calendarAddEvent)
diff --git a/src/server/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp
index 90e6150a284..529bfb50fdc 100644
--- a/src/server/game/Handlers/ChannelHandler.cpp
+++ b/src/server/game/Handlers/ChannelHandler.cpp
@@ -146,9 +146,6 @@ void WorldSession::HandleChannelPlayerCommand(WorldPackets::Channel::ChannelPlay
case CMSG_CHAT_CHANNEL_MODERATOR:
channel->SetModerator(GetPlayer(), packet.Name);
break;
- case CMSG_CHAT_CHANNEL_MUTE:
- channel->SetMute(GetPlayer(), packet.Name);
- break;
case CMSG_CHAT_CHANNEL_SET_OWNER:
channel->SetOwner(GetPlayer(), packet.Name);
break;
@@ -161,9 +158,6 @@ void WorldSession::HandleChannelPlayerCommand(WorldPackets::Channel::ChannelPlay
case CMSG_CHAT_CHANNEL_UNMODERATOR:
channel->UnsetModerator(GetPlayer(), packet.Name);
break;
- case CMSG_CHAT_CHANNEL_UNMUTE:
- channel->UnsetMute(GetPlayer(), packet.Name);
- break;
case CMSG_CHAT_CHANNEL_UNSILENCE_ALL:
channel->UnsilenceAll(GetPlayer(), packet.Name);
break;
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index 9de1bcf3f98..1fc6af5ea00 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -972,16 +972,6 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
WorldPackets::BattlePet::BattlePetJournalLockAcquired lock;
SendPacket(lock.Write());
- WorldPackets::Artifact::ArtifactKnowledge artifactKnowledge;
- artifactKnowledge.ArtifactCategoryID = ARTIFACT_CATEGORY_PRIMARY;
- artifactKnowledge.KnowledgeLevel = sWorld->getIntConfig(CONFIG_CURRENCY_START_ARTIFACT_KNOWLEDGE);
- SendPacket(artifactKnowledge.Write());
-
- WorldPackets::Artifact::ArtifactKnowledge artifactKnowledgeFishingPole;
- artifactKnowledgeFishingPole.ArtifactCategoryID = ARTIFACT_CATEGORY_FISHING;
- artifactKnowledgeFishingPole.KnowledgeLevel = 0;
- SendPacket(artifactKnowledgeFishingPole.Write());
-
pCurrChar->SendInitialPacketsBeforeAddToMap();
//Show cinematic at the first time that player login
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
index bf724ae21ff..cfafcb5427b 100644
--- a/src/server/game/Handlers/ChatHandler.cpp
+++ b/src/server/game/Handlers/ChatHandler.cpp
@@ -413,41 +413,12 @@ void WorldSession::HandleChatMessage(ChatMsg type, uint32 lang, std::string msg,
void WorldSession::HandleChatAddonMessageOpcode(WorldPackets::Chat::ChatAddonMessage& chatAddonMessage)
{
- ChatMsg type;
-
- switch (chatAddonMessage.GetOpcode())
- {
- case CMSG_CHAT_ADDON_MESSAGE_GUILD:
- type = CHAT_MSG_GUILD;
- break;
- case CMSG_CHAT_ADDON_MESSAGE_OFFICER:
- type = CHAT_MSG_OFFICER;
- break;
- case CMSG_CHAT_ADDON_MESSAGE_PARTY:
- type = CHAT_MSG_PARTY;
- break;
- case CMSG_CHAT_ADDON_MESSAGE_RAID:
- type = CHAT_MSG_RAID;
- break;
- case CMSG_CHAT_ADDON_MESSAGE_INSTANCE_CHAT:
- type = CHAT_MSG_INSTANCE_CHAT;
- break;
- default:
- TC_LOG_ERROR("network", "HandleChatAddonMessageOpcode: Unknown addon chat opcode (%u)", chatAddonMessage.GetOpcode());
- return;
- }
-
- HandleChatAddonMessage(type, chatAddonMessage.Prefix, chatAddonMessage.Text);
-}
-
-void WorldSession::HandleChatAddonMessageWhisperOpcode(WorldPackets::Chat::ChatAddonMessageWhisper& chatAddonMessageWhisper)
-{
- HandleChatAddonMessage(CHAT_MSG_WHISPER, chatAddonMessageWhisper.Prefix, chatAddonMessageWhisper.Text, chatAddonMessageWhisper.Target);
+ HandleChatAddonMessage(chatAddonMessage.Params.Type, chatAddonMessage.Params.Prefix, chatAddonMessage.Params.Text);
}
-void WorldSession::HandleChatAddonMessageChannelOpcode(WorldPackets::Chat::ChatAddonMessageChannel& chatAddonMessageChannel)
+void WorldSession::HandleChatAddonMessageTargetedOpcode(WorldPackets::Chat::ChatAddonMessageTargeted& chatAddonMessageTargeted)
{
- HandleChatAddonMessage(CHAT_MSG_CHANNEL, chatAddonMessageChannel.Prefix, chatAddonMessageChannel.Text, chatAddonMessageChannel.Target);
+ HandleChatAddonMessage(chatAddonMessageTargeted.Params.Type, chatAddonMessageTargeted.Params.Prefix, chatAddonMessageTargeted.Params.Text, chatAddonMessageTargeted.Target);
}
void WorldSession::HandleChatAddonMessage(ChatMsg type, std::string prefix, std::string text, std::string target /*= ""*/)
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 296cd80e323..20081bd36bf 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -1152,12 +1152,6 @@ void WorldSession::HandleMountSetFavorite(WorldPackets::Misc::MountSetFavorite&
_collectionMgr->MountSetFavorite(mountSetFavorite.MountSpellID, mountSetFavorite.IsFavorite);
}
-void WorldSession::HandlePvpPrestigeRankUp(WorldPackets::Misc::PvpPrestigeRankUp& /*pvpPrestigeRankUp*/)
-{
- if (_player->CanPrestige())
- _player->Prestige();
-}
-
void WorldSession::HandleCloseInteraction(WorldPackets::Misc::CloseInteraction& closeInteraction)
{
if (_player->PlayerTalkClass->GetInteractionData().SourceGuid == closeInteraction.SourceGuid)