Blacklist a map with a gpg map name (FAForever#6206)

GodFuper · May 30, 2024 · 99168b2 · 99168b2
1 parent 4b7d025
commit 99168b2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/changelog/snippets/other.6206.md b/changelog/snippets/other.6206.md
@@ -0,0 +1 @@
+- (#6206) Update map blacklist.
diff --git a/etc/faf/mapblacklist.lua b/etc/faf/mapblacklist.lua
@@ -1122,20 +1122,13 @@ MapBlacklist = {
     ['scmp_002593.v0001'] = true,
     ['scmp_002593.v0002'] = true,
     ['scmp_0025- cursed island'] = true,
-    ['scmp_004'] = true,
     ['scmp_0054.v0001'] = true,
     ['scmp_0058.v0001'] = true,
-    ['scmp_006'] = true,
     ['scmp_012_ai.v0001'] = true,
-    ['scmp_015'] = true,
     ['scmp_015expand_ai.v0001'] = true,
     ['scmp_015.v0001'] = true,
     ['scmp_017_3v3.v0001'] = true,
     ['scmp_019_3v3.v0001'] = true,
-    ['scmp_022'] = true,
-    ['scmp_025'] = true,
-    ['scmp_028'] = true,
-    ['scmp_031'] = true,
     ['scmp_041'] = true,
     ['scmp_044 - buttes of war.v0003'] = true,
     ['scmp_044 - buttes of war.v0004'] = true,
@@ -1910,4 +1903,5 @@ MapBlacklist = {
     ['aspro_crater.v0001'] = true,
     ['aspro_crater_remastered.v0001'] = true,
     ['12_ultinate_you_shall_not_pass.v0001.zip'] = true,
+    ['fun setons'] = true,
 }
diff --git a/lua/ui/dialogs/mapselect.lua b/lua/ui/dialogs/mapselect.lua
@@ -231,12 +231,12 @@ mapFilters = {
             SelectedKey = 1,
             Filters = {
                 function(scenInfo)
-                    if CheckMapIsOfficial(scenInfo) then
-                        return true
-                    end
                     if scenInfo.Outdated then
                         return false
                     end
+                    if CheckMapIsOfficial(scenInfo) then
+                        return true
+                    end
                     local version = scenInfo.map_version or 0
                     for _,comparisionlist in scenarios do
                         if scenInfo.name == comparisionlist.name then