summaryrefslogtreecommitdiff
path: root/src/content_sao.cpp
diff options
context:
space:
mode:
authorBeha <shacknetisp@mail.com>2019-07-30 11:29:45 -0400
committersfan5 <sfan5@live.de>2019-07-30 17:29:45 +0200
commitb8aaef704d3e29c43edc3312a3c5e25516d9c864 (patch)
tree9640e90c11c60982c0c2655c9a5f16864d649744 /src/content_sao.cpp
parent2dd645134eaab7611d167e2cb8469242e642c7ef (diff)
downloadminetest-b8aaef704d3e29c43edc3312a3c5e25516d9c864.tar.gz
minetest-b8aaef704d3e29c43edc3312a3c5e25516d9c864.tar.bz2
minetest-b8aaef704d3e29c43edc3312a3c5e25516d9c864.zip
Move the clamping of hp/breath when their maximums change to read_object_properties(). (#8689)
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).
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r--src/content_sao.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 41b1aec18..84a09d977 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -331,7 +331,7 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s)
if(m_registered){
// Get properties
m_env->getScriptIface()->
- luaentity_GetProperties(m_id, &m_prop);
+ luaentity_GetProperties(m_id, this, &m_prop);
// Initialize HP from properties
m_hp = m_prop.hp_max;
// Activate entity, supplying serialized state