diff options
author | ShadowNinja <shadowninja@minetest.net> | 2014-10-02 15:58:13 -0400 |
---|---|---|
committer | ShadowNinja <shadowninja@minetest.net> | 2014-10-07 16:37:45 -0400 |
commit | 741df993ff33832d773536ed571c1a67ed93b5cb (patch) | |
tree | 1e6e3379873ce00df92a1c53d1e403e767b21a32 /src/script/cpp_api/s_player.cpp | |
parent | 28438bba27168289be59a26d3ae55e3f3658d8d3 (diff) | |
download | minetest-741df993ff33832d773536ed571c1a67ed93b5cb.tar.xz |
Fix object reference pushing functions when called from coroutines
Diffstat (limited to 'src/script/cpp_api/s_player.cpp')
-rw-r--r-- | src/script/cpp_api/s_player.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/script/cpp_api/s_player.cpp b/src/script/cpp_api/s_player.cpp index d7375082a..81bfd4505 100644 --- a/src/script/cpp_api/s_player.cpp +++ b/src/script/cpp_api/s_player.cpp @@ -29,7 +29,7 @@ void ScriptApiPlayer::on_newplayer(ServerActiveObject *player) lua_getglobal(L, "core"); lua_getfield(L, -1, "registered_on_newplayers"); // Call callbacks - objectrefGetOrCreate(player); + objectrefGetOrCreate(L, player); script_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST); } @@ -41,7 +41,7 @@ void ScriptApiPlayer::on_dieplayer(ServerActiveObject *player) lua_getglobal(L, "core"); lua_getfield(L, -1, "registered_on_dieplayers"); // Call callbacks - objectrefGetOrCreate(player); + objectrefGetOrCreate(L, player); script_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST); } @@ -53,7 +53,7 @@ bool ScriptApiPlayer::on_respawnplayer(ServerActiveObject *player) lua_getglobal(L, "core"); lua_getfield(L, -1, "registered_on_respawnplayers"); // Call callbacks - objectrefGetOrCreate(player); + objectrefGetOrCreate(L, player); script_run_callbacks(L, 1, RUN_CALLBACKS_MODE_OR); bool positioning_handled_by_some = lua_toboolean(L, -1); return positioning_handled_by_some; @@ -84,7 +84,7 @@ void ScriptApiPlayer::on_joinplayer(ServerActiveObject *player) lua_getglobal(L, "core"); lua_getfield(L, -1, "registered_on_joinplayers"); // Call callbacks - objectrefGetOrCreate(player); + objectrefGetOrCreate(L, player); script_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST); } @@ -96,7 +96,7 @@ void ScriptApiPlayer::on_leaveplayer(ServerActiveObject *player) lua_getglobal(L, "core"); lua_getfield(L, -1, "registered_on_leaveplayers"); // Call callbacks - objectrefGetOrCreate(player); + objectrefGetOrCreate(L, player); script_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST); } @@ -109,7 +109,7 @@ void ScriptApiPlayer::on_cheat(ServerActiveObject *player, lua_getglobal(L, "core"); lua_getfield(L, -1, "registered_on_cheats"); // Call callbacks - objectrefGetOrCreate(player); + objectrefGetOrCreate(L, player); lua_newtable(L); lua_pushlstring(L, cheat_type.c_str(), cheat_type.size()); lua_setfield(L, -2, "type"); @@ -127,7 +127,7 @@ void ScriptApiPlayer::on_playerReceiveFields(ServerActiveObject *player, lua_getfield(L, -1, "registered_on_player_receive_fields"); // Call callbacks // param 1 - objectrefGetOrCreate(player); + objectrefGetOrCreate(L, player); // param 2 lua_pushstring(L, formname.c_str()); // param 3 |