Merge pull request #9 from TwistedTail/fix-links-error

Fixed missing ENT._links error

Author: TwistedTail

lua/cfw/classes/link_sv.lua

@@ -89,10 +89,13 @@ do
     end
 
     function ENT:GetLinks() -- Creates a shallow copy of the links table
-        local out = {}
+        local links = self._links
+        local out   = {}
 
-        for k, v in pairs(self._links) do
-            out[k] = v
+        if links then
+            for k, v in pairs(links) do
+                out[k] = v
+            end
         end
 
         return out

lua/cfw/core/connectivity_sv.lua

@@ -13,7 +13,7 @@ local function floodFill(source, sinkIndex)
 
         if entIndex == sinkIndex then return true, closed end
 
-        for neighborIndex, _ in pairs(Entity(entIndex)._links) do -- neighborIndex, neighborLink
+        for neighborIndex in pairs(Entity(entIndex)._links) do -- neighborIndex, neighborLink
             if not closed[neighborIndex] then
                 open[neighborIndex] = true
             end
@@ -65,7 +65,10 @@ end
 function CFW.disconnect(entA, indexB)
     if entA:EntIndex() == indexB then return end -- Should not happen normally, but ragdolls allow you to constrain to other bones on the same ragdoll, and it is the same entity
 
-    local link              = entA._links[indexB]
+    local link = entA._links[indexB]
+
+    if not link then return end -- There's nothing to disconnect here
+
     local contraptionPopped = link:Sub()
 
     if contraptionPopped then return end

lua/cfw/core/parenting_sv.lua

@@ -92,4 +92,18 @@ hook.Add("Initialize", "CFW", function()
     end)
 
     hook.Remove("Initialize", "CFW")
-end)
+end)
+
+-- In order to prevent NULL entities flooding the ENT._links table, we'll just get rid of them before they get removed
+-- This is a fix for a really annoying issue that was showing up in multiple different ways
+hook.Add("EntityRemoved", "cfw.entityRemoved", function(ent)
+    if not IsValid(ent) then return end
+
+    local links = ent:GetLinks()
+
+    if not links then return end
+
+    for index in pairs(links) do
+        disconnect(ent, index)
+    end
+end)