unstaticify part1

This commit is contained in:
2024-01-19 15:10:31 +02:00
parent 03810705bd
commit 375ba9bed0
9 changed files with 97 additions and 52 deletions

View File

@@ -17,6 +17,8 @@ namespace Game
public static INetworkDriver ServerNetworkDriver { get; set; }
public static WorldStateManager serverWorldStateManager = null;
public static bool StartServer(bool listenServer = true)
{
Cleanup();
@@ -79,7 +81,8 @@ namespace Game
foreach (Type type in NetworkedTypes)
Console.Print("tracking networked type: " + type.Name);
#endif
WorldStateManager.Init();
serverWorldStateManager = new WorldStateManager(isServer: true);
//WorldStateManager.Init();
if (listenServer)
return ConnectServer(listenServer: true);
@@ -135,13 +138,13 @@ namespace Game
try
{
IsServer = true;
if (WorldStateManager.OnClientConnecting(networkEvent.Sender))
if (serverWorldStateManager.OnClientConnecting(networkEvent.Sender))
{
ConnectedClients.Add(networkEvent.Sender);
Console.Print(
$"Client({networkEvent.Sender.ConnectionId}) connected. Total clients: {ConnectedClients.Count}");
WorldStateManager.OnClientConnected(networkEvent.Sender);
serverWorldStateManager.OnClientConnected(networkEvent.Sender);
}
else
Console.Print($"Client({networkEvent.Sender.ConnectionId}) connection refused");