diff options
| author | Diego Martinez <kaeza@users.sf.net> | 2016-01-04 22:49:11 -0300 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2016-06-11 04:17:04 +0100 |
| commit | dac40af6eeeb7205d507046fd4d9ae06ae182095 (patch) | |
| tree | d8e968e144ef19f184cb3180f304bffbd143dbc1 | |
| parent | b24d21d1ae25c377e14223ee20d9de9158fe916c (diff) | |
| download | minetest-dac40af6eeeb7205d507046fd4d9ae06ae182095.tar.gz minetest-dac40af6eeeb7205d507046fd4d9ae06ae182095.tar.bz2 minetest-dac40af6eeeb7205d507046fd4d9ae06ae182095.zip | |
Server: Add reason for leave to `on_leaveplayer` callbacks
| -rw-r--r-- | doc/lua_api.txt | 3 | ||||
| -rw-r--r-- | src/script/cpp_api/s_player.cpp | 6 | ||||
| -rw-r--r-- | src/script/cpp_api/s_player.h | 2 | ||||
| -rw-r--r-- | src/server.cpp | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/doc/lua_api.txt b/doc/lua_api.txt index ea47d0044..d89b0bf7b 100644 --- a/doc/lua_api.txt +++ b/doc/lua_api.txt @@ -1912,8 +1912,9 @@ Call these functions only at load time! * If it returns a string, the player is disconnected with that string as reason * `minetest.register_on_joinplayer(func(ObjectRef))` * Called when a player joins the game -* `minetest.register_on_leaveplayer(func(ObjectRef))` +* `minetest.register_on_leaveplayer(func(ObjectRef, timed_out))` * Called when a player leaves the game + * `timed_out`: True for timeout, false for other reasons. * `minetest.register_on_cheat(func(ObjectRef, cheat))` * Called when a player cheats * `cheat`: `{type=<cheat_type>}`, where `<cheat_type>` is one of: diff --git a/src/script/cpp_api/s_player.cpp b/src/script/cpp_api/s_player.cpp index 807430678..a8c07476c 100644 --- a/src/script/cpp_api/s_player.cpp +++ b/src/script/cpp_api/s_player.cpp @@ -135,7 +135,8 @@ void ScriptApiPlayer::on_joinplayer(ServerActiveObject *player) runCallbacks(1, RUN_CALLBACKS_MODE_FIRST); } -void ScriptApiPlayer::on_leaveplayer(ServerActiveObject *player) +void ScriptApiPlayer::on_leaveplayer(ServerActiveObject *player, + bool timeout) { SCRIPTAPI_PRECHECKHEADER @@ -144,7 +145,8 @@ void ScriptApiPlayer::on_leaveplayer(ServerActiveObject *player) lua_getfield(L, -1, "registered_on_leaveplayers"); // Call callbacks objectrefGetOrCreate(L, player); - runCallbacks(1, RUN_CALLBACKS_MODE_FIRST); + lua_pushboolean(L, timeout); + runCallbacks(2, RUN_CALLBACKS_MODE_FIRST); } void ScriptApiPlayer::on_cheat(ServerActiveObject *player, diff --git a/src/script/cpp_api/s_player.h b/src/script/cpp_api/s_player.h index 2e4dc2222..86ee1b024 100644 --- a/src/script/cpp_api/s_player.h +++ b/src/script/cpp_api/s_player.h @@ -38,7 +38,7 @@ public: bool on_prejoinplayer(const std::string &name, const std::string &ip, std::string *reason); void on_joinplayer(ServerActiveObject *player); - void on_leaveplayer(ServerActiveObject *player); + void on_leaveplayer(ServerActiveObject *player, bool timeout); void on_cheat(ServerActiveObject *player, const std::string &cheat_type); bool on_punchplayer(ServerActiveObject *player, ServerActiveObject *hitter, float time_from_last_punch, diff --git a/src/server.cpp b/src/server.cpp index ada45dc68..f7f698d50 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2683,7 +2683,7 @@ void Server::DeleteClient(u16 peer_id, ClientDeletionReason reason) PlayerSAO *playersao = player->getPlayerSAO(); assert(playersao); - m_script->on_leaveplayer(playersao); + m_script->on_leaveplayer(playersao, reason == CDR_TIMEOUT); playersao->disconnected(); } |