diff --git a/src/CommandHandlers/PublicMessageHandlers.cs b/src/CommandHandlers/PublicMessageHandlers.cs index 7f3e055..178749e 100644 --- a/src/CommandHandlers/PublicMessageHandlers.cs +++ b/src/CommandHandlers/PublicMessageHandlers.cs @@ -28,7 +28,8 @@ class RacingPMHandler : CommandHandler cmd.Add("p", p); NetworkPacket packet = NetworkObject.WrapObject(1, 13, cmd).Serialize(); - client.Room.Send(packet); + if (client.Room != null) // Throws an exception in Eat my Dust when the player fires their weapon before fully in the room. + client.Room.Send(packet); return Task.CompletedTask; } }