Check for out-of-bounds breath when setting breath_max (#8493)

[oweals/minetest.git] / src / script / lua_api / l_object.cpp

diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index b1f4e3da5272111f2b1bf14445741663236eca61..b7924ddb85db421905b1b51fb3ae20146bdc9dc3 100644 (file)
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -750,17 +750,26 @@ int ObjectRef::l_set_properties(lua_State *L)
        NO_MAP_LOCK_REQUIRED;
        ObjectRef *ref = checkobject(L, 1);
        ServerActiveObject *co = getobject(ref);
-       if (co == NULL) return 0;
+       if (!co)
+               return 0;
+
        ObjectProperties *prop = co->accessObjectProperties();
        if (!prop)
                return 0;
+
        read_object_properties(L, 2, prop, getServer(L)->idef());
+
        if (prop->hp_max < co->getHP()) {
                PlayerHPChangeReason reason(PlayerHPChangeReason::SET_HP);
                co->setHP(prop->hp_max, reason);
                if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER)
                        getServer(L)->SendPlayerHPOrDie((PlayerSAO *)co, reason);
        }
+
+       if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER &&
+                       prop->breath_max < co->getBreath())
+               co->setBreath(prop->breath_max);
+
        co->notifyObjectPropertiesModified();
        return 0;
 }