luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2026-01-12 20:25:26 +01:00
Code Activity

Clarify that punch toolcaps are not optional (#16720)

Browse Source
This commit is contained in:
sfan5
2025-12-28 15:30:25 +01:00
committed by GitHub
parent f18d122a8e
commit 1dbb3eae32
17 changed files with 69 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/luaentity_sao.cpp
View File

@@ -323,7 +323,7 @@ void LuaEntitySAO::getStaticData(std::string *result) const
}
u32 LuaEntitySAO::punch(v3f dir,
const ToolCapabilities *toolcap,
const ToolCapabilities &toolcap,
ServerActiveObject *puncher,
float time_from_last_punch,
u16 initial_wear)

2
src/server/luaentity_sao.h
View File

@@ -29,7 +29,7 @@ public:
bool shouldUnload() const { return true; }
void getStaticData(std::string *result) const;
u32 punch(v3f dir, const ToolCapabilities *toolcap = nullptr,
u32 punch(v3f dir, const ToolCapabilities &toolcap,
ServerActiveObject *puncher = nullptr,
float time_from_last_punch = 1000000.0f,
u16 initial_wear = 0);

5
src/server/player_sao.cpp
View File

@@ -450,14 +450,11 @@ void PlayerSAO::setLookPitchAndSend(const float pitch)
}
u32 PlayerSAO::punch(v3f dir,
const ToolCapabilities *toolcap,
const ToolCapabilities &toolcap,
ServerActiveObject *puncher,
float time_from_last_punch,
u16 initial_wear)
{
if (!toolcap)
return 0;
// No effect if PvP disabled or if immortal
if (isImmortal() || !g_settings->getBool("enable_pvp")) {
if (puncher && puncher->getType() == ACTIVEOBJECT_TYPE_PLAYER) {

4
src/server/player_sao.h
View File

@@ -101,7 +101,7 @@ public:
Interaction interface
*/
u32 punch(v3f dir, const ToolCapabilities *toolcap, ServerActiveObject *puncher,
u32 punch(v3f dir, const ToolCapabilities &toolcap, ServerActiveObject *puncher,
float time_from_last_punch, u16 initial_wear = 0) override;
void rightClick(ServerActiveObject *clicker) override;
void setHP(s32 hp, const PlayerHPChangeReason &reason) override
@@ -141,7 +141,7 @@ public:
float resetTimeFromLastPunch()
{
float r = m_time_from_last_punch;
m_time_from_last_punch = 0.0;
m_time_from_last_punch = 0;
return r;
}
void noCheatDigStart(const v3s16 &p)

2
src/server/serveractiveobject.h
View File

@@ -129,7 +129,7 @@ public:
// Returns added tool wear
virtual u32 punch(v3f dir,
const ToolCapabilities *toolcap = nullptr,
const ToolCapabilities &toolcap,
ServerActiveObject *puncher = nullptr,
float time_from_last_punch = 1000000.0f,
u16 initial_wear = 0)