Update 3.10.4

Athlon007 · Dec 10, 2022 · 45670f3 · 45670f3
1 parent 6b74769
commit 45670f3
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 3.10.4 (10.12.2022)
+
+### Bug Fixes
+
+- Fixed MOP rules not applying the Ignore rule for WorldObjectManager.Add by object name
+- Fixed compatibility with the Expanded Winter Features mod
+
 ## 3.10.3 (09.12.2022)
 
 ### Bug Fixes

diff --git a/MOP/Properties/AssemblyInfo.cs b/MOP/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.10.3.0")]
-[assembly: AssemblyFileVersion("3.10.3.0")]
+[assembly: AssemblyVersion("3.10.4.0")]
+[assembly: AssemblyFileVersion("3.10.4.0")]
diff --git a/MOP/Resources/changelog.txt b/MOP/Resources/changelog.txt
@@ -1,3 +1,4 @@
 ### Bug Fixes
 
-- Fixed warnings caused by the latest My Summer Car update
+- Fixed MOP rules not applying the Ignore rule for WorldObjectManager.Add by object name
+- Fixed compatibility with the Expanded Winter Features mod
diff --git a/MOP/src/MOP.cs b/MOP/src/MOP.cs
@@ -35,7 +35,7 @@ public class MOP : Mod
         public override string ID => "MOP";
         public override string Name => "MODERN OPTIMIZATION PLUGIN";
         public override string Author => "Athlon"; //Your Username
-        public override string Version => "3.10.3"; //Version
+        public override string Version => "3.10.4"; //Version
         public const string SubVersion = ""; // NIGHTLY-yyyymmdd | BETA_x | RC_
 #if PRO
         public const string Edition = "Mod Loader Pro";

diff --git a/MOP/src/Managers/WorldObjectManager.cs b/MOP/src/Managers/WorldObjectManager.cs
@@ -58,7 +58,16 @@ public WorldObjectManager()
         /// <param name="rendererOnly">If true, only game object's renderer will get toggled.</param>
         /// <param name="silent">Skips the error message.</param>
         public GenericObject Add(string gameObjectName, DisableOn disableOn, int distance = 200, ToggleModes toggleMode = ToggleModes.Simple, bool silent = false)
-        {
+        {
+            IgnoreRule rule = RulesManager.Instance.GetList<IgnoreRule>().Find(f => f.ObjectName == gameObjectName);
+            if (rule != null)
+            {
+                if (rule.TotalIgnore)
+                    return null;
+
+                toggleMode = ToggleModes.Renderer;
+            }
+
             GameObject gm = GameObject.Find(gameObjectName);
 
             if (gm == null)

diff --git a/Rulefiles/Database/Expanded_Winter_Features.mopconfig b/Rulefiles/Database/Expanded_Winter_Features.mopconfig
@@ -0,0 +1,2 @@
+## Expanded_Winter_Features
+ignore: WHEAT fullIgnore
diff --git a/Rulefiles/Database/servercontent.mop b/Rulefiles/Database/servercontent.mop
@@ -35,4 +35,5 @@ DrivableBus,10.03.2022
 GlassesBox,07.07.2022
 ActualMop,04.09.2022
 GT_Interior,04.09.2022
-JONNEZ_Basket,09.10.2022
+JONNEZ_Basket,09.10.2022
+Expanded_Winter_Features,10.12.2022
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		## Expanded_Winter_Features
		ignore: WHEAT fullIgnore