BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Don't call a player event without having player to do a event for

Browse Source
This commit is contained in:
sapier 2014-08-21 17:27:52 +02:00
parent a4c987b339
commit 2a5c88bde1
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/script/cpp_api/s_env.cpp
View File

@ -61,6 +61,9 @@ void ScriptApiEnv::environment_Step(float dtime)
void ScriptApiEnv::player_event(ServerActiveObject* player, std::string type) void ScriptApiEnv::player_event(ServerActiveObject* player, std::string type)
{ {
SCRIPTAPI_PRECHECKHEADER SCRIPTAPI_PRECHECKHEADER
if (player == NULL)
return;
// Get minetest.registered_playerevents // Get minetest.registered_playerevents
lua_getglobal(L, "minetest"); lua_getglobal(L, "minetest");

7
src/server.cpp
View File

@ -4580,8 +4580,13 @@ bool Server::hudSetFlags(Player *player, u32 flags, u32 mask) {
SendHUDSetFlags(player->peer_id, flags, mask); SendHUDSetFlags(player->peer_id, flags, mask);
player->hud_flags = flags; player->hud_flags = flags;
PlayerSAO* playersao = player->getPlayerSAO();
if (playersao == NULL)
return false;
m_script->player_event(player->getPlayerSAO(),"hud_changed"); m_script->player_event(playersao, "hud_changed");
return true; return true;
} }