wiremod/advdupe2
1
0
Fork 0
mirror of https://github.com/wiremod/advdupe2.git synced 2025-03-04 03:03:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #300 from thegrb93/netstream-update

Browse Source 
Fix desync caused by receiving delayed message
This commit is contained in:
Sparky 2020-08-10 22:33:21 -04:00 committed by GitHub
commit c6aab40019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lua/advdupe2/sh_netstream.lua
View File

@ -29,14 +29,16 @@ end
--Received data so process it
function net.Stream.ReadStream:Read(size)
timer.Remove("NetStreamReadTimeout" .. self.identifier)
local progress = net.ReadUInt(32)
if self.chunks[progress] then return end
local crc = net.ReadString()
local data = net.ReadData(size)
if crc == util.CRC(data) then
self.chunks[#self.chunks + 1] = data
self.chunks[progress] = data
end
if #self.chunks == self.numchunks then
self.returndata = table.concat(self.chunks)
@ -101,6 +103,7 @@ function net.Stream.WriteStream:Write(ply)
self.clients[ply].progress = progress
net.Start("NetStreamDownload")
net.WriteUInt(#chunk.data, 32)
net.WriteUInt(progress, 32)
net.WriteString(chunk.crc)
net.WriteData(chunk.data, #chunk.data)
if CLIENT then net.SendToServer() else net.Send(ply) end