diff --git a/Assets/Scripts/Networking/Serverside/Server.cs b/Assets/Scripts/Networking/Serverside/Server.cs index 4a76fa7..74e8b90 100644 --- a/Assets/Scripts/Networking/Serverside/Server.cs +++ b/Assets/Scripts/Networking/Serverside/Server.cs @@ -133,8 +133,6 @@ namespace Cyber.Networking.Serverside { Spawner = GetComponent(); - Spawner.SyncDB.SetStaticObjectsIDs(); - ConnectionConfig Config = new ConnectionConfig(); NetworkChannelID.ReliableSequenced = Config.AddChannel(QosType.ReliableSequenced); NetworkChannelID.UnreliableSequenced = Config.AddChannel(QosType.UnreliableSequenced); @@ -143,6 +141,8 @@ namespace Cyber.Networking.Serverside { NetworkServer.Listen(port); + Spawner.SyncDB.SetStaticObjectsIDs(); + NetworkServer.RegisterHandler(PktType.TextMessage, HandlePacket); NetworkServer.RegisterHandler(PktType.MoveCreature, HandlePacket); NetworkServer.RegisterHandler(PktType.Interact, HandlePacket); diff --git a/Assets/Scripts/Networking/Serverside/Syncer.cs b/Assets/Scripts/Networking/Serverside/Syncer.cs index ec89e9a..13af6fd 100644 --- a/Assets/Scripts/Networking/Serverside/Syncer.cs +++ b/Assets/Scripts/Networking/Serverside/Syncer.cs @@ -1,4 +1,5 @@  +using Cyber.Console; using Cyber.Entities; using Cyber.Entities.SyncBases; using Cyber.Networking.Messages; @@ -55,7 +56,8 @@ namespace Cyber.Networking.Serverside { SyncHandletype Handletype = Database.GetSyncHandletypes()[type]; if (TickCounter % Handletype.TickInterval == 0) { foreach (int SyncBaseID in Categorized[type]) { - if (DirtySyncBases.Contains(SyncBaseID)) { + bool Contains = DirtySyncBases.Contains(SyncBaseID); + if (Contains == Handletype.RequireHash || Contains) { QueueSyncBase(SyncBaseID); } } @@ -71,12 +73,6 @@ namespace Cyber.Networking.Serverside { DirtySyncBases.Clear(); } - if (Categorized.ContainsKey(typeof(Character))) { - foreach (int i in Categorized[typeof(Character)]) { - DirtSyncBase(i); - } - } - if (TickCounter < int.MaxValue) { TickCounter++;