From dfca5c7567d4c5cd1d5f971823182c5cacc85a05 Mon Sep 17 00:00:00 2001
From: tiCkuhAr <142289931+tiCkuhAr@users.noreply.github.com>
Date: Mon, 6 May 2024 14:11:35 -0600
Subject: [PATCH] Remove useless kicks (#3061)

---
 docs/lua/commands.md                          | 18 +---------
 docs/lua/commands_dump.txt                    |  6 +---
 .../commands/player/kick/bail_kick.cpp        | 35 -------------------
 .../commands/player/kick/multi_kick.cpp       | 12 +++----
 .../player/kick/null_function_kick.cpp        | 29 ---------------
 src/hooks/protections/receive_net_message.cpp |  7 +---
 src/views/players/player/player_kick.cpp      | 12 +++----
 7 files changed, 12 insertions(+), 107 deletions(-)
 delete mode 100644 src/backend/commands/player/kick/bail_kick.cpp
 delete mode 100644 src/backend/commands/player/kick/null_function_kick.cpp

diff --git a/docs/lua/commands.md b/docs/lua/commands.md
index fa5ef8d0..f255a43e 100644
--- a/docs/lua/commands.md
+++ b/docs/lua/commands.md
@@ -11,15 +11,7 @@ command.call_player(somePlayerIndex, "spawn", {joaat("adder")})
 
 For a complete list of available command functions, please refer to the command table documentation.
 
-## Command Count: 213
-
-### bailkick 
- BAIL_KICK_DESC 
-Arg Count:  1
-
-### bailkickall 
- BAIL_KICK_DESC 
-Arg Count:  0
+## Command Count: 209
 
 ### breakup 
  BREAKUP_KICK_DESC 
@@ -45,14 +37,6 @@ Arg Count:  1
  Host kick that only works when host 
 Arg Count:  1
 
-### nfkick 
- NULL_FUNCTION_KICK_DESC 
-Arg Count:  1
-
-### nfkickall 
- NULL_FUNCTION_KICK_DESC 
-Arg Count:  0
-
 ### oomkick 
  OOM_KICK_CMD_DESC 
 Arg Count:  1
diff --git a/docs/lua/commands_dump.txt b/docs/lua/commands_dump.txt
index 6e126c1d..10cee13c 100644
--- a/docs/lua/commands_dump.txt
+++ b/docs/lua/commands_dump.txt
@@ -1,13 +1,9 @@
-[20:46:19.2951571][INFO/command.cpp:48] Command | bailkick | BAIL_KICK | BAIL_KICK_DESC | 1
-[20:46:19.2954010][INFO/command.cpp:48] Command | bailkickall | BAIL_KICK | BAIL_KICK_DESC | 0
 [20:46:19.2954096][INFO/command.cpp:48] Command | breakup | BREAKUP_KICK | BREAKUP_KICK_DESC | 1
 [20:46:19.2954208][INFO/command.cpp:48] Command | breakupcheating | BREAKUP_KICK_SHOW_CHEATING | BREAKUP_KICK_SHOW_CHEATING_DESC | 0
 [20:46:19.2954534][INFO/command.cpp:48] Command | desync | COMPLAINT_KICK | COMPLAINT_KICK_DESC | 1
 [20:46:19.2954565][INFO/command.cpp:48] Command | desyncall | COMPLAINT_KICK | COMPLAINT_KICK_DESC | 0
 [20:46:19.2954673][INFO/command.cpp:48] Command | endkick | END_KICK | END_KICK_DESC | 1
 [20:46:19.2954710][INFO/command.cpp:48] Command | hostkick | Host Kick | Host kick that only works when host | 1
-[20:46:19.2954760][INFO/command.cpp:48] Command | nfkick | NULL_FUNCTION_KICK | NULL_FUNCTION_KICK_DESC | 1
-[20:46:19.2954789][INFO/command.cpp:48] Command | nfkickall | NULL_FUNCTION_KICK | NULL_FUNCTION_KICK_DESC | 0
 [20:46:19.2954887][INFO/command.cpp:48] Command | oomkick | OOM_KICK_CMD | OOM_KICK_CMD_DESC | 1
 [20:46:19.2955047][INFO/command.cpp:48] Command | shkick | SCRIPT_HOST_KICK | SCRIPT_HOST_KICK_DESC | 1
 [20:46:19.2955089][INFO/command.cpp:48] Command | clearwanted | CLEAR_WANTED_LEVEL | CLEAR_WANTED_LEVEL_DESC | 1
@@ -210,4 +206,4 @@
 [20:46:19.5970941][INFO/command.cpp:48] Command | orbitaldrone | Toggle Orbital Drone | Enables/Disables the orbital drone | 0
 [20:46:19.5971135][INFO/command.cpp:48] Command | player_db_auto_update_states | Auto Update Player Online States | Toggling this feature will automatically update the player online states every 5minutes. | 0
 [20:46:19.5971390][INFO/command.cpp:48] Command | vehiclecontrol | Vehicle controller | Enables/Disables the vehicle controller. | 0
-[20:46:19.5972044][INFO/command.cpp:48] Command | cmdexecutor | Toggle Command Executor | Toggles the command executor window | 0
\ No newline at end of file
+[20:46:19.5972044][INFO/command.cpp:48] Command | cmdexecutor | Toggle Command Executor | Toggles the command executor window | 0
diff --git a/src/backend/commands/player/kick/bail_kick.cpp b/src/backend/commands/player/kick/bail_kick.cpp
deleted file mode 100644
index 484a21b1..00000000
--- a/src/backend/commands/player/kick/bail_kick.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
-
-#include <script/globals/GPBD_FM_3.hpp>
-
-namespace big
-{
-	class bail_kick : player_command
-	{
-		using player_command::player_command;
-
-		virtual CommandAccessLevel get_access_level() override
-		{
-			return CommandAccessLevel::TOXIC;
-		}
-
-		virtual void execute(player_ptr player, const command_arguments& _args, const std::shared_ptr<command_context> ctx) override
-		{
-			if (!player)
-				return;
-
-			const size_t arg_count  = 4;
-			int64_t args[arg_count] = {(int64_t)eRemoteEvent::NetworkBail,
-			    (int64_t)self::id,
-			    1 << player->id(),
-			    scr_globals::gpbd_fm_3.as<GPBD_FM_3*>()->Entries[player->id()].ScriptEventReplayProtectionCounter};
-
-			g_pointers->m_gta.m_trigger_script_event(1, args, arg_count, 1 << player->id(), (int)eRemoteEvent::NetworkBail);
-		}
-	};
-
-	bail_kick g_bail_kick("bailkick", "BAIL_KICK", "BAIL_KICK_DESC", 0);
-}
\ No newline at end of file
diff --git a/src/backend/commands/player/kick/multi_kick.cpp b/src/backend/commands/player/kick/multi_kick.cpp
index 7c77b6d3..1d466fba 100644
--- a/src/backend/commands/player/kick/multi_kick.cpp
+++ b/src/backend/commands/player/kick/multi_kick.cpp
@@ -17,20 +17,16 @@ namespace big
 
 		virtual void execute(player_ptr player, const command_arguments& _args, const std::shared_ptr<command_context> ctx) override
 		{
-			dynamic_cast<player_command*>(command::get("nfkick"_J))->call(player, {});
+			if (g_player_service->get_self()->is_host())
+				dynamic_cast<player_command*>(command::get("breakup"_J))->call(player, {}),
+				    dynamic_cast<player_command*>(command::get("hostkick"_J))->call(player, {});
+
 			dynamic_cast<player_command*>(command::get("oomkick"_J))->call(player, {});
-			dynamic_cast<player_command*>(command::get("endkick"_J))->call(player, {});
 			script::get_current()->yield(700ms);
 
-			if (g_player_service->get_self()->is_host())
-				dynamic_cast<player_command*>(command::get("hostkick"_J))->call(player, {});
 
 			if (player && !g_player_service->get_self()->is_host() && player->is_valid() && !player->is_host())
 				dynamic_cast<player_command*>(command::get("desync"_J))->call(player, {});
-
-			if (g_player_service->get_self()->is_host())
-				dynamic_cast<player_command*>(command::get("breakup"_J))->call(player, {}),
-				    NETWORK::NETWORK_SESSION_KICK_PLAYER(player->id());
 		}
 	};
 
diff --git a/src/backend/commands/player/kick/null_function_kick.cpp b/src/backend/commands/player/kick/null_function_kick.cpp
deleted file mode 100644
index 5e32e846..00000000
--- a/src/backend/commands/player/kick/null_function_kick.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "backend/player_command.hpp"
-#include "core/scr_globals.hpp"
-#include "natives.hpp"
-#include "pointers.hpp"
-
-namespace big
-{
-	class null_function_kick : player_command
-	{
-		using player_command::player_command;
-
-		virtual CommandAccessLevel get_access_level() override
-		{
-			return CommandAccessLevel::TOXIC;
-		}
-
-		virtual void execute(player_ptr player, const command_arguments& _args, const std::shared_ptr<command_context> ctx) override
-		{
-			if (!player)
-				return;
-			const size_t arg_count  = 16;
-			int64_t args[arg_count] = {(int64_t)eRemoteEvent::InteriorControl, (int64_t)self::id, 1 << player->id(), (int64_t)(int)-1};
-
-			g_pointers->m_gta.m_trigger_script_event(1, args, arg_count, 1 << player->id(), (int)eRemoteEvent::InteriorControl);
-		}
-	};
-
-	null_function_kick g_null_function_kick("nfkick", "NULL_FUNCTION_KICK", "NULL_FUNCTION_KICK_DESC", 0);
-}
\ No newline at end of file
diff --git a/src/hooks/protections/receive_net_message.cpp b/src/hooks/protections/receive_net_message.cpp
index 2efcba0c..1643f3db 100644
--- a/src/hooks/protections/receive_net_message.cpp
+++ b/src/hooks/protections/receive_net_message.cpp
@@ -129,12 +129,7 @@ namespace big
 					if (g.session.kick_chat_spammers
 					    && !(player->is_trusted || (player->is_friend() && g.session.trust_friends) || g.session.trust_session))
 					{
-						if (g_player_service->get_self()->is_host())
-							dynamic_cast<player_command*>(command::get("breakup"_J))->call(player, {}),
-							    dynamic_cast<player_command*>(command::get("hostkick"_J))->call(player, {});
-
-						dynamic_cast<player_command*>(command::get("endkick"_J))->call(player, {});
-						dynamic_cast<player_command*>(command::get("nfkick"_J))->call(player, {});
+						dynamic_cast<player_command*>(command::get("multikick"_J))->call(player, {});
 					}
 					return true;
 				}
diff --git a/src/views/players/player/player_kick.cpp b/src/views/players/player/player_kick.cpp
index 846ad997..ebbf506b 100644
--- a/src/views/players/player/player_kick.cpp
+++ b/src/views/players/player/player_kick.cpp
@@ -28,15 +28,13 @@ namespace big
 			components::command_checkbox<"breakupcheating">();
 			
 			components::player_command_button<"multikick">(g_player_service->get_selected());
-			ImGui::SameLine();
-			components::player_command_button<"nfkick">(g_player_service->get_selected());
-
+                        ImGui::SameLine();
 			components::player_command_button<"oomkick">(g_player_service->get_selected());
-			ImGui::SameLine();
+			
 			components::player_command_button<"shkick">(g_player_service->get_selected());
-
+                        ImGui::SameLine();
 			components::player_command_button<"endkick">(g_player_service->get_selected());
-			ImGui::SameLine();
+			
 			components::player_command_button<"desync">(g_player_service->get_selected());
 
 			ImGui::EndListBox();
@@ -44,4 +42,4 @@ namespace big
 
 		ImGui::EndGroup();
 	}
-}
\ No newline at end of file
+}