fix(core): IDatabaseService disposable

Author: oscar-wos

RSession.Aliases/RSession.Aliases.cs

@@ -23,7 +23,7 @@ namespace RSession.Aliases;
 
 [PluginMetadata(
     Id = "RSession.Aliases",
-    Version = "1.1.3",
+    Version = "1.1.4",
     Name = "RSession.Aliases",
     Website = "https://github.com/oscar-wos/RSession",
     Author = "oscar-wos"

RSession.Messages/RSession.Messages.cs

@@ -25,7 +25,7 @@ namespace RSession.Messages;
 
 [PluginMetadata(
     Id = "RSession.Messages",
-    Version = "1.1.3",
+    Version = "1.1.4",
     Name = "RSession.Messages",
     Website = "https://github.com/oscar-wos/RSession",
     Author = "oscar-wos"

RSession.Played/RSession.Played.cs

@@ -24,7 +24,7 @@ namespace RSession.Played;
 
 [PluginMetadata(
     Id = "RSession.Played",
-    Version = "1.1.3",
+    Version = "1.1.4",
     Name = "RSession.Played",
     Website = "https://github.com/oscar-wos/RSession",
     Author = "oscar-wos"

RSession.Rotation/RSession.Rotation.cs

@@ -24,7 +24,7 @@ namespace RSession.Rotation;
 
 [PluginMetadata(
     Id = "RSession.Rotation",
-    Version = "1.1.3",
+    Version = "1.1.4",
     Name = "RSession.Rotation",
     Website = "https://github.com/oscar-wos/RSession",
     Author = "oscar-wos"

src/Contracts/Database/IDatabaseService.cs

@@ -16,7 +16,7 @@
 
 namespace RSession.Contracts.Database;
 
-internal interface IDatabaseService : ISessionDatabaseService, IAsyncDisposable
+internal interface IDatabaseService : ISessionDatabaseService, IDisposable
 {
     Task CreateTablesAsync();
     Task<short> GetMapAsync(string mapName, long? workshopId);

src/RSession.cs

@@ -30,7 +30,7 @@ namespace RSession;
 
 [PluginMetadata(
     Id = "RSession",
-    Version = "1.1.3",
+    Version = "1.1.4",
     Name = "RSession",
     Website = "https://github.com/oscar-wos/RSession",
     Author = "oscar-wos"
@@ -119,10 +119,6 @@ public override void Load(bool hotReload)
     public override async void Unload()
     {
         _eventService?.InvokeDispose();
-
-        if (_serviceProvider is IAsyncDisposable asyncDisposable)
-        {
-            await asyncDisposable.DisposeAsync().ConfigureAwait(false);
-        }
+        (_serviceProvider as IDisposable)?.Dispose();
     }
 }

src/Services/Database/PostgresService.cs

@@ -220,5 +220,5 @@ private string BuildConnectionString(ConnectionConfig config)
         return builder.ConnectionString;
     }
 
-    public async ValueTask DisposeAsync() => await _dataSource.DisposeAsync().ConfigureAwait(false);
+    public void Dispose() => _dataSource.Dispose();
 }

src/Services/Database/SqlService.cs

@@ -220,5 +220,5 @@ private string BuildConnectionString(ConnectionConfig config)
         return builder.ConnectionString;
     }
 
-    public async ValueTask DisposeAsync() => await _dataSource.DisposeAsync().ConfigureAwait(false);
+    public void Dispose() => _dataSource.Dispose();
 }

src/Services/Event/OnClientDisconnectedService.cs

@@ -18,7 +18,6 @@
 using RSession.Contracts.Log;
 using SwiftlyS2.Shared;
 using SwiftlyS2.Shared.Events;
-using SwiftlyS2.Shared.ProtobufDefinitions;
 
 namespace RSession.Services.Event;
 
@@ -43,11 +42,6 @@ public void Subscribe()
 
     private void OnClientDisconnected(IOnClientDisconnectedEvent @event)
     {
-        if (@event.Reason == ENetworkDisconnectionReason.NETWORK_DISCONNECT_SHUTDOWN)
-        {
-            return;
-        }
-
         int playerId = @event.PlayerId;
 
         if (_core.PlayerManager.GetPlayer(playerId) is not { } player)