fix: fallback to empty map mask if unavailable

Author: h4lfheart

FortnitePorting.Plugins/Blender/fortnite_porting/__init__.py

@@ -19,7 +19,7 @@
     "description": "Import Server for Fortnite Porting",
     "author": "Half",
     "blender": (5, 0, 0),
-    "version": (4, 1, 0),
+    "version": (4, 1, 1),
     "category": "Import-Export",
 }
 

FortnitePorting.Plugins/Blender/fortnite_porting/blender_manifest.toml

@@ -4,7 +4,7 @@ type = "add-on"
 license = ["SPDX:GPL-3.0-or-later"]
 
 id = "fortnite_porting"
-version = "4.1.0"
+version = "4.1.1"
 blender_version_min = "5.0.0"
 name = "Fortnite Porting"
 tagline = "Import Server for Fortnite Porting"

FortnitePorting.Plugins/Unreal/FortnitePorting/FortnitePorting.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 4,
-	"VersionName": "4.1.0",
+	"VersionName": "4.1.1",
 	"FriendlyName": "FortnitePorting",
 	"Description": "Import Server for Fortnite Porting",
 	"Category": "Importers",

FortnitePorting/Globals.cs

@@ -9,7 +9,7 @@ namespace FortnitePorting;
 public static class Globals
 {
     public static string VersionString => Version.GetDisplayString();
-    public static readonly FPVersion Version = new(4, 1, 0);
+    public static readonly FPVersion Version = new(4, 1, 1);
     public const string ApplicationTag = "FortnitePorting";
 
     public static readonly FilePickerFileType MappingsFileType = new("Unreal Mappings") { Patterns = [ "*.usmap" ] };

FortnitePorting/Models/Map/MapInfo.cs

@@ -72,13 +72,6 @@ public bool IsValid()
             isValid &= UEParse.Provider.Files.ContainsKey(
                 UEParse.Provider.FixPath(MinimapPath + ".uasset")
             );
-
-            if (UseMask)
-            {
-                isValid &= UEParse.Provider.Files.ContainsKey(
-                    UEParse.Provider.FixPath(MaskPath + ".uasset")
-                );
-            }
         }
 
         return isValid;

FortnitePorting/Models/Map/WorldPartitionMap.cs

@@ -74,6 +74,7 @@ public async Task Load()
         if (!MapInfo.IsNonDisplay)
         {
             var maskTexture = await UEParse.Provider.SafeLoadPackageObjectAsync<UTexture2D>(MapInfo.UseMask ? MapInfo.MaskPath : "FortniteGame/Content/Global/Textures/Default/Blanks/T_White");
+            maskTexture ??= await UEParse.Provider.SafeLoadPackageObjectAsync<UTexture2D>("FortniteGame/Content/Global/Textures/Default/Blanks/T_White");
             MaskBitmap = maskTexture?.Decode()?.ToSkBitmap().ToOpacityMask().ToWriteableBitmap();
 
             var mapTexture = await UEParse.Provider.SafeLoadPackageObjectAsync<UTexture2D>(MapInfo.MinimapPath);

FortnitePorting/Services/ChatService.cs

@@ -381,7 +381,7 @@ public async Task AddMessage(Message inMessage, bool isInit = false)
             _messageCache.AddOrUpdate(message);
         }
 
-        if (message.Text.Contains($"<@{SupaBase.UserInfo?.UserId}>") || message.Text.Contains("<@everyone>"))
+        if (message.Text.Contains($"<@{SupaBase.UserInfo?.UserId}>") || (message.Text.Contains("<@everyone>") && message.User?.Role >= ESupabaseRole.Staff))
             message.IsPing = true;
 
         if (!isInit)

FortnitePorting/Views/ChatView.axaml.cs

@@ -147,7 +147,7 @@ private void UpdateMentionPopup()
         }
 
         var query = text.Substring(_mentionStart + 1, caret - _mentionStart - 1).ToLowerInvariant();
-        var isStaff = ViewModel.Chat.SupaBase.UserInfo?.Role >= ESupabaseRole.Staff;
+        var isStaff = SupaBase.UserInfo?.Role >= ESupabaseRole.Staff;
 
         List<string> matchList;
         if (string.IsNullOrEmpty(query))