release v2.3.224

fluffy-mods · Jul 28, 2021 · 3c0e620 · 3c0e620
1 parent 186159b
commit 3c0e620
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/Assemblies/MusicManager.dll b/Assemblies/MusicManager.dll
diff --git a/Source/Columns/Column_Seasons.cs b/Source/Columns/Column_Seasons.cs
@@ -32,11 +32,9 @@ public List<Season> FilterSeasons {
         }
 
         public override int Compare(SongDef a, SongDef b) {
-            if (a?.allowedSeasons == null && b?.allowedSeasons == null) {
-                return 0;
-            }
-
-            return (a?.allowedSeasons) == null
+            return a?.allowedSeasons == null && b?.allowedSeasons == null
+                ? 0
+                : (a?.allowedSeasons) == null
                 ? -1
                 : b?.allowedSeasons == null ? 1 : a.allowedSeasons.Sum(s => (int) s + 10) - b.allowedSeasons.Sum(s => (int) s + 10);
         }

diff --git a/Source/MusicDatabase.cs b/Source/MusicDatabase.cs
@@ -157,11 +157,9 @@ public bool HasCustomMetaData {
                     return true;
                 }
 
-                if (time != original.time) {
-                    return true;
-                }
-
-                return seasons?.Count != original.seasons?.Count || ((seasons != null || original.seasons != null) && (seasons.Except(original.seasons).Any() || original.seasons.Except(seasons).Any()));
+                return time != original.time
+                    ? true
+                    : seasons?.Count != original.seasons?.Count || ((seasons != null || original.seasons != null) && (seasons.Except(original.seasons).Any() || original.seasons.Except(seasons).Any()));
             }
         }
 

diff --git a/modinfo.json b/modinfo.json
@@ -5,7 +5,7 @@
     "url": "https://github.com/fluffy-mods/MusicManager",
     "version": {
         "major": 2,
-        "minor": 2,
+        "minor": 3,
         "build": 224
     },
     "author": {
@@ -19,6 +19,15 @@
         "url": "https://github.com/fluffy-mods/MusicManager"
     },
     "changelog": [
+        {
+            "date": "2021-07-28T22:20:02.000Z",
+            "message": "disable mod in pre-game screens, code style stuff",
+            "author": {
+                "name": "FluffierThanThou",
+                "email": "[email protected]"
+            },
+            "hash": "186159bc0761c24ac8c8fd16784e79b923ef2d20"
+        },
         {
             "date": "2021-07-28T08:53:17.000Z",
             "message": "add some checks and logging to audioSource getter",