Add doc, Fix bug, code simplification (#2335)

* Add doc, Fix bug, code simplification * TypeCastObject & TypeCastMono rewrite Cast
Exiled-Team · Dec 20, 2023 · bfbe175 · bfbe175
1 parent 9a52272
commit bfbe175
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/Exiled.API/Features/Core/EObject.cs b/Exiled.API/Features/Core/EObject.cs
@@ -322,7 +322,7 @@ public static Type GetObjectTypeFromRegisteredTypes(Type type, string name)
         public static EObject CreateDefaultSubobject(Type type, params object[] parameters)
         {
             BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance;
-            EObject @object = Activator.CreateInstance(type, flags, null, parameters, null) is not EObject outer ? null : outer;
+            EObject @object = Activator.CreateInstance(type, flags, null, parameters, null) as EObject;
 
             // Do not use implicit bool conversion as @object may be null
             if (@object != null)

diff --git a/Exiled.API/Features/Core/Generic/EnumClass.cs b/Exiled.API/Features/Core/Generic/EnumClass.cs
@@ -182,7 +182,7 @@ public static TObject Parse(string obj)
         /// Converts the <see cref="EnumClass{TSource, TObject}"/> instance to a human-readable <see cref="string"/> representation.
         /// </summary>
         /// <returns>A human-readable <see cref="string"/> representation of the <see cref="EnumClass{TSource, TObject}"/> instance.</returns>
-        public override string ToString() => name;
+        public override string ToString() => Name;
 
         /// <summary>
         /// Determines whether the specified object is equal to the current object.

diff --git a/Exiled.API/Features/Core/Generic/UnmanagedEnumClass.cs b/Exiled.API/Features/Core/Generic/UnmanagedEnumClass.cs
@@ -204,7 +204,7 @@ public static TObject Parse(string obj)
         /// Converts the <see cref="UnmanagedEnumClass{TSource, TObject}"/> instance to a human-readable <see cref="string"/> representation.
         /// </summary>
         /// <returns>A human-readable <see cref="string"/> representation of the <see cref="UnmanagedEnumClass{TSource, TObject}"/> instance.</returns>
-        public override string ToString() => name;
+        public override string ToString() => Name;
 
         /// <summary>
         /// Determines whether the specified object is equal to the current object.

diff --git a/Exiled.API/Features/Core/StaticActor.cs b/Exiled.API/Features/Core/StaticActor.cs
@@ -42,6 +42,11 @@ public abstract class StaticActor : EActor
         /// </summary>
         public bool IsDestroyed { get; private set; }
 
+        /// <inheritdoc cref="CreateNewInstance"/>
+        /// <typeparam name="T"><inheritdoc path="/param[@name='type']" cref="CreateNewInstance"/></typeparam>
+        public static StaticActor CreateNewInstance<T>()
+            where T : new() => CreateNewInstance(typeof(T));
+
         /// <summary>
         /// Creates a new instance of the <see cref="StaticActor"/>.
         /// </summary>
@@ -60,7 +65,7 @@ public static StaticActor CreateNewInstance(Type type)
         /// <typeparam name="T">The type of the <see cref="StaticActor"/> to look for.</typeparam>
         /// <returns>The corresponding <see cref="StaticActor"/>, or <see langword="null"/> if not found.</returns>
         public static T Get<T>()
-            where T : StaticActor
+            where T : StaticActor, new()
         {
             foreach (StaticActor actor in FindActiveObjectsOfType<StaticActor>())
             {
@@ -70,7 +75,7 @@ public static T Get<T>()
                 return actor.Cast<T>();
             }
 
-            return CreateNewInstance(typeof(T)).Cast<T>();
+            return CreateNewInstance<T>().Cast<T>();
         }
 
         /// <summary>

diff --git a/Exiled.API/Features/Core/TickComponent.cs b/Exiled.API/Features/Core/TickComponent.cs
@@ -21,7 +21,7 @@ namespace Exiled.API.Features.Core
     public sealed class TickComponent : EObject
     {
         /// <summary>
-        /// The default fixed tick rate.
+        /// The default fixed tick rate (60 per second).
         /// </summary>
         public const float DefaultFixedTickRate = 0.016f;
 

diff --git a/Exiled.API/Features/Core/TypeCastMono.cs b/Exiled.API/Features/Core/TypeCastMono.cs
@@ -26,16 +26,17 @@ protected TypeCastMono()
 
         /// <inheritdoc/>
         public TObject Cast<TObject>()
-            where TObject : class, T => this as T as TObject;
+            where TObject : class, T => this as TObject;
 
         /// <inheritdoc/>
         public bool Cast<TObject>(out TObject param)
             where TObject : class, T
         {
-            param = default;
-
-            if (this as TObject is not TObject cast)
+            if (this is not TObject cast)
+            {
+                param = default;
                 return false;
+            }
 
             param = cast;
             return true;

diff --git a/Exiled.API/Features/Core/TypeCastObject.cs b/Exiled.API/Features/Core/TypeCastObject.cs
@@ -25,16 +25,17 @@ protected TypeCastObject()
 
         /// <inheritdoc/>
         public TObject Cast<TObject>()
-            where TObject : class, T => this as T as TObject;
+            where TObject : class, T => this as TObject;
 
         /// <inheritdoc/>
         public bool Cast<TObject>(out TObject param)
             where TObject : class, T
         {
-            param = default;
-
-            if (this as TObject is not TObject cast)
+            if (this is not TObject cast)
+            {
+                param = default;
                 return false;
+            }
 
             param = cast;
             return true;