Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BFA Update (still lots of testing to do tho)

Browse Source
This commit is contained in:
hondacrx
2018-12-10 12:46:25 -05:00
parent 468b053946
commit 8e20114e10
256 changed files with 35613 additions and 10459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/ChatHandler.cs
+9 -42
View File
@@ -330,7 +330,7 @@ namespace Game
case ChatMsg.RaidWarning:
{
Group group = GetPlayer().GetGroup();
if (!group || !group.isRaidGroup() || !(group.IsLeader(GetPlayer().GetGUID()) || group.IsAssistant(GetPlayer().GetGUID())) || group.isBGGroup())
if (!group || !(group.isRaidGroup() || WorldConfig.GetBoolValue(WorldCfg.ChatPartyRaidWarnings)) || !(group.IsLeader(GetPlayer().GetGUID()) || group.IsAssistant(GetPlayer().GetGUID())) || group.isBGGroup())
return;
Global.ScriptMgr.OnPlayerChat(GetPlayer(), type, lang, msg, group);
@@ -379,50 +379,17 @@ namespace Game
}
}
[WorldPacketHandler(ClientOpcodes.ChatAddonMessageGuild)]
[WorldPacketHandler(ClientOpcodes.ChatAddonMessageOfficer)]
[WorldPacketHandler(ClientOpcodes.ChatAddonMessageParty)]
[WorldPacketHandler(ClientOpcodes.ChatAddonMessageRaid)]
[WorldPacketHandler(ClientOpcodes.ChatAddonMessageInstanceChat)]
void HandleChatAddonMessage(ChatAddonMessage packet)
[WorldPacketHandler(ClientOpcodes.ChatAddonMessage)]
[WorldPacketHandler(ClientOpcodes.ChatAddonMessageTargeted)]
void HandleChatAddonMessage(ChatAddonMessage chatAddonMessage)
{
ChatMsg type;
switch (packet.GetOpcode())
{
case ClientOpcodes.ChatAddonMessageGuild:
type = ChatMsg.Guild;
break;
case ClientOpcodes.ChatAddonMessageOfficer:
type = ChatMsg.Officer;
break;
case ClientOpcodes.ChatAddonMessageParty:
type = ChatMsg.Party;
break;
case ClientOpcodes.ChatAddonMessageRaid:
type = ChatMsg.Raid;
break;
case ClientOpcodes.ChatAddonMessageInstanceChat:
type = ChatMsg.InstanceChat;
break;
default:
Log.outError(LogFilter.Network, "HandleChatAddonMessage: Unknown addon chat opcode ({0})", packet.GetOpcode());
return;
}
HandleChatAddon(type, packet.Prefix, packet.Text);
HandleChatAddon(chatAddonMessage.Params.Type, chatAddonMessage.Params.Prefix, chatAddonMessage.Params.Text);
}
[WorldPacketHandler(ClientOpcodes.ChatAddonMessageWhisper)]
void HandleChatAddonMessageWhisper(ChatAddonMessageWhisper packet)
[WorldPacketHandler(ClientOpcodes.ChatAddonMessageTargeted)]
void HandleChatAddonMessageTargeted(ChatAddonMessageTargeted chatAddonMessageTargeted)
{
HandleChatAddon(ChatMsg.Whisper, packet.Prefix, packet.Text, packet.Target);
}
[WorldPacketHandler(ClientOpcodes.ChatAddonMessageChannel)]
void HandleChatAddonMessageChannel(ChatAddonMessageChannel chatAddonMessageChannel)
{
HandleChatAddon(ChatMsg.Channel, chatAddonMessageChannel.Prefix, chatAddonMessageChannel.Text, chatAddonMessageChannel.Target);
HandleChatAddon(chatAddonMessageTargeted.Params.Type, chatAddonMessageTargeted.Params.Prefix, chatAddonMessageTargeted.Params.Text, chatAddonMessageTargeted.Target);
}
void HandleChatAddon(ChatMsg type, string prefix, string text, string target = "")
@@ -595,7 +562,7 @@ namespace Game
if (em == null)
return;
uint emote_anim = em.EmoteID;
uint emote_anim = em.EmoteId;
switch ((Emote)emote_anim)
{