Merge branch 'develop' into stable

Pathoschild · Jun 21, 2020 · ba0dff8 · ba0dff8
2 parents e64ecc8 + 4f73fb5
commit ba0dff8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/build/common.targets b/build/common.targets
@@ -4,7 +4,7 @@
 
   <!--set properties -->
   <PropertyGroup>
-    <Version>3.6.0</Version>
+    <Version>3.6.1</Version>
     <Product>SMAPI</Product>
 
     <LangVersion>latest</LangVersion>

diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -7,6 +7,11 @@
   * Migrated to Harmony 2.0 (see [_migrate to Harmony 2.0_](https://stardewvalleywiki.com/Modding:Migrate_to_Harmony_2.0) for more info).
 -->
 
+## 3.6.1
+Released 21 June 2020 for Stardew Valley 1.4.1 or later.
+
+* Fixed event priority sorting.
+
 ## 3.6
 Released 20 June 2020 for Stardew Valley 1.4.1 or later.
 

diff --git a/src/SMAPI.Mods.ConsoleCommands/manifest.json b/src/SMAPI.Mods.ConsoleCommands/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Console Commands",
     "Author": "SMAPI",
-    "Version": "3.6.0",
+    "Version": "3.6.1",
     "Description": "Adds SMAPI console commands that let you manipulate the game.",
     "UniqueID": "SMAPI.ConsoleCommands",
     "EntryDll": "ConsoleCommands.dll",
-    "MinimumApiVersion": "3.6.0"
+    "MinimumApiVersion": "3.6.1"
 }
diff --git a/src/SMAPI.Mods.SaveBackup/manifest.json b/src/SMAPI.Mods.SaveBackup/manifest.json
@@ -1,9 +1,9 @@
 {
     "Name": "Save Backup",
     "Author": "SMAPI",
-    "Version": "3.6.0",
+    "Version": "3.6.1",
     "Description": "Automatically backs up all your saves once per day into its folder.",
     "UniqueID": "SMAPI.SaveBackup",
     "EntryDll": "SaveBackup.dll",
-    "MinimumApiVersion": "3.6.0"
+    "MinimumApiVersion": "3.6.1"
 }
diff --git a/src/SMAPI/Constants.cs b/src/SMAPI/Constants.cs
@@ -20,7 +20,7 @@ public static class Constants
         ** Public
         ****/
         /// <summary>SMAPI's current semantic version.</summary>
-        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.6.0");
+        public static ISemanticVersion ApiVersion { get; } = new Toolkit.SemanticVersion("3.6.1");
 
         /// <summary>The minimum supported version of Stardew Valley.</summary>
         public static ISemanticVersion MinimumGameVersion { get; } = new GameVersion("1.4.1");

diff --git a/src/SMAPI/Framework/Events/ManagedEventHandler.cs b/src/SMAPI/Framework/Events/ManagedEventHandler.cs
@@ -47,7 +47,7 @@ public int CompareTo(object obj)
             if (!(obj is ManagedEventHandler<TEventArgs> other))
                 throw new ArgumentException("Can't compare to an unrelated object type.");
 
-            int priorityCompare = this.Priority.CompareTo(other.Priority);
+            int priorityCompare = -this.Priority.CompareTo(other.Priority); // higher value = sort first
             return priorityCompare != 0
                 ? priorityCompare
                 : this.RegistrationOrder.CompareTo(other.RegistrationOrder);