Fix shutdown exceptions (#434)

ObsidianMC · Mar 3, 2024 · 6e363ba · 6e363ba
1 parent 5aa2869
commit 6e363ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Obsidian/Services/PacketBroadcaster.cs b/Obsidian/Services/PacketBroadcaster.cs
@@ -71,7 +71,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                     await player.client.QueuePacketAsync(queuedPacket.Packet);
             }
         }
-        catch (Exception e)
+        catch (Exception e) when (e is not OperationCanceledException)
         {
             await this.environment.OnServerCrashAsync(this.logger, e);
         }
@@ -96,7 +96,6 @@ public interface IPacketBroadcaster
     /// <param name="excludedIds">The list of entity ids to exlude from the broadcast.</param>
     public void Broadcast(IClientboundPacket packet, params int[] excludedIds);
 
-
     /// <summary>
     /// Sends the packets directly to connected clients without processing in a queue.
     /// </summary>

diff --git a/Obsidian/WorldData/WorldManager.cs b/Obsidian/WorldData/WorldManager.cs
@@ -57,7 +57,7 @@ protected async override Task ExecuteAsync(CancellationToken stoppingToken)
                 await Task.WhenAll(this.worlds.Values.Cast<World>().Select(x => x.ManageChunksAsync()));
             }
         }
-        catch (Exception ex)
+        catch (Exception ex) when (ex is not OperationCanceledException)
         {
             await this.serverEnvironment.OnServerCrashAsync(this.logger, ex);
         }