Skip to content

Fix crashes from certain pings #2

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
Crestwave wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix crashes from certain pings #2

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
c3e71f9
Fix malformed coordinates crash
Crestwave Mar 20, 2025
6498115
Fix stale entity crash
Crestwave May 17, 2025
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
4 changes: 3 additions & 1 deletion modmain.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ local function PlayerPostInit(player)
local ChatHistory = _G.ChatHistory
old_OnSay = ChatHistory.OnSay
ChatHistory.OnSay = function(...)
player.components.environmentpinger:OnMessageReceived(...)
if player:IsValid() then
player.components.environmentpinger:OnMessageReceived(...)
end
old_OnSay(...)
end
end
Expand Down
10 changes: 5 additions & 5 deletions scripts/components/environmentpinger.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ local EnvironmentPinger = Class(function(self,inst)

function EnvironmentPinger:SetClickableMessage(chatline)
local base_pattern = STRINGS.LMB..".+"..STRINGS.RMB.." "
local data_pattern = base_pattern.."{[-]?%d+[%.%d+]+,[-]?%d+[%.%d+]+} %S+ %S+"
local data_pattern = base_pattern.."{[-]?%d*%.?%d+,[-]?%d*%.?%d+} %S+ %S+"
local message = chatline.message:GetString()
local name = chatline.user:GetString()
local colour = chatline.user:GetColour()
Expand Down Expand Up @@ -87,16 +87,16 @@ end

function EnvironmentPinger:OnMessageReceived(chathistory,guid,userid, netid, name, prefab, message, colour, whisper, isemote, user_vanity, ignore_sound, ignore_mobs)
local base_pattern = STRINGS.LMB..".+"..STRINGS.RMB.." "
local data_pattern = base_pattern.."{[-]?%d+[%.%d+]+,[-]?%d+[%.%d+]+} %S+ %S+"
local data_pattern = base_pattern.."{[-]?%d*%.?%d+,[-]?%d*%.?%d+} %S+ %S+"
if (not string.match(message,data_pattern)) and string.match(message,base_pattern..".+") then
message = string.match(message,base_pattern)..Encryptor.E(string.match(message,base_pattern.."(%S+)") or "",cipher)
end
if string.match(message,data_pattern) then
local pos_str = string.match(message,base_pattern.."{([-]?%d+[%.%d+]+,[-]?%d+[%.%d+]+)} %S+")
local pos_str = string.match(message,base_pattern.."{([-]?%d*%.?%d+,[-]?%d*%.?%d+)} %S+")
local pos_x = tonumber(string.match(pos_str,"(.+),"))
local pos_z = tonumber(string.match(pos_str,",(.+)"))
local ping_type = string.match(message,base_pattern.."{[-]?%d+[%.%d+]+,[-]?%d+[%.%d+]+} (%S+)")
local world = string.match(message,base_pattern.."{[-]?%d+[%.%d+]+,[-]?%d+[%.%d+]+} %S+ (%S+)")
local ping_type = string.match(message,base_pattern.."{[-]?%d*%.?%d+,[-]?%d*%.?%d+} (%S+)")
local world = string.match(message,base_pattern.."{[-]?%d*%.?%d+,[-]?%d*%.?%d+} %S+ (%S+)")
-- As the world identifier, let us use the session id.
if world and not (current_world == world) then return nil end -- Different world means different ping meaning.
if EnvironmentPinger:IsValidPingType(ping_type) then
Expand Down