修复RemoveAll空引用异常

KumoKyaku · Jan 9, 2024 · e734945 · e734945
1 parent ab8ee89
commit e734945
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 2 deletions.
diff --git a/Megumin.Explosion/Megumin/Class/Multiple.cs b/Megumin.Explosion/Megumin/Class/Multiple.cs
@@ -157,16 +157,24 @@ public virtual V RemoveAll(int raiseEvent = 0)
 
             //    //微软源码直接用泛型与null比较,这里不做判断了，增加两个构造函数保证DefaultKey 不为null。
             //}
+            if (DefaultKey is not null)
+            {
+                ElementDic[DefaultKey] = DefaultValue;
+            }
 
-            ElementDic[DefaultKey] = DefaultValue;
             ApplyValue(raiseEvent);
             return Current;
         }
 
         public V RemoveAll(Func<KeyValuePair<K, V>, bool> predicate, int raiseEvent = 0)
         {
             ElementDic.RemoveAll(predicate);
-            ElementDic[DefaultKey] = DefaultValue;
+
+            if (DefaultKey is not null)
+            {
+                ElementDic[DefaultKey] = DefaultValue;
+            }
+
             ApplyValue(raiseEvent);
             return Current;
         }

diff --git a/Megumin.UnityPackage/Packages/megumin.explosion4unity/Plugins/Megumin.Explosion.dll b/Megumin.UnityPackage/Packages/megumin.explosion4unity/Plugins/Megumin.Explosion.dll
diff --git a/Megumin.UnityPackage/Packages/megumin.explosion4unity/Plugins/Megumin.Explosion.pdb b/Megumin.UnityPackage/Packages/megumin.explosion4unity/Plugins/Megumin.Explosion.pdb
diff --git a/Megumin.UnityPackage/Packages/megumin.explosion4unity/Plugins/Megumin.Explosion.xml b/Megumin.UnityPackage/Packages/megumin.explosion4unity/Plugins/Megumin.Explosion.xml