More fixes with some commands

BPEssentials · May 6, 2018 · c603ad4 · c603ad4
1 parent 7d86ef4
commit c603ad4
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/source/BP-Essentials/Chat/Commands/Admin/ExecuteOnPlayer.cs b/source/BP-Essentials/Chat/Commands/Admin/ExecuteOnPlayer.cs
@@ -53,23 +53,26 @@ public static bool Run(object oPlayer, string message, string arg1)
                                     }
                                     else if (message.Contains(CmdBan))
                                     {
-                                        player.SvBan(shPlayer.ID);
+                                        player.svManager.AddBanned(shPlayer);
+                                        player.svManager.Disconnect(shPlayer.svPlayer.connection);
                                         player.SendToSelf(Channel.Unsequenced, 10, $"<color={infoColor}>Banned</color> <color={argColor}>" + shPlayer.username + $"</color><color={infoColor}>.</color>");
                                     }
                                     else if (message.Contains(CmdKick))
                                     {
-                                        player.SvKick(shPlayer.ID);
+                                        player.svManager.Kick(shPlayer.svPlayer.connection);
                                         player.SendToSelf(Channel.Unsequenced, 10, $"<color={infoColor}>Kicked</color> <color={argColor}>" + shPlayer.username + $"</color><color={infoColor}>.</color>");
                                     }
                                     else if (message.Contains(CmdArrest))
                                     {
-                                        player.SvArrest(shPlayer.ID);
+                                        shPlayer.svPlayer.Arrest();
                                         player.SendToSelf(Channel.Unsequenced, 10, $"<color={infoColor}>Arrested</color> <color={argColor}>" + shPlayer.username + $"</color><color={infoColor}>.</color>");
                                     }
                                     else if (message.Contains(CmdRestrain))
                                     {
-                                        player.SvArrest(shPlayer.ID);
-                                        player.SvRestrain(shPlayer.ID);
+                                        shPlayer.svPlayer.Arrest();
+                                        shPlayer.svPlayer.SvSetEquipable(shPlayer.manager.restrained.index);
+                                        if (!shPlayer.svPlayer.IsServerside())
+                                            shPlayer.svPlayer.SendToSelf(Channel.Unsequenced, 10, "You've been restrained");
                                         player.SendToSelf(Channel.Unsequenced, 10, $"<color={infoColor}>Restrained</color> <color={argColor}>" + shPlayer.username + $"</color><color={infoColor}>.</color>");
                                     }
                                     else if (message.Contains(CmdKill))