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

Core/Social: Implemented account ignores

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/f40c0dfd5588798115bfa61236be1804a32ba24f)
This commit is contained in:
hondacrx
2021-11-07 16:17:06 -05:00
parent f2e56ccb41
commit ff51a1521e
8 changed files with 90 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Channels/Channel.cs
+10 -7
View File
@@ -658,7 +658,8 @@ namespace Game.Chat
return;
}
SendToAll(new ChannelSayBuilder(this, lang, what, guid, _channelGuid), !playerInfo.IsModerator() ? guid : ObjectGuid.Empty);
Player player = Global.ObjAccessor.FindConnectedPlayer(guid);
SendToAll(new ChannelSayBuilder(this, lang, what, guid, _channelGuid), !playerInfo.IsModerator() ? guid : ObjectGuid.Empty, !playerInfo.IsModerator() && player ? player.GetSession().GetAccountGUID() : ObjectGuid.Empty);
}
public void AddonSay(ObjectGuid guid, string prefix, string what, bool isLogged)
@@ -683,7 +684,9 @@ namespace Game.Chat
return;
}
SendToAllWithAddon(new ChannelWhisperBuilder(this, isLogged ? Language.AddonLogged : Language.Addon, what, prefix, guid), prefix, !playerInfo.IsModerator() ? guid : ObjectGuid.Empty);
Player player = Global.ObjAccessor.FindConnectedPlayer(guid);
SendToAllWithAddon(new ChannelWhisperBuilder(this, isLogged ? Language.AddonLogged : Language.Addon, what, prefix, guid), prefix, !playerInfo.IsModerator() ? guid : ObjectGuid.Empty,
!playerInfo.IsModerator() && player ? player.GetSession().GetAccountGUID() : ObjectGuid.Empty);
}
public void Invite(Player player, string newname)
@@ -728,7 +731,7 @@ namespace Game.Chat
return;
}
if (!newp.GetSocial().HasIgnore(guid))
if (!newp.GetSocial().HasIgnore(guid, player.GetSession().GetAccountGUID()))
{
ChannelNameBuilder builder = new(this, new InviteAppend(guid));
SendToOne(builder, newp.GetGUID());
@@ -832,7 +835,7 @@ namespace Game.Chat
}
}
void SendToAll(MessageBuilder builder, ObjectGuid guid = default)
void SendToAll(MessageBuilder builder, ObjectGuid guid = default, ObjectGuid accountGuid = default)
{
LocalizedDo localizer = new(builder);
@@ -840,7 +843,7 @@ namespace Game.Chat
{
Player player = Global.ObjAccessor.FindConnectedPlayer(pair.Key);
if (player)
if (guid.IsEmpty() || !player.GetSocial().HasIgnore(guid))
if (guid.IsEmpty() || !player.GetSocial().HasIgnore(guid, accountGuid))
localizer.Invoke(player);
}
}
@@ -869,7 +872,7 @@ namespace Game.Chat
localizer.Invoke(player);
}
void SendToAllWithAddon(MessageBuilder builder, string addonPrefix, ObjectGuid guid = default)
void SendToAllWithAddon(MessageBuilder builder, string addonPrefix, ObjectGuid guid = default, ObjectGuid accountGuid = default)
{
LocalizedDo localizer = new(builder);
@@ -877,7 +880,7 @@ namespace Game.Chat
{
Player player = Global.ObjAccessor.FindConnectedPlayer(pair.Key);
if (player)
if (player.GetSession().IsAddonRegistered(addonPrefix) && (guid.IsEmpty() || !player.GetSocial().HasIgnore(guid)))
if (player.GetSession().IsAddonRegistered(addonPrefix) && (guid.IsEmpty() || !player.GetSocial().HasIgnore(guid, accountGuid)))
localizer.Invoke(player);
}
}