Merge pull request #21 from cactus-patch/Beta-Branch

I have tested this and have found no bugs nor could I replicate the workstation bug

Author: Noobest1001

ChangeLog.md

@@ -1,12 +1 @@
-># Update 3.1.0
->
->>## SCP-1289 (formerly <i>'Coin'</i>)
->>> #### Renamed the coin
->>> #### Added death and winning notes
->>>> Due to a limitation of Exiled only the player who gets killed by the coin can see the new effects added by yours truly
->>
->>## Tranq
->>> Made the player who got tranqed invulnerable but unable to use any items (humans)
->>
->>## Genaral code
->>> Added some notes in the 'Util.cs' file for those who want to add on to this
+>#Update 3.2.1

Commands/CustomKeycard

@@ -6,7 +6,7 @@ namespace ExtendedItems.Commands.Debug
     [CommandHandler(typeof(ClientCommandHandler))]
     class PlasticDebug : ICommand
     {
-        
+
         public string Command => "Ddetonate";
 
         public string[] Aliases => ["Ddet", "Dd", "Dboom"];

Commands/Debug/AdminPlastic.cs

@@ -1,6 +1,5 @@
 using CommandSystem;
 using Exiled.API.Features;
-using ExtendedItems.Commands.GuideBook;
 
 namespace ExtendedItems.Commands.Debug
 {
@@ -11,7 +10,7 @@ internal sealed class Debug : ParentCommand
 
         public static Debug Instance { get; } = new();
         public override string Command => "Debug";
-        public override string[] Aliases => [ "db" ];
+        public override string[] Aliases => ["db"];
         public override string Description => "Overlord command for debugging the ExtendedItems plugin";
 
         public override void LoadGeneratedCommands()
@@ -20,7 +19,7 @@ public override void LoadGeneratedCommands()
         }
         protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            if(!sender.CheckPermission(Plugin.Instance!.Config.DebugPermissions))
+            if (!sender.CheckPermission(Plugin.Instance!.Config.DebugPermissions))
             {
                 response = "<color=red>Permission Denied.</color>";
                 Log.Error($"{sender} tried to access admin commands!");

Commands/Debug/Debug.cs

@@ -1,19 +1,15 @@
-using System.Text;
 using CommandSystem;
-
 using Exiled.API.Features;
-using Exiled.API.Features.Pools;
-using Exiled.CustomItems;
-using Exiled.CustomItems.API;
 using Exiled.CustomItems.API.Features;
+using System.Text;
 
 
 namespace ExtendedItems.Commands.Debug
 {
     internal sealed class Locate : ICommand
     {
         public static Locate Instance { get; } = new();
-        public Locate() {}
+        public Locate() { }
         public string Command => "Locate";
         public string[] Aliases => ["loc", "find"];
         public string Description => "Locates all (unless a valid ID is given) Custom Items";

Commands/Debug/Locate.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using CommandSystem;
+using CommandSystem;
 
 namespace ExtendedItems.Commands.GuideBook
 {
@@ -13,7 +8,7 @@ private Coinc() { }
 
         public static Coinc Instance { get; } = new();
         public string Command => "coin";
-        public string[] Aliases => [ "1289" ];
+        public string[] Aliases => ["1289"];
         public string Description => "Information on SCP-1289 (aka \"Coin\" or \"Colin\") ";
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {

Commands/GuideBook/Coin.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using CommandSystem;
+using CommandSystem;
 
 namespace ExtendedItems.Commands.GuideBook
 {

Commands/GuideBook/Help.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using CommandSystem;
+using CommandSystem;
 
 namespace ExtendedItems.Commands.GuideBook
 {

Commands/GuideBook/Sniper.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using CommandSystem;
+using CommandSystem;
 
 namespace ExtendedItems.Commands
 {
@@ -13,7 +8,7 @@ internal sealed class Main : ParentCommand
         public Main() { LoadGeneratedCommands(); }
 
         public override string Command => "ExtendedItems";
-        public override string[] Aliases => [ "ei", "extendeditems", "eis" ];
+        public override string[] Aliases => ["ei", "extendeditems", "eis"];
         public override string Description => "Overlord command for the ExtendedItems plugin";
 
         public override void LoadGeneratedCommands()

Commands/Main.cs

@@ -4,6 +4,7 @@
 namespace ExtendedItems.Commands
 {
     [CommandHandler(typeof(ClientCommandHandler))]
+
     class Plastic : ICommand
     {
         public string Command => "detonate";
@@ -15,6 +16,7 @@ class Plastic : ICommand
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
             Player ply = Player.Get(sender);
+            Log.Debug($"Player: {ply.Nickname} executed the detonate command.");
             if (!Items.Plastic.PlacedCharges.ContainsValue(ply))
             {
                 response = "\n<color=red>You've haven't placed any C4 charges!</color>";
@@ -24,12 +26,12 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
             int i = 0;
             foreach (var charge in Items.Plastic.PlacedCharges.ToList())
             {
-                float posy =  charge.Key.Position.y;
+                float posy = charge.Key.Position.y;
                 if (charge.Value != ply) continue;
-                
-                if (ply.Position.y >= posy - 100 && ply.Position.y <= posy + 100 )
+
+                if (ply.Position.y >= posy - 100 && ply.Position.y <= posy + 100)
                 {
-                    Items.Plastic.Instance.Handler(charge.Key, Items.Plastic.C4RemoveMethod.Detonate);
+                    Items.Plastic.Instance.Handler(charge.Key, Items.Plastic.C4RemoveMethod.Detonate, ply);
                     i++;
                 }
                 else