Make commander and whoer use the distributed messenger

This commit is contained in:
2025-01-15 15:11:52 +01:00
parent c0568075e1
commit 9f4e19104f
2 changed files with 20 additions and 11 deletions

View File

@@ -311,7 +311,8 @@ function shared.Commander.Init()
data = channelname, data = channelname,
message = message message = message
} }
table.insert(shared.messenger.queue, msg) --table.insert(shared.messenger.queue, msg)
table.insert(shared.networkMessenger.queue, msg)
end end
end end
end end

View File

@@ -198,7 +198,8 @@ function shared.Whoer.Init()
data = Heimdall_Data.config.who.notifyChannel, data = Heimdall_Data.config.who.notifyChannel,
message = text message = text
} }
table.insert(shared.messenger.queue, msg) --table.insert(shared.messenger.queue, msg)
table.insert(shared.networkMessenger.queue, msg)
if Heimdall_Data.config.who.doWhisper then if Heimdall_Data.config.who.doWhisper then
if Heimdall_Data.config.who.debug then if Heimdall_Data.config.who.debug then
@@ -215,7 +216,8 @@ function shared.Whoer.Init()
if Heimdall_Data.config.who.debug then if Heimdall_Data.config.who.debug then
print(string.format("[%s] Queuing whisper to %s", ModuleName, name)) print(string.format("[%s] Queuing whisper to %s", ModuleName, name))
end end
table.insert(shared.messenger.queue, msg) --table.insert(shared.messenger.queue, msg)
table.insert(shared.networkMessenger.queue, msg)
end end
end end
@@ -226,7 +228,8 @@ function shared.Whoer.Init()
data = Heimdall_Data.config.who.notifyChannel .. "ru", data = Heimdall_Data.config.who.notifyChannel .. "ru",
message = player:NotifyRu() message = player:NotifyRu()
} }
table.insert(shared.messenger.queue, ruMsg) --table.insert(shared.messenger.queue, ruMsg)
table.insert(shared.networkMessenger.queue, ruMsg)
end end
return nil return nil
@@ -255,7 +258,8 @@ function shared.Whoer.Init()
data = Heimdall_Data.config.who.notifyChannel, data = Heimdall_Data.config.who.notifyChannel,
message = text message = text
} }
table.insert(shared.messenger.queue, msg) --table.insert(shared.messenger.queue, msg)
table.insert(shared.networkMessenger.queue, msg)
text = string.format(shared.L.ru.whoerMoved, text = string.format(shared.L.ru.whoerMoved,
player.name, player.name,
@@ -271,8 +275,8 @@ function shared.Whoer.Init()
data = Heimdall_Data.config.who.notifyChannel .. "ru", data = Heimdall_Data.config.who.notifyChannel .. "ru",
message = text message = text
} }
table.insert(shared.messenger.queue, msg) --table.insert(shared.messenger.queue, msg)
table.insert(shared.networkMessenger.queue, msg)
if Heimdall_Data.config.who.doWhisper then if Heimdall_Data.config.who.doWhisper then
for _, name in pairs(Heimdall_Data.config.whisperNotify) do for _, name in pairs(Heimdall_Data.config.whisperNotify) do
---@type Message ---@type Message
@@ -281,7 +285,8 @@ function shared.Whoer.Init()
data = name, data = name,
message = text message = text
} }
table.insert(shared.messenger.queue, msg) --table.insert(shared.messenger.queue, msg)
table.insert(shared.networkMessenger.queue, msg)
end end
end end
@@ -309,7 +314,8 @@ function shared.Whoer.Init()
data = Heimdall_Data.config.who.notifyChannel, data = Heimdall_Data.config.who.notifyChannel,
message = text message = text
} }
table.insert(shared.messenger.queue, msg) --table.insert(shared.messenger.queue, msg)
table.insert(shared.networkMessenger.queue, msg)
text = string.format(shared.L.ru.whoerGone, text = string.format(shared.L.ru.whoerGone,
player.name, player.name,
@@ -323,7 +329,8 @@ function shared.Whoer.Init()
data = Heimdall_Data.config.who.notifyChannel .. "ru", data = Heimdall_Data.config.who.notifyChannel .. "ru",
message = text message = text
} }
table.insert(shared.messenger.queue, msg) --table.insert(shared.messenger.queue, msg)
table.insert(shared.networkMessenger.queue, msg)
if Heimdall_Data.config.who.doWhisper then if Heimdall_Data.config.who.doWhisper then
for _, name in pairs(Heimdall_Data.config.whisperNotify) do for _, name in pairs(Heimdall_Data.config.whisperNotify) do
@@ -333,7 +340,8 @@ function shared.Whoer.Init()
data = name, data = name,
message = text message = text
} }
table.insert(shared.messenger.queue, msg) --table.insert(shared.messenger.queue, msg)
table.insert(shared.networkMessenger.queue, msg)
end end
end end