oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-08-11 17:51:04 +00:00
Code Wiki Activity

on_joinplayer + on_leaveplayer + scriptapi_run_callbacks + bugfix

Browse source 
Add minetest.register_on_joinplayer and minetest.register_on_leaveplayer,
make adding new callbacks to scriptapi.cpp easier by adding
scriptapi_run_callbacks, also fix a minor bug with PlayerSAO <->
singleplayer mode interaction
This commit is contained in:
Kahrl 2012-03-24 18:52:50 +01:00 • committed by Perttu Ahola
parent f8c3743991
commit a9ddbb4beb
4 changed files with 208 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/server.cpp
View file

@ -1317,10 +1317,8 @@ void Server::AsyncRunStep()
{
RemoteClient *client = i.getNode()->getValue();
PlayerSAO *playersao = getPlayerSAO(client->peer_id);
if(playersao == NULL){
errorstream<<"Handling client without PlayerSAO, peer_id="<<client->peer_id<<std::endl;
if(playersao == NULL)
continue;
}
/*
Handle player HPs (die if hp=0)
@ -4533,6 +4531,8 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id)
if(newplayer)
scriptapi_on_newplayer(m_lua, playersao);
scriptapi_on_joinplayer(m_lua, playersao);
/* Creative mode */
if(g_settings->getBool("creative_mode"))
playersao->createCreativeInventory();
@ -4623,10 +4623,19 @@ void Server::handlePeerChange(PeerChange &c)
}
}
// Remove from environment
if(player->getPlayerSAO())
player->getPlayerSAO()->disconnected();
/* Run scripts and remove from environment */
{
if(player != NULL)
{
PlayerSAO *playersao = player->getPlayerSAO();
assert(playersao);
scriptapi_on_leaveplayer(m_lua, playersao);
playersao->disconnected();
}
}
/*
Print out action
*/