From 40dd03e328ff0ae36338615114cb38879752756e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Mon, 4 Sep 2017 22:08:59 +0200 Subject: Implement minetest.register_can_bypass_userlimit (#6369) * Implement minetest.register_on_userlimit_check This new callback permits to bypass the max_users parameter with new mods condition, based on player name or IP Only one mod needs to permit it. Move core part for builtin privileges checks to builtin --- src/script/cpp_api/s_player.cpp | 15 +++++++++++++++ src/script/cpp_api/s_player.h | 1 + 2 files changed, 16 insertions(+) (limited to 'src/script/cpp_api') diff --git a/src/script/cpp_api/s_player.cpp b/src/script/cpp_api/s_player.cpp index b7f2f10f9..578c26184 100644 --- a/src/script/cpp_api/s_player.cpp +++ b/src/script/cpp_api/s_player.cpp @@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "cpp_api/s_internal.h" #include "common/c_converter.h" #include "common/c_content.h" +#include "debug.h" #include "util/string.h" void ScriptApiPlayer::on_newplayer(ServerActiveObject *player) @@ -123,6 +124,20 @@ bool ScriptApiPlayer::on_prejoinplayer( return false; } +bool ScriptApiPlayer::can_bypass_userlimit(const std::string &name, const std::string &ip) +{ + SCRIPTAPI_PRECHECKHEADER + + // Get core.registered_on_prejoinplayers + lua_getglobal(L, "core"); + lua_getfield(L, -1, "registered_can_bypass_userlimit"); + lua_pushstring(L, name.c_str()); + lua_pushstring(L, ip.c_str()); + runCallbacks(2, RUN_CALLBACKS_MODE_OR); + FATAL_ERROR_IF(!lua_isboolean(L, -1), "on_user_limitcheck must return a boolean"); + return lua_toboolean(L, -1); +} + void ScriptApiPlayer::on_joinplayer(ServerActiveObject *player) { SCRIPTAPI_PRECHECKHEADER diff --git a/src/script/cpp_api/s_player.h b/src/script/cpp_api/s_player.h index faf394de5..6b752eb69 100644 --- a/src/script/cpp_api/s_player.h +++ b/src/script/cpp_api/s_player.h @@ -35,6 +35,7 @@ public: bool on_respawnplayer(ServerActiveObject *player); bool on_prejoinplayer(const std::string &name, const std::string &ip, std::string *reason); + bool can_bypass_userlimit(const std::string &name, const std::string &ip); void on_joinplayer(ServerActiveObject *player); void on_leaveplayer(ServerActiveObject *player, bool timeout); void on_cheat(ServerActiveObject *player, const std::string &cheat_type); -- cgit v1.2.3