Skip to content
Permalink
Browse files

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

  • Loading branch information...
ClobberXD authored and SmallJoker committed May 21, 2019
1 parent 920bd3b commit a90f2efb12b5131436d22a3627403736e2d326b2
Showing with 10 additions and 1 deletion.
  1. +10 −1 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;
}

0 comments on commit a90f2ef

Please sign in to comment.
You can’t perform that action at this time.