Updated game object extensions and libs

Author: ShimmyMySherbet

ShimmysAdminTools/Commands/PointToolCommand.cs

@@ -34,12 +34,12 @@ public void Execute(IRocketPlayer caller, string[] command)
                 if (Session.PointToolEnabled)
                 {
                     UnturnedChat.Say(caller, "PointTool_EnabledActive".Translate(Session.PointTool));
-                    Player.Player.transform.GetOrAddComponent<PointToolInputListener>();
+                    Player.Player.gameObject.AddComponent<PointToolInputListener>();
                 }
                 else
                 {
                     UnturnedChat.Say(caller, "PointTool_Disabled".Translate());
-                    Player.Player.transform.DestroyComponentIfExists<PointToolInputListener>();
+                    Player.Player.gameObject.DestroyComponentIfExists<PointToolInputListener>();
 
                 }
             }
@@ -91,7 +91,7 @@ public void Execute(IRocketPlayer caller, string[] command)
                         {
                             Session.PointToolEnabled = true;
                             UnturnedChat.Say(caller, Send + "PointTool_Extension_Enabled".Translate());
-                            Player.Player.transform.GetOrAddComponent<PointToolInputListener>();
+                            Player.Player.gameObject.AddComponent<PointToolInputListener>();
 
                         }
                     }

ShimmysAdminTools/Components/Extensions.cs

@@ -1,14 +1,11 @@
 using Rocket.API;
-using Rocket.Core;
+using Rocket.API.Extensions;
 using Rocket.Unturned.Player;
 using ShimmysAdminTools.Models;
 using ShimmysAdminTools.Modules;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine.Rendering;
+using UnityEngine;
 
 namespace ShimmysAdminTools.Components
 {
@@ -17,7 +14,7 @@ public static class Extensions
         public static IEnumerable<R> CastEnumeration<T, R>(this IEnumerable<T> Inp, Func<T, R> Castingmethod)
         {
             List<R> Res = new List<R>();
-            foreach(T InpE in Inp)
+            foreach (T InpE in Inp)
             {
                 Res.Add(Castingmethod(InpE));
             }
@@ -28,6 +25,7 @@ public static PlayerSession GetSession(this IRocketPlayer Player)
         {
             return ((UnturnedPlayer)Player).GetSession();
         }
+
         public static PlayerSession GetSession(this UnturnedPlayer Player)
         {
             return PlayerSessionStore.GetPlayerData(Player);
@@ -37,9 +35,35 @@ public static UnturnedPlayer UPlayer(this IRocketPlayer caller)
         {
             return (UnturnedPlayer)caller;
         }
+
         public static string Translate(this string Translation, params object[] Args)
         {
             return AdminToolsPlugin.Instance.Translate(Translation, Args);
         }
+
+        public static T getOrAddComponent<T>(this GameObject go) where T : UnityEngine.Component
+        {
+            var obj = go.GetComponent<T>();
+
+            if (obj != null)
+            {
+                return obj;
+            }
+
+            obj = go.AddComponent<T>();
+
+            return obj;
+        }
+
+        public static void DestroyComponentIfExists<T>(this GameObject go) where T : UnityEngine.Component
+        {
+            var obj = go.GetComponent<T>();
+            if (obj != null)
+            {
+                GameObject.Destroy(obj);
+            }
+        }
+
+
     }
-}
+}

ShimmysAdminTools/Libs/Assembly-CSharp.dll

@@ -3,6 +3,8 @@
 using ShimmysAdminTools.Modules;
 using ShimmysAdminTools.Behaviors;
 using UnityEngine;
+using Rocket.API.Extensions;
+using ShimmysAdminTools.Components;
 
 namespace ShimmysAdminTools.Models
 {
@@ -40,17 +42,17 @@ public void StartMapJumpingSession()
             {
                 MapJumpingSession = new GameObject("MapJumpingSession");
                 UnityEngine.Object.DontDestroyOnLoad(MapJumpingSession);
-                MapJumpingSession.AddComponent<MapJumpingSession>();
+                var c =MapJumpingSession.AddComponent<MapJumpingSession>();
                 UnturnedPlayer pl = UnturnedPlayer.FromCSteamID(new Steamworks.CSteamID(Player));
-                GameObjectExtension.getOrAddComponent<MapJumpingSession>(MapJumpingSession).SetPlayer(pl);
+                c.SetPlayer(pl);
             }
         }
 
         public void StartFlightSession()
         {
             if (!FlySessionActive)
             {
-                FlightSession NewFly = UPlayer.Player.transform.GetOrAddComponent<FlightSession>();
+                FlightSession NewFly = UPlayer.Player.gameObject.AddComponent<FlightSession>();
                 NewFly.SetReady(UPlayer);
                 FlySession = NewFly;
             }
@@ -62,7 +64,7 @@ public void StopFlightSession()
             if (FlySessionActive)
             {
                 FlySession.Stop();
-                UPlayer.Player.transform.DestroyComponentIfExists<FlightSession>();
+                UPlayer.Player.gameObject.DestroyComponentIfExists<FlightSession>();
                 FlySession = null;
             }
         }