From 33ae95bf134571967f3f9875e5b3efeb2a352127 Mon Sep 17 00:00:00 2001
From: Shane Ellis <cobaltbw@gmail.com>
Date: Mon, 12 Jul 2021 23:38:52 -0400
Subject: [PATCH] G_RemovePlayer error handling

---
 src/lua_baselib.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 9946a9fd3..34d1b1a94 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -3482,15 +3482,16 @@ static int lib_gAddPlayer(lua_State *L)
 static int lib_gRemovePlayer(lua_State *L)
 {
 	UINT8 pnum = -1;
-	//const char *kickreason = luaL_checkstring(L, 2);
-	
 	if (!lua_isnoneornil(L, 1))
 		pnum = luaL_checkinteger(L, 1);
-	if (&players[pnum])
+	else // No argument
+		return luaL_error(L, "argument #1 not given (expected number)");
+	if (pnum >= MAXPLAYERS) // Out of range
+		return luaL_error(L, "playernum %d out of range (0 - %d)", pnum, MAXPLAYERS-1);
+	if (playeringame[pnum]) // Found player
 	{
-		if (players[pnum].bot != BOT_NONE)
+		if (players[pnum].bot != BOT_NONE) // Can't remove clients.
 		{
-//			CL_RemovePlayer(pnum, *kickreason);
 			CL_RemovePlayer(pnum, pnum);
 			if (netgame)
 			{
@@ -3503,9 +3504,11 @@ static int lib_gRemovePlayer(lua_State *L)
 			lua_pushboolean(L, true);
 			return 1;
 		}
+		else
+			return luaL_error(L, "G_RemovePlayer can only be used on players with a bot value other than BOT_NONE.");
 	}
-	lua_pushboolean(L, false);
-	return 1;
+	// Fell through. Invalid player
+	return LUA_ErrInvalid(L, "player_t");
 }