diff --git a/ProjectLighthouse.Servers.Website/Pages/Moderation/ReportPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Moderation/ReportPage.cshtml.cs index d0ea45a2..14573902 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Moderation/ReportPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/Moderation/ReportPage.cshtml.cs @@ -25,13 +25,13 @@ public class ReportPage : BaseLayout .FirstOrDefaultAsync(r => r.ReportId == reportId); if (report == null) return this.NotFound(); - report.XmlPlayers = (ReportPlayer[])JsonSerializer.Deserialize(report.Players, - typeof(ReportPlayer[]))!; + report.XmlPlayers = (ReportPlayer[]?)JsonSerializer.Deserialize(report.Players, + typeof(ReportPlayer[])) ?? Array.Empty(); report.XmlBounds = new Marqee { - Rect = (Rectangle)JsonSerializer.Deserialize(report.Bounds, - typeof(Rectangle))!, + Rect = (Rectangle?)JsonSerializer.Deserialize(report.Bounds, + typeof(Rectangle)) ?? new Rectangle(), }; this.Report = report; diff --git a/ProjectLighthouse.Servers.Website/Pages/Moderation/ReportsPage.cshtml.cs b/ProjectLighthouse.Servers.Website/Pages/Moderation/ReportsPage.cshtml.cs index dec59a5d..b61a9aef 100644 --- a/ProjectLighthouse.Servers.Website/Pages/Moderation/ReportsPage.cshtml.cs +++ b/ProjectLighthouse.Servers.Website/Pages/Moderation/ReportsPage.cshtml.cs @@ -51,11 +51,11 @@ public class ReportsPage : BaseLayout foreach (GriefReport r in this.Reports) { - r.XmlPlayers = (ReportPlayer[])JsonSerializer.Deserialize(r.Players, typeof(ReportPlayer[]))!; + r.XmlPlayers = (ReportPlayer[]?)JsonSerializer.Deserialize(r.Players, typeof(ReportPlayer[])) ?? Array.Empty(); - r.XmlBounds = new Marqee() + r.XmlBounds = new Marqee { - Rect = (Rectangle)JsonSerializer.Deserialize(r.Bounds, typeof(Rectangle))!, + Rect = (Rectangle?)JsonSerializer.Deserialize(r.Bounds, typeof(Rectangle)) ?? new Rectangle(), }; }