From 29d8e440550ee00d6cbdf14f75312ea58c781254 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 5 Nov 2020 20:00:21 -0800
Subject: [PATCH] Always allow access to the serverplayer

---
 src/dehacked.c      |  7 +++----
 src/lua_playerlib.c | 16 +++++++++++++++-
 src/lua_script.c    |  8 ++++++++
 src/lua_script.h    |  1 +
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 00f4fa96..10150751 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -9704,11 +9704,10 @@ static inline int lib_getenum(lua_State *L)
 		lua_pushinteger(L, mapmusposition);
 		return 1;
 	} else if (fastcmp(word,"server")) {
-		if ((!multiplayer || !(netgame || demo.playback)) && !playeringame[serverplayer])
-			return 0;
-		LUA_PushUserdata(L, &players[serverplayer], META_PLAYER);
-		return 1;
+		return LUA_PushServerPlayer(L);
 	} else if (fastcmp(word,"consoleplayer")) {	// Player controlling the console, basically our local player
+		if (consoleplayer == serverplayer)
+			return LUA_PushServerPlayer(L);
 		if (consoleplayer < 0 || !playeringame[consoleplayer])
 			return 0;
 		LUA_PushUserdata(L, &players[consoleplayer], META_PLAYER);
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index 3aeeed73..c4c996e5 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -27,17 +27,28 @@
 static int lib_iteratePlayers(lua_State *L)
 {
 	INT32 i = -1;
+
 	if (lua_gettop(L) < 2)
 	{
 		//return luaL_error(L, "Don't call players.iterate() directly, use it as 'for player in players.iterate do <block> end'.");
 		lua_pushcfunction(L, lib_iteratePlayers);
 		return 1;
 	}
+
 	lua_settop(L, 2);
 	lua_remove(L, 1); // state is unused.
+
 	if (!lua_isnil(L, 1))
 		i = (INT32)(*((player_t **)luaL_checkudata(L, 1, META_PLAYER)) - players);
-	for (i++; i < MAXPLAYERS; i++)
+
+	i++;
+
+	if (i == serverplayer)
+	{
+		return LUA_PushServerPlayer(L);
+	}
+
+	for (; i < MAXPLAYERS; i++)
 	{
 		if (!playeringame[i])
 			continue;
@@ -46,6 +57,7 @@ static int lib_iteratePlayers(lua_State *L)
 		LUA_PushUserdata(L, &players[i], META_PLAYER);
 		return 1;
 	}
+
 	return 0;
 }
 
@@ -58,6 +70,8 @@ static int lib_getPlayer(lua_State *L)
 		lua_Integer i = luaL_checkinteger(L, 2);
 		if (i < 0 || i >= MAXPLAYERS)
 			return luaL_error(L, "players[] index %d out of range (0 - %d)", i, MAXPLAYERS-1);
+		if (i == serverplayer)
+			return LUA_PushServerPlayer(L);
 		if (!playeringame[i])
 			return 0;
 		if (!players[i].mo)
diff --git a/src/lua_script.c b/src/lua_script.c
index 7c951efb..ee49efcc 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -367,6 +367,14 @@ void LUA_PushUserdata(lua_State *L, void *data, const char *meta)
 	lua_remove(L, -2); // remove LREG_VALID
 }
 
+int LUA_PushServerPlayer(lua_State *L)
+{
+	if ((!multiplayer || !(netgame || demo.playback)) && !playeringame[serverplayer])
+		return 0;
+	LUA_PushUserdata(L, &players[serverplayer], META_PLAYER);
+	return 1;
+}
+
 // When userdata is freed, use this function to remove it from Lua.
 void LUA_InvalidateUserdata(void *data)
 {
diff --git a/src/lua_script.h b/src/lua_script.h
index b3ca16bc..5e2e171f 100644
--- a/src/lua_script.h
+++ b/src/lua_script.h
@@ -46,6 +46,7 @@ void LUA_DumpFile(const char *filename);
 #endif
 fixed_t LUA_EvalMath(const char *word);
 void LUA_PushUserdata(lua_State *L, void *data, const char *meta);
+int  LUA_PushServerPlayer(lua_State *L);
 void LUA_InvalidateUserdata(void *data);
 void LUA_InvalidateLevel(void);
 void LUA_InvalidateMapthings(void);