ClientsideModel FIX

metrostroi-repo · Aug 15, 2022 · 9796bd8 · 9796bd8
1 parent d17cb74
commit 9796bd8
Show file tree

Hide file tree

Showing 16 changed files with 160 additions and 85 deletions.
diff --git a/lua/entities/gmod_mus_clock_analog/cl_init.lua b/lua/entities/gmod_mus_clock_analog/cl_init.lua
@@ -13,6 +13,7 @@ function ENT:Think()
             --self.Arrows[i] = ents.CreateClientProp("models/metrostroi/81-717/reverser.mdl")
             --self.Arrows[i]:SetModel( model )
             self.Arrows[i] = ClientsideModel(model,RENDERGROUP_OPAQUE)
+            if not IsValid(self.Arrows[i]) then break end
             self.Arrows[i]:SetPos(self:GetPos())
             self.Arrows[i]:SetAngles(self:GetAngles())
             self.Arrows[i]:SetParent(self)
@@ -23,13 +24,15 @@ function ENT:Think()
         self:EmitSound("mus/clock_click"..math.random(1,8)..".wav",65,math.random(95,105),0.5)
         self.OldSec = d.sec
         self.SecPull = RealTime()+0.05
-        self.Arrows[1]:SetPoseParameter("position",(0.5+d.hour/24+d.min/1440)%1)
-        self.Arrows[2]:SetPoseParameter("position",d.min/60+d.sec/3600)
+        if IsValid(self.Arrows[1]) then self.Arrows[1]:SetPoseParameter("position",(0.5+d.hour/24+d.min/1440)%1) end
+        if IsValid(self.Arrows[2]) then self.Arrows[2]:SetPoseParameter("position",d.min/60+d.sec/3600) end
     end
-    if RealTime()-self.SecPull > 0 or d.sec < 30 then
-        self.Arrows[3]:SetPoseParameter("position",d.sec/60)
-    else
-        self.Arrows[3]:SetPoseParameter("position",d.sec/60 +(d.sec-15)/60*0.002)
+    if IsValid(self.Arrows[3]) then
+        if RealTime()-self.SecPull > 0 or d.sec < 30 then
+            self.Arrows[3]:SetPoseParameter("position",d.sec/60)
+        else
+            self.Arrows[3]:SetPoseParameter("position",d.sec/60 +(d.sec-15)/60*0.002)
+        end
     end
 
     --[[

diff --git a/lua/entities/gmod_subway_base/cl_init.lua b/lua/entities/gmod_subway_base/cl_init.lua
@@ -392,6 +392,7 @@ function ENT:SpawnCSEnt(k,override)
         local model = v.model
         if v.modelcallback then model = v.modelcallback(self) or v.model end
         local cent = ClientsideModel(model,RENDERGROUP_OPAQUE)
+        if not IsValid(cent) then return false end
         cent.GetBodyColor = function()
             if not IsValid(self) then return Vector(1) end
             return self:GetBodyColor()
@@ -1346,6 +1347,7 @@ function ENT:Think()
         for i,v in ipairs(self.LeftDoorPositions) do
             if self:GetPackedBool("DoorLS"..i) and not IsValid(stucked[i]) then
                 local ent = ClientsideModel(table.Random(self.PassengerModels),RENDERGROUP_OPAQUE)
+                if not IsValid(ent) then break end
                 ent:SetPos(self:LocalToWorld(Vector(v.x,v.y,self:GetStandingArea().z)))
                 ent:SetAngles(self:LocalToWorldAngles(Angle(0,v.y < 0 and -90 or 90,0)))
                 ent:SetSkin(math.floor(ent:SkinCount()*math.random()))
@@ -1368,6 +1370,7 @@ function ENT:Think()
         for i,v in ipairs(self.RightDoorPositions) do
             if self:GetPackedBool("DoorRS"..i) and not IsValid(stucked[-i]) then
                 local ent = ClientsideModel(table.Random(self.PassengerModels),RENDERGROUP_OPAQUE)
+                if not IsValid(ent) then break end
                 ent:SetPos(self:LocalToWorld(Vector(v.x,v.y,self:GetStandingArea().z)))
                 ent:SetAngles(self:LocalToWorldAngles(Angle(0,v.y < 0 and -90 or 90,0)))
                 ent:SetSkin(math.floor(ent:SkinCount()*math.random()))
@@ -1403,6 +1406,7 @@ function ENT:Think()
                 --local ent = ents.CreateClientProp("models/metrostroi/81-717/reverser.mdl")
                 --ent:SetModel(table.Random(self.PassengerModels))
                 local ent = ClientsideModel(table.Random(self.PassengerModels),RENDERGROUP_OPAQUE)
+                if not IsValid(ent) then break end
                 ent:SetPos(self:LocalToWorld(pos))
                 ent:SetAngles(Angle(0,math.random(0,360),0))
                 --[[

diff --git a/lua/entities/gmod_track_clock_interval/cl_init.lua b/lua/entities/gmod_track_clock_interval/cl_init.lua
@@ -30,6 +30,7 @@ function ENT:Think()
             --    ent:SetPos(self:LocalToWorld(v[1]))
             --end)
             self.Digits[k] = ClientsideModel(model, RENDERGROUP_OPAQUE)
+            if not IsValid(self.Digits[k]) then break end
 
             --if ent.Spawned then hook.Remove("MetrostroiBigLag",ent) end
             --ent.Spawned = true

diff --git a/lua/entities/gmod_track_clock_small/cl_init.lua b/lua/entities/gmod_track_clock_small/cl_init.lua
@@ -59,6 +59,7 @@ function ENT:Think()
       --  --ent.Spawned = true
       --end)
       self.Digits[k] = ClientsideModel(model,RENDERGROUP_OPAQUE)
+      if not IsValid(self.Digits[k]) then break end
       self.Digits[k]:SetPos(self:LocalToWorld(v[1]))
 			self.Digits[k]:SetAngles(self:GetAngles())
 			self.Digits[k]:SetSkin(10)

diff --git a/lua/entities/gmod_track_clock_time/cl_init.lua b/lua/entities/gmod_track_clock_time/cl_init.lua
@@ -31,6 +31,7 @@ function ENT:Think()
             --  --ent.Spawned = true
             --end)
             self.Digits[k] = ClientsideModel(model,RENDERGROUP_OPAQUE)
+            if not IsValid(self.Digits[k]) then break end
             self.Digits[k]:SetPos(self:LocalToWorld(v[1]))
             self.Digits[k]:SetAngles(self:GetAngles())
             self.Digits[k]:SetSkin(10)

diff --git a/lua/entities/gmod_track_horlift_signal/cl_init.lua b/lua/entities/gmod_track_horlift_signal/cl_init.lua
@@ -124,6 +124,7 @@ function ENT:Think()
             --  --ent.Spawned = true
             --end)
             self.Models[k] = ClientsideModel(self.ModelNames[v[2]],RENDERGROUP_OPAQUE)
+            if not IsValid(self.Models[k]) then break end
             self.Models[k]:SetPos(self:LocalToWorld(v[1]))
             self.Models[k]:SetAngles(self:LocalToWorldAngles(Angle(v[2]==5 and 90 or 0,0,0)))
             if k < 3 then

diff --git a/lua/entities/gmod_track_mus_elektronika7/cl_init.lua b/lua/entities/gmod_track_mus_elektronika7/cl_init.lua
@@ -23,6 +23,7 @@ function ENT:Think()
             --    --ent.Spawned = true
             --end)
             self.Digits[k] = ClientsideModel("models/mus/ussr_clock_model/num_"..(k == 1 and "no" or "").."zero.mdl",RENDERGROUP_OPAQUE)
+            if not IsValid(self.Digits[k]) then break end
             self.Digits[k]:SetPos(self:LocalToWorld(v))
             self.Digits[k]:SetAngles(self:GetAngles())
             self.Digits[k]:SetSkin(10)

diff --git a/lua/entities/gmod_track_platform/cl_init.lua b/lua/entities/gmod_track_platform/cl_init.lua
@@ -238,6 +238,7 @@ function ENT:Think()
                     --    --ent.Spawned = true
                     --end)
                     self.ClientModels[i] = ClientsideModel(self.Pool[i].model,RENDERGROUP_OPAQUE)
+                    if not IsValid(self.ClientModels[i]) then continue end
                     self.ClientModels[i]:SetPos(self.Pool[i].pos)
                     self.ClientModels[i]:SetAngles(self.Pool[i].ang)
                     self.ClientModels[i]:SetSkin(math.floor(self.ClientModels[i]:SkinCount()*self.Pool[i].skin))
@@ -292,6 +293,7 @@ function ENT:Think()
         --    --ent.Spawned = true
         --end)
         local ent= ClientsideModel(self.Pool[i].model,RENDERGROUP_OPAQUE)
+        if not IsValid(ent) then break end
         ent:SetPos(pos)
         ent:SetSkin(math.floor(ent:SkinCount()*self.Pool[i].skin))
         ent:SetModelScale(self.Pool[i].scale,0)

diff --git a/lua/entities/gmod_track_pui/cl_init.lua b/lua/entities/gmod_track_pui/cl_init.lua
@@ -59,6 +59,7 @@ function ENT:Think()
             --    --ent.Spawned = true
             --end)
             self.Digits[k] = ClientsideModel("models/metrostroi/mus_clock/pui_ind_"..v[2]..".mdl",RENDERGROUP_OPAQUE)
+            if not IsValid(self.Digits[k]) then continue end
             self.Digits[k]:SetPos(self:LocalToWorld(v[1]))
             self.Digits[k]:SetAngles(self:GetAngles())
             self.Digits[k]:SetSkin(1)
@@ -80,11 +81,13 @@ function ENT:Think()
         --    --ent.Spawned = true
         --end)
         self.Digits[0] = ClientsideModel("models/metrostroi/mus_clock/pui_lamp.mdl",RENDERGROUP_OPAQUE)
-        self.Digits[0]:SetPos(self:GetAttachment(self:LookupAttachment("lamp")).Pos)
-        self.Digits[0]:SetAngles(self:GetAngles())
-        self.Digits[0]:SetParent(self)
-        self.Digits[0]:SetRenderMode( RENDERMODE_TRANSALPHA )
-        self.Digits[0]:SetColor(Color(255,255,255,lamp*255))
+        if IsValid(self.Digits[0]) then
+            self.Digits[0]:SetPos(self:GetAttachment(self:LookupAttachment("lamp")).Pos)
+            self.Digits[0]:SetAngles(self:GetAngles())
+            self.Digits[0]:SetParent(self)
+            self.Digits[0]:SetRenderMode( RENDERMODE_TRANSALPHA )
+            self.Digits[0]:SetColor(Color(255,255,255,lamp*255))
+        end
     elseif IsValid(self.Digits[0]) and lamp > 0 then
         self.Digits[0]:SetColor(Color(255,255,255,lamp*255))
     elseif IsValid(self.Digits[0]) and lamp == 0 then