Possibly fixed NRE on customrole give command (#2754)

* Re-added customrole and customitem commands. * fix stylecop momento * Possible fix for cr give NRE * Possibly fixed NRE on customrole give command. --------- Co-authored-by: Nao <[email protected]>
Exiled-Team · Jul 26, 2024 · a9e9045 · a9e9045
1 parent ed9b58e
commit a9e9045
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/Exiled.CustomModules/API/Commands/CustomRoles/Give.cs b/Exiled.CustomModules/API/Commands/CustomRoles/Give.cs
@@ -17,7 +17,6 @@ namespace Exiled.CustomModules.API.Commands.CustomRoles
     using Exiled.CustomModules.API.Features;
     using Exiled.CustomModules.API.Features.CustomRoles;
     using Exiled.Permissions.Extensions;
-    using RemoteAdmin;
 
     /// <summary>
     /// The command to give a role to player(s).
@@ -67,17 +66,17 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
 
                 if (arguments.Count == 1)
                 {
-                    if (sender is PlayerCommandSender playerCommandSender)
-                    {
-                        Pawn player = Player.Get(playerCommandSender).Cast<Pawn>();
+                    Pawn player = Player.Get(arguments.At(1)).Cast<Pawn>();
 
-                        role.Spawn(player);
-                        response = $"{role.Name} given to {player.Nickname}.";
-                        return true;
+                    if (player is null)
+                    {
+                        response = "Player not found";
+                        return false;
                     }
 
-                    response = "Failed to provide a valid player.";
-                    return false;
+                    role.Spawn(player);
+                    response = $"{role.Name} given to {player.Nickname}.";
+                    return true;
                 }
 
                 string identifier = string.Join(" ", arguments.Skip(1));