Fix small Wire runtime edge cases

lua/entities/gmod_wire_expression2/core/cl_files.lua

@@ -86,20 +86,20 @@ end)
 --- File List ---
 
 net.Receive( "wire_expression2_request_list", function()
-	local dir = process_filepath(net.ReadString())
+	local directory = process_filepath(net.ReadString())
+	local files, folders = file.Find(directory .. "*","DATA")
 
 	net.Start("wire_expression2_file_list")
-		local files, folders = file.Find( dir .. "*","DATA" )
-		net.WriteUInt(#files + #folders, 16)
-		for _,fop in pairs(files) do
-			if string.GetExtensionFromFilename( fop ) == "txt" then
-				net.WriteUInt(#fop, 16)
-				net.WriteData(fop)
-			end
-		end
-		for _,fop in pairs(folders) do
-			net.WriteUInt(#fop, 16)
-			net.WriteData(fop .. "/")
+
+	for _, filename in ipairs(files) do
+		if string.GetExtensionFromFilename(filename) == "txt" then
+			net.WriteString(filename)
 		end
+	end
+
+	for _, folder in ipairs(folders) do
+		net.WriteString(folder .. "/")
+	end
+
 	net.SendToServer()
 end)

lua/entities/gmod_wire_expression2/core/files.lua

@@ -443,8 +443,8 @@ net.Receive("wire_expression2_file_list", function(_, ply)
 
 	timer.Remove("wire_expression2_filelist_check_timeout_" .. ply:EntIndex())
 
-	for i=1, net.ReadUInt(16) do
-		table.insert(plist.data, net.ReadData(net.ReadUInt(16)))
+	while net.BytesLeft() > 0 do
+		table.insert(plist.data, net.ReadString())
 	end
 
 	plist.uploaded = true

lua/entities/gmod_wire_expression2/core/signal.lua

@@ -91,9 +91,6 @@ local function broadcastSignal(group, name, scope, sender, filter_player)
 	end
 end
 
---local function table_IsEmpty(t) return not pairs(t)(t) end
-local function table_IsEmpty(t) return not next(t) end
-
 local function setGroup(self, group)
 	-- set the current group to the new group
 	self.data.signalgroup = group
@@ -241,8 +238,8 @@ __e2setcost(20)
 
 --- sends signal S to chips owned by the given player, multiple calls for different players do not overwrite each other
 e2function void signalSendToPlayer(string name, entity player)
-	if not IsValid(player) then return end
-	broadcastSignal(self.data.signalgroup, name, 1, self.entity, player)
+	if not IsValid(player) or not player:IsPlayer() then return end
+	broadcastSignal(self.data.signalgroup, name, 1, self.entity, player:UniqueID())
 end
 
 --[[************************************************************************]]--
@@ -253,14 +250,16 @@ registerCallback("construct",function(self)
 end)
 
 registerCallback("destruct",function(self)
+	local receiverid = self.entity:EntIndex()
+
 	-- loop through all scopes, ...
 	for scope,groups in pairs_ac(scopes) do
 		-- ... all groups ...
 		for group, signals in pairs_ac(groups) do
 			-- ... and all signals ...
 			for name, contexts in pairs_ac(signals) do
 				-- to remove all signals the chip registered for.
-				contexts[self] = nil
+				contexts[receiverid] = nil
 			end
 		end
 	end

lua/wire/wirenet.lua

@@ -49,10 +49,15 @@ if SERVER then
 				local data = table.concat(tbl)
 
 				if #data < 4096 then
-					data = util.Compress(data)
+					local compressed = util.Compress(data)
 					net.WriteBool(false)
-					net.WriteUInt(#data, 12)
-					net.WriteData(data)
+
+					if compressed then
+						net.WriteUInt(#compressed, 12)
+						net.WriteData(compressed)
+					else
+						net.WriteUInt(0, 12)
+					end
 				else
 					net.WriteBool(true)
 					net.WriteStream(data, nil, false)
@@ -207,4 +212,4 @@ function Net.Trivial.Receive(name, callback)
 	update_handlers(name:lower(), callback)
 end
 
-Net.Receivers = registered_handlers
+Net.Receivers = registered_handlers