Skip to content
Permalink
Browse files

Fix forgotten PlayerSAO cast in a90f2ef

  • Loading branch information...
SmallJoker committed May 21, 2019
1 parent 9d09c87 commit a2848c9cdeba8d077c61ef20108cb208fd073ef8
Showing with 6 additions and 5 deletions.
  1. +6 −5 src/script/lua_api/l_object.cpp
@@ -759,16 +759,17 @@ int ObjectRef::l_set_properties(lua_State *L)

read_object_properties(L, 2, prop, getServer(L)->idef());

PlayerSAO *player = getplayersao(ref);

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 (player)
getServer(L)->SendPlayerHPOrDie(player, reason);
}

if (co->getType() == ACTIVEOBJECT_TYPE_PLAYER &&
prop->breath_max < co->getBreath())
co->setBreath(prop->breath_max);
if (player && prop->breath_max < player->getBreath())
player->setBreath(prop->breath_max);

co->notifyObjectPropertiesModified();
return 0;

0 comments on commit a2848c9

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