fix: sync bugs

Author: CedaryCat

src/OTAPI.UnifiedServerProcess.GlobalNetwork/Network/Router.cs

@@ -13,7 +13,10 @@ public class Router
         public int ListenPort { get; private set; }
         public static readonly RemoteClient[] globalClients = new RemoteClient[256];
         public static readonly MessageBuffer[] globalMsgBuffers = new MessageBuffer[257];
-        public readonly ServerContext[] clientCurrentlyServers = new ServerContext[256];
+        readonly ServerContext[] clientCurrentlyServers = new ServerContext[256];
+        public ServerContext GetClientCurrentlyServer(int clientIndex) => Volatile.Read(ref clientCurrentlyServers[clientIndex]);
+        public void SetClientCurrentlyServer(int clientIndex, ServerContext server) => Volatile.Write(ref clientCurrentlyServers[clientIndex], server);
+
         static Router() {
             for (int i = 0; i < 256; i++) {
                 globalClients[i] = new RemoteClient() {
@@ -50,13 +53,13 @@ public Router(int listenPort, ServerContext main, params ServerContext[] allServ
         }
 
         private bool NetMessageSystemContext_CheckCanSend(On.Terraria.NetMessageSystemContext.orig_CheckCanSend orig, NetMessageSystemContext self, int clientIndex) {
-            return clientCurrentlyServers[clientIndex] == self.root && globalClients[clientIndex].IsConnected();
+            return GetClientCurrentlyServer(clientIndex) == self.root && globalClients[clientIndex].IsConnected();
         }
 
         private void UpdateServerInMainThread(On.Terraria.NetplaySystemContext.orig_mfwh_UpdateServerInMainThread orig, NetplaySystemContext self) {
             var server = self.root;
             for (int i = 0; i < 256; i++) {
-                if (server != clientCurrentlyServers[i]) {
+                if (server != GetClientCurrentlyServer(i)) {
                     continue;
                 }
                 if (server.NetMessage.buffer[i].checkBytes) {
@@ -93,7 +96,7 @@ private void ProcessBytes(On.Terraria.NetMessageSystemContext.orig_mfwh_CheckByt
                             unreadLength -= packetLength;
                             readPosition += packetLength;
 
-                            if (clientCurrentlyServers[clientIndex] != server) {
+                            if (GetClientCurrentlyServer(clientIndex) != server) {
                                 // If there is unprocessed data remaining, copy it to the beginning of the buffer for the next processing round.
                                 // Update buffer.totalData with the remaining byte count to prevent reprocessing of this data.
                                 for (int i = 0; i < unreadLength; i++) {
@@ -158,7 +161,7 @@ private void UpdateConnectedClients() {
             try {
                 for (int i = 0; i < 256; i++) {
                     var client = globalClients[i];
-                    var server = clientCurrentlyServers[i];
+                    var server = GetClientCurrentlyServer(i);
 
                     if (client.PendingTermination) {
                         if (client.PendingTerminationApproved) {
@@ -171,7 +174,7 @@ private void UpdateConnectedClients() {
                                 server.Player.Hooks.PlayerDisconnect(i);
                             }
 
-                            clientCurrentlyServers[i] = main;
+                            SetClientCurrentlyServer(i, main);
                         }
                         continue;
                     }
@@ -283,7 +286,7 @@ void LaunchBroadcast() {
         void OnConnectionAccepted(ISocket client) {
             int id = FindNextEmptyClientSlot();
             if (id != -1) {
-                clientCurrentlyServers[id] = main;
+                SetClientCurrentlyServer(id, main);
                 globalClients[id].Reset(main);
                 globalClients[id].Socket = client;
             }
@@ -307,7 +310,7 @@ int FindNextEmptyClientSlot() {
         }
 
         public void ServerWarp(byte plr, ServerContext to) {
-            var from = clientCurrentlyServers[plr];
+            var from = GetClientCurrentlyServer(plr);
 
             if (from == to) {
                 return;
@@ -331,7 +334,7 @@ public void ServerWarp(byte plr, ServerContext to) {
                 inactivePlayer.active = false;
                 activePlayer.active = true;
 
-                clientCurrentlyServers[plr] = to;
+                SetClientCurrentlyServer(plr, to);
                 client.ResetSections(to);
 
                 SyncHelper.SyncServerOnlineToPlayer(to, plr);

src/OTAPI.UnifiedServerProcess.GlobalNetwork/Network/SyncHelper.cs

@@ -37,13 +37,13 @@ static void SendSectionsWhenJoin(this ServerContext server, int whoAmI) {
             List<Point> existingPos = new((spawnSectionXEnd - spawnSectionXBegin) * (spawnSectionYEnd - spawnSectionYBegin));
             for (int x = spawnSectionXBegin; x < spawnSectionXEnd; x++) {
                 for (int y = spawnSectionYBegin; y < spawnSectionYEnd; y++) {
-                    server.NetMessage.SendSection(x, y, whoAmI);
+                    server.NetMessage.SendSection(whoAmI, x, y);
                     existingPos.Add(new Point(x, y));
                 }
             }
             server.PortalHelper.SyncPortalsOnPlayerJoin(whoAmI, 1, existingPos, out var portalSections);
             foreach (var section in portalSections) {
-                server.NetMessage.SendSection(section.X, section.Y, whoAmI);
+                server.NetMessage.SendSection(whoAmI, section.X, section.Y);
             }
         }
         static void SendWorldEntities(this ServerContext server, int whoAmI) {
@@ -79,7 +79,25 @@ static void SendWorldInfo(this ServerContext server, int whoAmI) {
         #endregion
 
         #region Sync Server Offline To Player
+        static void SendRawData(ServerContext offlineServer, int plr, byte[] data, int offset, int count) {
+            var client = offlineServer.Netplay.Clients[plr];
+            offlineServer.Hooks.NetMessage.InvokeSendBytes(client.Socket, data, offset, count, delegate (object state) {
+                client.ServerWriteCallBack(offlineServer, state);
+            },
+            null, plr);
+        }
         public static void SyncServerOfflineToPlayer(ServerContext offlineServer, int plr) {
+            byte[] data = [6, 0, MessageID.ItemOwner, default, default, 255];
+            for (int i = 0; i < Terraria.Main.maxItems; i++) {
+                var item = offlineServer.Main.item[i];
+                if (!item.active || item.playerIndexTheItemIsReservedFor != plr) {
+                    continue;
+                }
+                short itemSlot = (short)i;
+                data[3] = (byte)(itemSlot & 0xFF);
+                data[4] = (byte)(itemSlot >> 8);
+                SendRawData(offlineServer, plr, data, 0, 6);
+            }
             for (int i = 0; i < Terraria.Main.maxProjectiles; i++) {
                 var proj = offlineServer.Main.projectile[i];
                 if (!proj.active) {
@@ -89,7 +107,7 @@ public static void SyncServerOfflineToPlayer(ServerContext offlineServer, int pl
             }
             for (int i = 0; i < Terraria.Main.maxPlayers; i++) {
                 var player = offlineServer.Main.player[i];
-                if (!player.active) { 
+                if (!player.active) {
                     continue;
                 }
                 offlineServer.NetMessage.TrySendData(MessageID.PlayerActive, plr, i, null, i, 0);
@@ -102,7 +120,6 @@ public static void SyncPlayerJoinToOthers(ServerContext onlineServer, int whoAmI
             var player = onlineServer.Main.player[whoAmI];
             onlineServer.NetMessage.TrySendData(MessageID.PlayerActive, -1, whoAmI, null, whoAmI);
             onlineServer.NetMessage.TrySendData(MessageID.SyncPlayer, -1, whoAmI, null, whoAmI);
-            onlineServer.NetMessage.TrySendData(68, -1, whoAmI, null, whoAmI);
             onlineServer.NetMessage.TrySendData(MessageID.PlayerLifeMana, -1, whoAmI, null, whoAmI);
             onlineServer.NetMessage.TrySendData(42, -1, whoAmI, null, whoAmI);
             onlineServer.NetMessage.TrySendData(MessageID.PlayerBuffs, -1, whoAmI, null, whoAmI);

src/OTAPI.UnifiedServerProcess.GlobalNetwork/Servers/ServerContext.cs

@@ -19,5 +19,6 @@ public ServerContext(string worldName, byte[] worldFileData) : base(worldName) {
             Netplay.ListenPort = -1;
             Netplay.UseUPNP = true;
         }
+        public override string ToString() => $"{{ Type:ServerContext, Name:\"{Name}\", Players:{Main.player.Count(p => p.active)} }}";
     }
 }