nalc/minetest-3d_armor
1
0
Fork 0
forked from mtcontrib/3d_armor
Code Issues Pull Requests Releases Wiki Activity

Call custom on_punched functions w/ hitter = nil too (#141)

Browse Source
This commit is contained in:
Niklp 2024-03-19 12:54:42 +01:00 committed by GitHub
parent 25369e5165
commit 7bd77a7b80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
3d_armor/init.lua
View File

@ -394,14 +394,15 @@ end
if armor.config.punch_damage == true then
minetest.register_on_punchplayer(function(player, hitter,
time_from_last_punch, tool_capabilities)
if hitter == nil then
return
end
local name = player:get_player_name()
local hit_ip = hitter:is_player()
if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
return
elseif name then
if hitter then
local hit_ip = hitter:is_player()
if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
return
end
end
if name then
armor:punch(player, hitter, time_from_last_punch, tool_capabilities)
last_punch_time[name] = minetest.get_gametime()
end