Skip to content

Fix issues with connected realms #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seidelma wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix issues with connected realms #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccdc21a
Fix issues with Accountability tab on connected realms
seidelma Apr 29, 2023
b8fa56c
Fix issues with Death Log on connected realms
seidelma Apr 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions DeathLog.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,8 @@ function selfDeathAlert(death_source_str)
death_source = npc_to_id[death_source_str]
end

msg = encodeMessage(UnitName("player"), guildName, death_source, race_id, class_id, UnitLevel("player"), instance_id, map, position)
local name, realm = UnitFullName("player")
msg = encodeMessage(name .. "-" .. realm, guildName, death_source, race_id, class_id, UnitLevel("player"), instance_id, map, position)
if msg == nil then return end
local channel_num = GetChannelName(death_alerts_channel)

Expand Down Expand Up @@ -609,7 +610,14 @@ end
local function deathlogReceiveChannelMessage(sender, data)
if data == nil then return end
local decoded_player_data = decodeMessage(data)
if sender ~= decoded_player_data["name"] then return end
local my_realm = GetNormalizedRealmName()
local sender_name, sender_realm = string.split("-", sender)
-- check for local or connected realms and handle backward compat
if sender_realm == nil then
sender_realm = my_realm
sender = sender_name .. "-" .. my_realm
end
if sender ~= decoded_player_data["name"] and sender ~= decoded_player_data["name"] .. "-" .. my_realm then return end
if isValidEntry(decoded_player_data) == false then return end

local checksum = fletcher16(decoded_player_data)
Expand All @@ -626,10 +634,9 @@ local function deathlogReceiveChannelMessage(sender, data)

local guildName, guildRankName, guildRankIndex = GetGuildInfo("player");
if decoded_player_data['guild'] == guildName then
local name_long = sender .. "-" .. GetNormalizedRealmName()
for i = 1, GetNumGuildMembers() do
local name, _, _, level, class_str, _, _, _, _, _, class = GetGuildRosterInfo(i)
if name_long == name and level == decoded_player_data["level"] then
if sender == name and level == decoded_player_data["level"] then
death_ping_lru_cache_tbl[checksum]["player_data"]["in_guild"] = 1
local delay = math.random(0,10)
C_Timer.After(delay, function()
Expand Down
12 changes: 5 additions & 7 deletions Hardcore.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2454,8 +2454,7 @@ function Hardcore:CHAT_MSG_ADDON(prefix, datastr, scope, sender)
return
end
if command == COMM_COMMANDS[5] then -- Received request for hc character data
local name, _ = string.split("-", sender)
Hardcore:SendCharacterData(name)
Hardcore:SendCharacterData(sender)
return
end
if command == COMM_COMMANDS[14] then
Expand All @@ -2466,7 +2465,6 @@ function Hardcore:CHAT_MSG_ADDON(prefix, datastr, scope, sender)
end
end
if command == COMM_COMMANDS[4] then -- Received hc character data
local name, _ = string.split("-", sender)
local version_str, creation_time, achievements_str, _, party_mode_str, _, _, team_str, hc_tag, passive_achievements_str,
verif_status, verif_details = string.split(COMM_FIELD_DELIM, data)
local achievements_l = { string.split(COMM_SUBFIELD_DELIM, achievements_str) }
Expand Down Expand Up @@ -2496,7 +2494,7 @@ function Hardcore:CHAT_MSG_ADDON(prefix, datastr, scope, sender)
verif_details = "(unknown - version not supported)"
end

other_hardcore_character_cache[name] = {
other_hardcore_character_cache[sender] = {
first_recorded = creation_time,
achievements = other_achievements_ds,
passive_achievements = other_passive_achievements_ds,
Expand All @@ -2508,7 +2506,7 @@ function Hardcore:CHAT_MSG_ADDON(prefix, datastr, scope, sender)
verification_status = verif_status,
verification_details = verif_details
}
hardcore_modern_menu_state.changeset[string.split("-", name)] = 1
hardcore_modern_menu_state.changeset[sender] = 1
return
end
if command == COMM_COMMANDS[9] then -- Appeal achievement
Expand Down Expand Up @@ -2667,7 +2665,7 @@ function Hardcore:GUILD_ROSTER_UPDATE(...)
level = level,
classDisplayName = classDisplayName,
}
hardcore_modern_menu_state.changeset[(string.split("-", name))] = 1
hardcore_modern_menu_state.changeset[name] = 1
end
end

Expand Down Expand Up @@ -3711,7 +3709,7 @@ function Hardcore:CheckVersionsAndUpdate(playername, versionstring)
guild_versions[playername] = versionstring
hardcore_modern_menu_state.guild_versions[playername] = versionstring
hardcore_modern_menu_state.guild_versions_status[playername] = guild_versions_status[playername]
hardcore_modern_menu_state.changeset[(string.split("-", playername))] = 1
hardcore_modern_menu_state.changeset[playername] = 1
end

function Hardcore:UpdateGuildRosterRows()
Expand Down
Loading