Skip to content

Commit 44fe4aa

Browse files
committed
fix: align reviewed network payload changes
1 parent 452f574 commit 44fe4aa

2 files changed

Lines changed: 10 additions & 12 deletions

File tree

lua/entities/gmod_wire_expression2/core/cl_files.lua

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,17 @@ net.Receive( "wire_expression2_request_list", function()
9090

9191
net.Start("wire_expression2_file_list")
9292
local files, folders = file.Find( dir .. "*","DATA" )
93-
net.WriteUInt(#files + #folders, 16)
93+
local txtfiles = {}
9494
for _,fop in pairs(files) do
9595
if string.GetExtensionFromFilename( fop ) == "txt" then
96-
net.WriteUInt(#fop, 16)
97-
net.WriteData(fop)
96+
txtfiles[#txtfiles + 1] = fop
9897
end
9998
end
99+
net.WriteUInt(#txtfiles + #folders, 16)
100+
for _,fop in pairs(txtfiles) do
101+
net.WriteUInt(#fop, 16)
102+
net.WriteData(fop)
103+
end
100104
for _,fop in pairs(folders) do
101105
local folder = fop .. "/"
102106
net.WriteUInt(#folder, 16)

lua/wire/wirenet.lua

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,10 @@ if SERVER then
5252
local compressed = util.Compress(data)
5353
net.WriteBool(false)
5454
if compressed and #compressed < 4096 then
55-
net.WriteBool(true)
5655
net.WriteUInt(#compressed, 12)
5756
net.WriteData(compressed)
5857
else
59-
net.WriteBool(false)
60-
net.WriteUInt(#data, 12)
61-
net.WriteData(data)
58+
net.WriteUInt(0, 12)
6259
end
6360
else
6461
net.WriteBool(true)
@@ -185,10 +182,7 @@ else -- CLIENT
185182
stripstrings(begin, last, lens, data)
186183
end)
187184
else
188-
local compressed = net.ReadBool()
189-
local data = net.ReadData(net.ReadUInt(12))
190-
if compressed then data = util.Decompress(data) end
191-
stripstrings(begin, last, lens, data)
185+
stripstrings(begin, last, lens, util.Decompress(net.ReadData(net.ReadUInt(12))))
192186
end
193187
end
194188

@@ -217,4 +211,4 @@ function Net.Trivial.Receive(name, callback)
217211
update_handlers(name:lower(), callback)
218212
end
219213

220-
Net.Receivers = registered_handlers
214+
Net.Receivers = registered_handlers

0 commit comments

Comments
 (0)