Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Applevangelist 2025-03-14 10:41:13 +01:00
commit 813286f7f3

View File

@ -207,10 +207,10 @@ function NET:_EventHandler(EventData)
local PlayerID = self:GetPlayerIDByName(name) or "none"
local PlayerSide, PlayerSlot = self:GetSlot(data.IniUnit)
if not PlayerSide then PlayerSide = EventData.IniCoalition end
if not PlayerSlot then PlayerSlot = EventData.IniUnit:GetID() end
if not PlayerSlot then PlayerSlot = EventData.IniUnit:GetID() or -1 end
local TNow = timer.getTime()
self:T(self.lid.."Event for: "..name.." | UCID: "..ucid .. " | ID/SIDE/SLOT "..PlayerID.."/"..PlayerSide.."/"..PlayerSlot)
--self:T(self.lid.."Event for: "..name.." | UCID: "..ucid .. " | ID/SIDE/SLOT "..PlayerID.."/"..PlayerSide.."/"..PlayerSlot)
-- Joining
if data.id == EVENTS.PlayerEnterUnit or data.id == EVENTS.PlayerEnterAircraft then