diff options
| author | Kahrl <kahrl@gmx.net> | 2015-08-25 07:44:53 +0200 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2015-08-27 01:56:06 +0200 |
| commit | 3304e1e517fb8aac008c4684e72a4b59b408414a (patch) | |
| tree | ddcc820601c02d6783578b7accc68d35a2d312fc /src/script/cpp_api/s_player.cpp | |
| parent | 8658c8d9b5f30dc952eed29a19d619de9210474c (diff) | |
| download | minetest-3304e1e517fb8aac008c4684e72a4b59b408414a.tar.gz minetest-3304e1e517fb8aac008c4684e72a4b59b408414a.tar.bz2 minetest-3304e1e517fb8aac008c4684e72a4b59b408414a.zip | |
Push error handler afresh each time lua_pcall is used
Fixes "double fault" / "error in error handling" messages
(issue #1423) and instead shows a complete backtrace.
Diffstat (limited to 'src/script/cpp_api/s_player.cpp')
| -rw-r--r-- | src/script/cpp_api/s_player.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/script/cpp_api/s_player.cpp b/src/script/cpp_api/s_player.cpp index ef3c31cfd..807430678 100644 --- a/src/script/cpp_api/s_player.cpp +++ b/src/script/cpp_api/s_player.cpp @@ -74,6 +74,8 @@ s16 ScriptApiPlayer::on_player_hpchange(ServerActiveObject *player, { SCRIPTAPI_PRECHECKHEADER + int error_handler = PUSH_ERROR_HANDLER(L); + // Get core.registered_on_player_hpchange lua_getglobal(L, "core"); lua_getfield(L, -1, "registered_on_player_hpchange"); @@ -81,9 +83,9 @@ s16 ScriptApiPlayer::on_player_hpchange(ServerActiveObject *player, objectrefGetOrCreate(L, player); lua_pushnumber(L, hp_change); - PCALL_RES(lua_pcall(L, 2, 1, m_errorhandler)); + PCALL_RES(lua_pcall(L, 2, 1, error_handler)); hp_change = lua_tointeger(L, -1); - lua_pop(L, -1); + lua_pop(L, 2); // Pop result and error handler return hp_change; } |