oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Move the clamping of hp/breath when their maximums change to read_object_properties(). (#8689)

Browse source 
This prevents set_properties() calls that have nothing to do with hp_max or breath_max overriding the saved hp before another mod has the chance to set a player's intended hp_max (such as in on_joinplayer).
This commit is contained in:
Beha 2019-07-30 11:29:45 -04:00 • committed by sfan5
parent 2dd645134e
commit b8aaef704d
6 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/script/cpp_api/s_entity.cpp
View file

@ -157,7 +157,7 @@ std::string ScriptApiEntity::luaentity_GetStaticdata(u16 id)
}
void ScriptApiEntity::luaentity_GetProperties(u16 id,
ObjectProperties *prop)
ServerActiveObject *self, ObjectProperties *prop)
{
SCRIPTAPI_PRECHECKHEADER
@ -170,11 +170,11 @@ void ScriptApiEntity::luaentity_GetProperties(u16 id,
prop->hp_max = 10;
// Deprecated: read object properties directly
read_object_properties(L, -1, prop, getServer()->idef());
read_object_properties(L, -1, self, prop, getServer()->idef());
// Read initial_properties
lua_getfield(L, -1, "initial_properties");
read_object_properties(L, -1, prop, getServer()->idef());
read_object_properties(L, -1, self, prop, getServer()->idef());
lua_pop(L, 1);
}

2
src/script/cpp_api/s_entity.h
View file

@ -35,7 +35,7 @@ public:
void luaentity_Remove(u16 id);
std::string luaentity_GetStaticdata(u16 id);
void luaentity_GetProperties(u16 id,
ObjectProperties *prop);
ServerActiveObject *self, ObjectProperties *prop);
void luaentity_Step(u16 id, float dtime);
bool luaentity_Punch(u16 id,
ServerActiveObject *puncher, float time_from_last_punch,