Skip to content

Fix chat messages sent twice #566

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

Merged
merged 6 commits into from
Nov 13, 2024
Merged

Fix chat messages sent twice #566

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec7c626
.
Fernando-A-Rocha Oct 19, 2024
cf0f26f
Merge branch 'master' into fix-chat-msg-twice
Fernando-A-Rocha Nov 4, 2024
d3ab82e
Merge branch 'master' into fix-chat-msg-twice
Fernando-A-Rocha Nov 11, 2024
5923c80
Merge branch 'master' into fix-chat-msg-twice
Fernando-A-Rocha Nov 13, 2024
a9301c6
change playercolors onPlayerChat
Fernando-A-Rocha Nov 13, 2024
1237566
comment
Fernando-A-Rocha Nov 13, 2024
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
26 changes: 22 additions & 4 deletions [gameplay]/playercolors/playercolors.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
local lowerBound, upperBound = unpack(get("color_range"))

function randomizePlayerColor(player)
local freeroamRunning = false

local function randomizePlayerColor(player)
player = player or source
local r, g, b = math.random(lowerBound, upperBound), math.random(lowerBound, upperBound), math.random(lowerBound, upperBound)
setPlayerNametagColor(player, r, g, b)
Expand All @@ -16,13 +18,29 @@ local function setAllPlayerColors()
end
end
end
addEventHandler("onResourceStart", resourceRoot, setAllPlayerColors)
addEventHandler("onGamemodeMapStart", root, setAllPlayerColors) -- mapmanager resets player colors to white when the map ends
addEventHandler("onResourceStop", resourceRoot, setAllPlayerColors)
-- mapmanager resets player colors to white when the map ends
addEventHandler("onGamemodeMapStart", root, setAllPlayerColors)

local function handleResourceStartStop(res)
if res == resource then
local freeroamResource = getResourceFromName("freeroam")
if freeroamResource then
freeroamRunning = getResourceState(freeroamResource) == "running"
end
setAllPlayerColors()
elseif getResourceName(res) == "freeroam" then
freeroamRunning = eventName == "onResourceStart"
end
end
addEventHandler("onResourceStart", root, handleResourceStartStop)
addEventHandler("onResourceStop", root, handleResourceStartStop)

addEventHandler('onPlayerChat', root,
function(msg, type)
if type == 0 then
if freeroamRunning then
return -- Let freeroam handle chat
end
cancelEvent()
local r, g, b = getPlayerColor(source)
local name = getPlayerName(source)
Expand Down