yse

Author: NotIntense

TestingDummies/Commands/DummyStats.cs

@@ -21,17 +21,21 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
             response = "You do not have the needed permissions to run this command! Needed perms : devdummies";
             return false;
         }
+
         if (arguments.Count != 1)
         {
             response = "Incorrect arguments. Usage: dummystats [dummyID]";
             return false;
         }
+
         Player Dummy = Player.Get(arguments.At(0));
+
         if (Dummy == null)
         {
             response = $"The player with the specified ID, '{arguments.At(0)}', dosent exist!";
             return false;
         }
+
         if (Dummy.IsNPC)
         {
             List<string> effectNames = Dummy.ActiveEffects.Select(effect => effect.name).ToList();

TestingDummies/Commands/RemoveDummy.cs

@@ -17,35 +17,39 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
     {
         if (!Extensions.HasDummyPermissions(Player.Get(sender)))
         {
-            response = "You do not have the needed permissions to run this command! Needed perms : devdummies";
+            response = "You do not have the needed permissions to run this command! Needed perms: devdummies";
             return false;
         }
+
         if (arguments.Count != 1)
         {
             response = "Insufficient arguments. Usage: removedummy [dummyID]";
             return false;
         }
-        Player Dummy = Player.Get(arguments.At(0));
-        if(Dummy == null)
+
+        Player dummy = Player.Get(arguments.At(0));
+
+        if (dummy == null)
         {
-            response = $"The player with the specified ID, '{arguments.At(0)}', dosent exist!";
+            response = $"The player with the specified ID, '{arguments.At(0)}', doesn't exist!";
             return false;
         }
-        if(Dummy.IsNPC)           
+
+        if (dummy.IsNPC)
         {
-            Dummy.ReferenceHub.OnDestroy();
+            Npc npcDummy = dummy as Npc;
+            npcDummy.Destroy();
 
-            LeftEventArgs newLeft = new(Dummy);
+            LeftEventArgs newLeft = new(npcDummy);
             Exiled.Events.Handlers.Player.OnLeft(newLeft);
 
-            response = $"Removed {Dummy.Nickname}!";
+            response = $"Removed {dummy.Nickname}!";
             return true;
         }
         else
         {
-            response = $"ID : '{Dummy.Id}', Nickname : '{Dummy.Nickname}' is not a dummy or you entered a incorrect ID!";
+            response = $"ID: '{dummy.Id}', Nickname: '{dummy.Nickname}' is not a dummy or you entered an incorrect ID!";
             return false;
         }
     }
-
 }

TestingDummies/Commands/SpawnDummy.cs

@@ -2,6 +2,7 @@
 using Exiled.API.Features;
 using PlayerRoles;
 using System;
+using TestingDummies.SpawningHandler;
 
 namespace TestingDummies.Commands;
 
@@ -14,33 +15,38 @@ public class SpawnDummy : ICommand
     public string Description => "Spawns a dummy for development or testing purposes, it has 0 logic";
 
     public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
-    {           
+    {
         if (arguments.Count != 3)
         {
-            response = "Incorrect arguments. Usage: spawndummy [name] [role] [playerID] OR [playerNickname]";
+            response = "Incorrect arguments. Usage: spawndummy [name] [role] ([playerID] or [playerNickname])";
             return false;
         }
+
         string name = arguments.At(0);
         string roleString = arguments.At(1);
         Player player = Player.Get(arguments.At(2));
+
         if (!Enum.TryParse(roleString, out RoleTypeId role))
         {
             response = $"Invalid role: {roleString}";
             return false;
         }
+
         if (player == null)
         {
             response = $"Invalid player with the specified ID or Nickname: {arguments.At(2)}";
             return false;
         }
+
         if (!Extensions.HasDummyPermissions(player))
         {
-            response = "You do not have the needed permissions to run this command! Needed perms : devdummies";
+            response = "You do not have the needed permissions to run this command! Needed perms: devdummies";
             return false;
         }
-        Plugin.Instance.spawning.SpawnDummy(name, role, player);            
+
+        Spawn.SpawnDummy(name, role, player);
+
         response = $"Spawned dummy with name '{name}', role '{role}', for player '{player.Nickname}'";
         return true;
     }
-
 }

TestingDummies/Config.cs

@@ -23,6 +23,7 @@ public class Config : IConfig
         [Description("Gives spawned NPCs AFK Immunity (HIGHLY RECOMMENED TO KEEP TRUE AS NPCS ARE CONSTANTLY AFK)")]
         public bool NPCAFKImmunity { get; set; } = true;
 
+        [Description("Gets or sets if using DevDummy commands require the 'devdummies' permission.")]
         public bool RequirePermission { get; set; } = false;
     }
 }

TestingDummies/Plugin.cs

@@ -1,8 +1,6 @@
 using Exiled.API.Enums;
 using Exiled.API.Features;
 using System;
-using TestingDummies.SpawningHandler;
-using HarmonyLib;
 using Exiled.Permissions.Extensions;
 using UnityEngine;
 
@@ -11,7 +9,6 @@ namespace TestingDummies;
 public class Plugin : Plugin<Config>
 {
     public static Plugin Instance;
-    public Spawn spawning;
 
     public override string Name => "Dev Dummies";
     public override string Prefix => Name;
@@ -23,16 +20,13 @@ public class Plugin : Plugin<Config>
     public override void OnEnabled()
     {           
         Instance = this;
-        spawning = new Spawn();
-
         base.OnEnabled();
-
         Log.Warn($"{Name.ToUpper()} DOES AND WILL VIOLATE NORTHWOOD VSR WHEN DUMMIES ARE SPAWNED. USE ON PRIVATE SERVERS ONLY AND AT YOUR OWN RISK.");
     }
 
     public override void OnDisabled()
     {
-        spawning = null;
+        Instance = null;
         base.OnDisabled();
     }                
 }
@@ -50,7 +44,6 @@ public static bool HasDummyPermissions(this Player player)
         return true;
     }
 
-    //Needed to properly rotate dummies
     public static (ushort horizontal, ushort vertical) ToClientUShorts(this Quaternion rotation)
     {
         const float ToHorizontal = ushort.MaxValue / 360f;

TestingDummies/SpawningHandler/Spawn.cs

@@ -5,7 +5,7 @@ namespace TestingDummies.SpawningHandler;
 
 public class Spawn 
 {
-    public void SpawnDummy(string Name, RoleTypeId Role, Player Target)
+    public static void SpawnDummy(string Name, RoleTypeId Role, Player Target)
     {
         Npc GeneratedNPC = Npc.Spawn(Name, Role, position: Target.Position);
         if (Plugin.Instance.Config.NPCAFKImmunity) GeneratedNPC.RemoteAdminPermissions = PlayerPermissions.AFKImmunity;

TestingDummies/TestingDummies.csproj

@@ -83,7 +83,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="EXILED">
-      <Version>8.2.1</Version>
+      <Version>8.3.9</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />