pvp refactor
parent
3c94119cad
commit
0a5ac1c35c
1
api.lua
1
api.lua
|
@ -334,6 +334,7 @@ end
|
||||||
-- axe dig upwards
|
-- axe dig upwards
|
||||||
function obsidianmese.dig_up(pos, node, digger)
|
function obsidianmese.dig_up(pos, node, digger)
|
||||||
if not digger then return end
|
if not digger then return end
|
||||||
|
|
||||||
local wielditemname = digger:get_wielded_item():get_name()
|
local wielditemname = digger:get_wielded_item():get_name()
|
||||||
local whitelist = {
|
local whitelist = {
|
||||||
["obsidianmese:axe"] = true,
|
["obsidianmese:axe"] = true,
|
||||||
|
|
33
tools.lua
33
tools.lua
|
@ -142,20 +142,6 @@ minetest.register_entity("obsidianmese:sword_bullet", {
|
||||||
-- hit player or mob
|
-- hit player or mob
|
||||||
for k, obj in ipairs(minetest.get_objects_inside_radius(pos, 1)) do
|
for k, obj in ipairs(minetest.get_objects_inside_radius(pos, 1)) do
|
||||||
if obj:is_player() then
|
if obj:is_player() then
|
||||||
-- jail time
|
|
||||||
if minetest.global_exists("city_block") then
|
|
||||||
city_block.register_on_punchplayer(
|
|
||||||
obj, -- player
|
|
||||||
minetest.get_player_by_name(self._owner), --hitter
|
|
||||||
1.0, -- time_from_last_punch
|
|
||||||
{
|
|
||||||
full_punch_interval = 1.0,
|
|
||||||
damage_groups = {fleshy = 8},
|
|
||||||
}, -- tool_capabilities
|
|
||||||
nil, -- dir
|
|
||||||
8 -- damage i.e. {fleshy = 8}
|
|
||||||
)
|
|
||||||
end
|
|
||||||
-- pvp block
|
-- pvp block
|
||||||
if minetest.global_exists("pvp_block") then
|
if minetest.global_exists("pvp_block") then
|
||||||
local dmg = obsidianmese.damage_calculator(
|
local dmg = obsidianmese.damage_calculator(
|
||||||
|
@ -183,25 +169,6 @@ minetest.register_entity("obsidianmese:sword_bullet", {
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- spawnnokill
|
|
||||||
if minetest.global_exists("defaultx") then
|
|
||||||
local do_damage = defaultx.register_on_punchplayer(
|
|
||||||
obj, -- player
|
|
||||||
minetest.get_player_by_name(self._owner), --hitter
|
|
||||||
1.0, -- time_from_last_punch
|
|
||||||
{
|
|
||||||
full_punch_interval = 1.0,
|
|
||||||
damage_groups = {fleshy = 8},
|
|
||||||
}, -- tool_capabilities
|
|
||||||
nil, -- dir
|
|
||||||
8 -- damage i.e. {fleshy = 8}
|
|
||||||
)
|
|
||||||
|
|
||||||
if do_damage then
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- punch player
|
-- punch player
|
||||||
obj:punch(self.object, 1.0, {
|
obj:punch(self.object, 1.0, {
|
||||||
full_punch_interval = 1.0,
|
full_punch_interval = 1.0,
|
||||||
|
|
Loading…
Reference in New Issue