From 3dff1eb1b71af5c483238d63fcf5c6a5adcbecb8 Mon Sep 17 00:00:00 2001
From: LJ Sonic <lamr@free.fr>
Date: Thu, 11 Feb 2021 00:10:15 +0100
Subject: [PATCH] Fix consoleplayer returning the server player during joining
phase
---
src/lua_script.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lua_script.c b/src/lua_script.c
index bc88928f3f..7fd5a98e6f 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -333,7 +333,7 @@ int LUA_PushGlobals(lua_State *L, const char *word)
return 1;
// local player variables, by popular request
} else if (fastcmp(word,"consoleplayer")) { // player controlling console (aka local player 1)
- if (consoleplayer < 0 || !playeringame[consoleplayer])
+ if (!addedtogame || consoleplayer < 0 || !playeringame[consoleplayer])
return 0;
LUA_PushUserdata(L, &players[consoleplayer], META_PLAYER);
return 1;
--
GitLab