Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes around ServerActiveObject on_punch handling #9459

Merged
merged 1 commit into from Mar 5, 2020
Merged

Fixes around ServerActiveObject on_punch handling #9459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/lua_api.txt
View file
Open in desktop
Expand Up @@ -3895,6 +3895,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`)
Expand Down
5 changes: 3 additions & 2 deletions src/content_sao.cpp
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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() <<
Expand All @@ -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;
}

Expand Down
2 changes: 2 additions & 0 deletions src/network/serverpackethandler.cpp
View file
Open in desktop
Expand Up @@ -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);
Expand Down