Skip to content
Permalink
Browse files

Fixes around ServerActiveObject on_punch handling

  • Loading branch information
sfan5 committed Mar 5, 2020
1 parent 8d6a0b9 commit e774d8ca2fa5ead9f6d739a2031e6655a22a5b4d
Showing with 6 additions and 2 deletions.
  1. +1 −0 doc/lua_api.txt
  2. +3 −2 src/content_sao.cpp
  3. +2 −0 src/network/serverpackethandler.cpp
@@ -3900,6 +3900,7 @@ Callbacks:
* `dir`: unit vector of direction of punch. Always defined. Points from the
puncher to the punched.
* `damage`: damage that will be done to entity.
* Can return `true` to prevent the default damage mechanism.
* `on_death(self, killer)`
* Called when the object dies.
* `killer`: an `ObjectRef` (can be `nil`)
@@ -653,7 +653,7 @@ u16 LuaEntitySAO::punch(v3f dir,
if (!damage_handled) {
if (result.did_punch) {
setHP((s32)getHP() - result.damage,
PlayerHPChangeReason(PlayerHPChangeReason::SET_HP));
PlayerHPChangeReason(PlayerHPChangeReason::PLAYER_PUNCH, puncher));

std::string str = gob_cmd_punched(getHP());
// create message and add to list
@@ -663,10 +663,10 @@ u16 LuaEntitySAO::punch(v3f dir,
}

if (getHP() == 0 && !isGone()) {
m_pending_removal = true;
clearParentAttachment();
clearChildAttachments();
m_env->getScriptIface()->luaentity_on_death(m_id, puncher);
m_pending_removal = true;
}

actionstream << puncher->getDescription() << " (id=" << puncher->getId() <<
@@ -675,6 +675,7 @@ u16 LuaEntitySAO::punch(v3f dir,
"), damage=" << (old_hp - (s32)getHP()) <<
(damage_handled ? " (handled by Lua)" : "") << std::endl;

// TODO: give Lua control over wear
return result.wear;
}

@@ -1166,6 +1166,8 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
u16 wear = pointed_object->punch(dir, &toolcap, playersao,
time_from_last_punch);

// Callback may have changed item, so get it again
playersao->getWieldedItem(&selected_item);
bool changed = selected_item.addWear(wear, m_itemdef);
if (changed)
playersao->setWieldedItem(selected_item);

0 comments on commit e774d8c

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