FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

xxx

Browse Source
This commit is contained in:
Applevangelist
2024-11-26 08:05:40 +01:00
parent 4511f79609
commit 633f990b36
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Moose Development/Moose/Wrapper/Net.lua
View File

@@ -187,7 +187,7 @@ function NET:IsAnyBlocked(UCID,Name,PlayerID,PlayerSide,PlayerSlot)
if PlayerSlot and self.BlockedSlots[PlayerSlot] and TNow < self.BlockedSlots[PlayerSlot] then if PlayerSlot and self.BlockedSlots[PlayerSlot] and TNow < self.BlockedSlots[PlayerSlot] then
blocked = true blocked = true
end end
self:T("IsAnyBlocke: "..tostring(blocked)) self:T("IsAnyBlocked: "..tostring(blocked))
return blocked return blocked
end end
@@ -207,19 +207,26 @@ function NET:_EventHandler(EventData)
local PlayerID = self:GetPlayerIDByName(name) or "none" local PlayerID = self:GetPlayerIDByName(name) or "none"
local PlayerSide, PlayerSlot = self:GetSlot(data.IniUnit) local PlayerSide, PlayerSlot = self:GetSlot(data.IniUnit)
if not PlayerSide then PlayerSide = EventData.IniCoalition end if not PlayerSide then PlayerSide = EventData.IniCoalition end
if not PlayerSlot then PlayerSlot = EventData.IniUnit:GetID() end
local TNow = timer.getTime() local TNow = timer.getTime()
self:T(self.lid.."Event for: "..name.." | UCID: "..ucid) self:T(self.lid.."Event for: "..name.." | UCID: "..ucid .. " | ID/SIDE/SLOT "..PlayerID.."/"..PlayerSide.."/"..PlayerSlot)
-- Joining -- Joining
if data.id == EVENTS.PlayerEnterUnit or data.id == EVENTS.PlayerEnterAircraft then if data.id == EVENTS.PlayerEnterUnit or data.id == EVENTS.PlayerEnterAircraft then
self:T(self.lid.."Pilot Joining: "..name.." | UCID: "..ucid.." | Event ID: "..data.id) self:T(self.lid.."Pilot Joining: "..name.." | UCID: "..ucid.." | Event ID: "..data.id)
-- Check for blockages -- Check for blockages
local blocked = self:IsAnyBlocked(ucid,name,PlayerID,PlayerSide,PlayerSlot) local blocked = self:IsAnyBlocked(ucid,name,PlayerID,PlayerSide,PlayerSlot)
if blocked and PlayerID then -- and tonumber(PlayerID) ~= 1 then
if blocked and PlayerID and tonumber(PlayerID) ~= 1 then self:T("Player blocked")
-- block pilot -- block pilot
local outcome = net.force_player_slot(tonumber(PlayerID), 0, '' ) local outcome = net.force_player_slot(tonumber(PlayerID), PlayerSide, data.IniUnit:GetID() )
self:T({Blocked_worked=outcome})
if outcome == false then
local unit = data.IniUnit
local sched = TIMER:New(unit.Destroy,unit,3):Start(3)
self:__PlayerBlocked(5,unit,name,1)
end
else else
local client = CLIENT:FindByPlayerName(name) or data.IniUnit local client = CLIENT:FindByPlayerName(name) or data.IniUnit
if not self.KnownPilots[name] or (self.KnownPilots[name] and TNow-self.KnownPilots[name].timestamp > 3) then if not self.KnownPilots[name] or (self.KnownPilots[name] and TNow-self.KnownPilots[name].timestamp > 3) then
@@ -232,7 +239,7 @@ function NET:_EventHandler(EventData)
slot = PlayerSlot, slot = PlayerSlot,
timestamp = TNow, timestamp = TNow,
} }
UTILS.PrintTableToLog(self.KnownPilots[name]) --UTILS.PrintTableToLog(self.KnownPilots[name])
end end
return self return self
end end
@@ -358,7 +365,7 @@ end
--- Block a specific coalition side, does NOT automatically kick all players of that side or kick out joined players --- Block a specific coalition side, does NOT automatically kick all players of that side or kick out joined players
-- @param #NET self -- @param #NET self
-- @param #number side The side to block - 1 : Red, 2 : Blue -- @param #number Side The side to block - 1 : Red, 2 : Blue
-- @param #number Seconds Seconds (optional) Number of seconds the player has to wait before rejoining. -- @param #number Seconds Seconds (optional) Number of seconds the player has to wait before rejoining.
-- @return #NET self -- @return #NET self
function NET:BlockSide(Side,Seconds) function NET:BlockSide(Side,Seconds)
@@ -703,7 +710,7 @@ function NET:GetSlot(Client)
end end
end end
--- Force the slot for a specific client. --- Force the slot for a specific client. If this returns false, it didn't work via `net` (which is ALWAYS the case as of Nov 2024)!
-- @param #NET self -- @param #NET self
-- @param Wrapper.Client#CLIENT Client The client -- @param Wrapper.Client#CLIENT Client The client
-- @param #number SideID i.e. 0 : spectators, 1 : Red, 2 : Blue -- @param #number SideID i.e. 0 : spectators, 1 : Red, 2 : Blue
@@ -711,19 +718,22 @@ end
-- @return #boolean Success -- @return #boolean Success
function NET:ForceSlot(Client,SideID,SlotID) function NET:ForceSlot(Client,SideID,SlotID)
local PlayerID = self:GetPlayerIDFromClient(Client) local PlayerID = self:GetPlayerIDFromClient(Client)
if PlayerID and tonumber(PlayerID) ~= 1 then local SlotID = SlotID or Client:GetID()
return net.force_player_slot(tonumber(PlayerID), SideID, SlotID or '' ) if PlayerID then -- and tonumber(PlayerID) ~= 1 then
return net.force_player_slot(tonumber(PlayerID), SideID, SlotID )
else else
return false return false
end end
end end
--- Force a client back to spectators. --- Force a client back to spectators. If this returns false, it didn't work via `net` (which is ALWAYS the case as of Nov 2024)!
-- @param #NET self -- @param #NET self
-- @param Wrapper.Client#CLIENT Client The client -- @param Wrapper.Client#CLIENT Client The client
-- @return #boolean Succes -- @return #boolean Succes
function NET:ReturnToSpectators(Client) function NET:ReturnToSpectators(Client)
local outcome = self:ForceSlot(Client,0) local outcome = self:ForceSlot(Client,0)
-- workaround
local sched = TIMER:New(Client.Destroy,Client,1):Start(1)
return outcome return outcome
end end