Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix shutdown exceptions #434

Merged
merged 1 commit into from
Mar 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Obsidian/Services/PacketBroadcaster.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Obsidian/WorldData/WorldManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Loading