@@ -1763,25 +1763,18 @@ function CH:ChatFrame_ReplaceIconAndGroupExpressions(message, noIconReplacement,
1763
1763
end
1764
1764
1765
1765
-- copied from ChatFrame.lua
1766
- local function GetPFlag (arg1 , arg2 , arg3 , arg4 , arg5 , arg6 , arg7 , arg8 , arg9 , arg10 , arg11 , arg12 , arg13 , arg14 , arg15 , arg16 , arg17 )
1767
- -- Renaming for clarity:
1768
- local specialFlag = arg6
1769
- local zoneChannelID = arg7
1770
- -- local localChannelID = arg8
1771
-
1766
+ local function GetPFlag (specialFlag , zoneChannelID , localChannelID )
1772
1767
if specialFlag ~= ' ' then
1773
1768
if specialFlag == ' GM' or specialFlag == ' DEV' then
1774
1769
-- Add Blizzard Icon if this was sent by a GM/DEV
1775
1770
return [[ |TInterface\ChatFrame\UI-ChatIcon-Blizz:12:20:0:0:32:16:4:28:0:16|t ]]
1776
- elseif E .Retail then
1777
- if specialFlag == ' GUIDE' then
1778
- if _G .ChatFrame_GetMentorChannelStatus (CHATCHANNELRULESET_MENTOR , GetChannelRulesetForChannelID (zoneChannelID )) == CHATCHANNELRULESET_MENTOR then
1779
- return NPEV2_CHAT_USER_TAG_GUIDE
1780
- end
1781
- elseif specialFlag == ' NEWCOMER' then
1782
- if _G .ChatFrame_GetMentorChannelStatus (PLAYERMENTORSHIPSTATUS_NEWCOMER , GetChannelRulesetForChannelID (zoneChannelID )) == PLAYERMENTORSHIPSTATUS_NEWCOMER then
1783
- return _G .NPEV2_CHAT_USER_TAG_NEWCOMER
1784
- end
1771
+ elseif specialFlag == ' GUIDE' and E .Retail then
1772
+ if _G .ChatFrame_GetMentorChannelStatus (CHATCHANNELRULESET_MENTOR , GetChannelRulesetForChannelID (zoneChannelID )) == CHATCHANNELRULESET_MENTOR then
1773
+ return NPEV2_CHAT_USER_TAG_GUIDE
1774
+ end
1775
+ elseif specialFlag == ' NEWCOMER' and E .Retail then
1776
+ if _G .ChatFrame_GetMentorChannelStatus (PLAYERMENTORSHIPSTATUS_NEWCOMER , GetChannelRulesetForChannelID (zoneChannelID )) == PLAYERMENTORSHIPSTATUS_NEWCOMER then
1777
+ return _G .NPEV2_CHAT_USER_TAG_NEWCOMER
1785
1778
end
1786
1779
else
1787
1780
return _G [' CHAT_FLAG_' .. specialFlag ]
@@ -1920,7 +1913,7 @@ function CH:MessageFormatter(frame, info, chatType, chatGroup, chatTarget, chann
1920
1913
end
1921
1914
1922
1915
-- Player Flags
1923
- local pflag = GetPFlag (arg1 , arg2 , arg3 , arg4 , arg5 , arg6 , arg7 , arg8 , arg9 , arg10 , arg11 , arg12 , arg13 , arg14 , arg15 , arg16 , arg17 )
1916
+ local pflag = GetPFlag (arg6 , arg7 , arg8 )
1924
1917
if not bossMonster then
1925
1918
local chatIcon , pluginChatIcon = specialChatIcons [arg12 ] or specialChatIcons [playerName ], CH :GetPluginIcon (arg12 , playerName )
1926
1919
if type (chatIcon ) == ' function' then
0 commit comments