From 1952afcc55021c5f97ebbb96991fbdb7256ae911 Mon Sep 17 00:00:00 2001 From: dingo Date: Mon, 29 Dec 2025 12:22:53 -0500 Subject: [PATCH] Fixing Spritesheet bug --- Services/Admin/Pages/TileMaps/Edit.cshtml.cs | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Services/Admin/Pages/TileMaps/Edit.cshtml.cs b/Services/Admin/Pages/TileMaps/Edit.cshtml.cs index 4d64f90..4018712 100644 --- a/Services/Admin/Pages/TileMaps/Edit.cshtml.cs +++ b/Services/Admin/Pages/TileMaps/Edit.cshtml.cs @@ -28,7 +28,8 @@ public class EditModel : AdminPageModel public async Task OnGetAsync(int? id) { - CdnBaseUrl = _config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"; + //CdnBaseUrl = _config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"; + CdnBaseUrl = NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"); CdnImages = await _db.ClientAssets .Where(a => a.AssetType == ClientAssetType.Texture && a.IsEnabled) .Where(a => a.FilePath.StartsWith("textures/tilemaps/") || a.FilePath.Contains("tilemap")) @@ -69,8 +70,8 @@ public class EditModel : AdminPageModel public async Task OnPostAsync() { - CdnBaseUrl = _config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"; - + //CdnBaseUrl = _config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"; + CdnBaseUrl = NormalizeCdnBaseUrl(_config["Cdn:BaseUrl"] ?? "https://assets.aeternalisgames.com"); try { if (Sheet.Id == 0) @@ -203,4 +204,17 @@ public class EditModel : AdminPageModel await _db.SaveChangesAsync(); return RedirectToPage(new { id = sheetId }); } + private string NormalizeCdnBaseUrl(string? baseUrl) + { + baseUrl = string.IsNullOrWhiteSpace(baseUrl) + ? "https://assets.aeternalisgames.com" + : baseUrl; + + baseUrl = baseUrl.TrimEnd('/'); + + if (!baseUrl.EndsWith("/downloads", StringComparison.OrdinalIgnoreCase)) + baseUrl += "/downloads"; + + return baseUrl; + } }