vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lobby update ID isn't included in ingame update messages, resetting lastRecvGeneralUpdate in InitClientSync

Browse Source
This commit is contained in:
Regalis
2017-01-11 23:37:30 +02:00
parent 037bd09c2c
commit ed675dc75e
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Networking/Client.cs
+2
View File
@@ -68,6 +68,8 @@ namespace Barotrauma.Networking
lastSentChatMsgID = 0; lastSentChatMsgID = 0;
lastRecvChatMsgID = ChatMessage.LastID; lastRecvChatMsgID = ChatMessage.LastID;
lastRecvGeneralUpdate = 0;
lastRecvEntitySpawnID = 0; lastRecvEntitySpawnID = 0;
lastRecvEntityEventID = 0; lastRecvEntityEventID = 0;
} }
Subsurface/Source/Networking/GameClient.cs
+1 -1
View File
@@ -831,7 +831,7 @@ namespace Barotrauma.Networking
outmsg.Write((byte)ClientPacketHeader.UPDATE_INGAME); outmsg.Write((byte)ClientPacketHeader.UPDATE_INGAME);
outmsg.Write((byte)ClientNetObject.SYNC_IDS); outmsg.Write((byte)ClientNetObject.SYNC_IDS);
outmsg.Write(GameMain.NetLobbyScreen.LastUpdateID); //outmsg.Write(GameMain.NetLobbyScreen.LastUpdateID);
outmsg.Write(ChatMessage.LastID); outmsg.Write(ChatMessage.LastID);
outmsg.Write(Entity.Spawner.NetStateID); outmsg.Write(Entity.Spawner.NetStateID);
outmsg.Write(entityEventManager.LastReceivedID); outmsg.Write(entityEventManager.LastReceivedID);
Subsurface/Source/Networking/GameServer.cs
+1 -1
View File
@@ -622,7 +622,7 @@ namespace Barotrauma.Networking
case ClientNetObject.SYNC_IDS: case ClientNetObject.SYNC_IDS:
//TODO: might want to use a clever class for this //TODO: might want to use a clever class for this
c.lastRecvGeneralUpdate = Math.Max(c.lastRecvGeneralUpdate, inc.ReadUInt32()); //c.lastRecvGeneralUpdate = Math.Max(c.lastRecvGeneralUpdate, inc.ReadUInt32());
c.lastRecvChatMsgID = Math.Max(c.lastRecvChatMsgID, inc.ReadUInt32()); c.lastRecvChatMsgID = Math.Max(c.lastRecvChatMsgID, inc.ReadUInt32());
c.lastRecvEntitySpawnID = Math.Max(c.lastRecvEntitySpawnID, inc.ReadUInt32()); c.lastRecvEntitySpawnID = Math.Max(c.lastRecvEntitySpawnID, inc.ReadUInt32());
c.lastRecvEntityEventID = Math.Max(c.lastRecvEntityEventID, inc.ReadUInt32()); c.lastRecvEntityEventID = Math.Max(c.lastRecvEntityEventID, inc.ReadUInt32());