From d5028d86dffa671804e7aa77800d23a8ebbd2fae Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 15 Dec 2022 11:49:28 +0100 Subject: [PATCH 1/2] #SET_CLIENT * small addition --- Moose Development/Moose/Core/Set.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index 8785850f3..a3c404bbe 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -4203,9 +4203,10 @@ do -- SET_CLIENT if self.Filter.Active ~= nil then local MClientActive = false - if self.Filter.Active == false or (self.Filter.Active == true and MClient:IsActive() == true) then + if self.Filter.Active == false or (self.Filter.Active == true and MClient:IsActive() == true and MClient:IsAlive() == true) then MClientActive = true end + --self:I( { "Evaluated Active", MClientActive } ) MClientInclude = MClientInclude and MClientActive end @@ -4287,6 +4288,7 @@ do -- SET_CLIENT if self.Filter.Playernames then local MClientPlayername = false local playername = MClient:GetPlayerName() or "Unknown" + --self:I(playername) for _,_Playername in pairs(self.Filter.Playernames) do if playername and string.find(playername,_Playername) then MClientPlayername = true @@ -4299,6 +4301,7 @@ do -- SET_CLIENT if self.Filter.Callsigns then local MClientCallsigns = false local callsign = MClient:GetCallsign() + --self:I(callsign) for _,_Callsign in pairs(self.Filter.Callsigns) do if callsign and string.find(callsign,_Callsign) then MClientCallsigns = true From 80e3b157caf51f99e161e9e632ac81a308ede594 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 15 Dec 2022 18:28:06 +0100 Subject: [PATCH 2/2] #UTILS * UTILS.LoadSetOfStatics(Path,Filename) ignore statics which do not exist --- Moose Development/Moose/Utilities/Utils.lua | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Utilities/Utils.lua b/Moose Development/Moose/Utilities/Utils.lua index dd073f753..0e3b3d37d 100644 --- a/Moose Development/Moose/Utilities/Utils.lua +++ b/Moose Development/Moose/Utilities/Utils.lua @@ -2414,11 +2414,14 @@ function UTILS.LoadSetOfStatics(Path,Filename) local dataset = UTILS.Split(_entry,",") -- staticname,position.x,position.y,position.z local staticname = dataset[1] - local posx = tonumber(dataset[2]) - local posy = tonumber(dataset[3]) - local posz = tonumber(dataset[4]) - local coordinate = COORDINATE:NewFromVec3({x=posx, y=posy, z=posz}) - datatable:AddObject(STATIC:FindByName(staticname,false)) + --local posx = tonumber(dataset[2]) + --local posy = tonumber(dataset[3]) + --local posz = tonumber(dataset[4]) + --local coordinate = COORDINATE:NewFromVec3({x=posx, y=posy, z=posz}) + local StaticObject = STATIC:FindByName(staticname,false) + if StaticObject then + datatable:AddObject(StaticObject) + end end else return nil