Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-12-01 07:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

skip damage completely when player & pvp disabled

Browse Source
This commit is contained in:
cora 2022-07-16 00:43:18 +02:00 committed by Gitea
parent 77d834ac5e
commit bf23c61e34
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ITEMS/mcl_bows/arrow.lua
View File

@ -207,7 +207,7 @@ function ARROW_ENTITY.on_step(self, dtime)
local ok = false local ok = false
if hitpoint.ref:is_player() and enable_pvp then if hitpoint.ref:is_player() and enable_pvp then
ok = true ok = true
elseif hitpoint.ref:get_luaentity() then elseif not hitpoint.ref:is_player() and hitpoint.ref:get_luaentity() then
if (hitpoint.ref:get_luaentity().is_mob or hitpoint.ref:get_luaentity()._hittable_by_projectile) then if (hitpoint.ref:get_luaentity().is_mob or hitpoint.ref:get_luaentity()._hittable_by_projectile) then
ok = true ok = true
end end

2
mods/ITEMS/mcl_bows/rocket.lua
View File

@ -420,7 +420,7 @@ function ARROW_ENTITY.on_step(self, dtime)
local ok = false local ok = false
if hitpoint.ref:is_player() and enable_pvp then if hitpoint.ref:is_player() and enable_pvp then
ok = true ok = true
elseif hitpoint.ref:get_luaentity() then elseif not hitpoint.ref:is_player() and hitpoint.ref:get_luaentity() then
if (hitpoint.ref:get_luaentity().is_mob or hitpoint.ref:get_luaentity()._hittable_by_projectile) then if (hitpoint.ref:get_luaentity().is_mob or hitpoint.ref:get_luaentity()._hittable_by_projectile) then
ok = true ok = true
end end

2
mods/ITEMS/mcl_potions/tipped_arrow.lua
View File

@ -220,7 +220,7 @@ function mcl_potions.register_arrow(name, desc, color, def)
local ok = false local ok = false
if hitpoint.ref:is_player() and enable_pvp then if hitpoint.ref:is_player() and enable_pvp then
ok = true ok = true
elseif hitpoint.ref:get_luaentity() then elseif not hitpoint.ref:is_player() and hitpoint.ref:get_luaentity() then
if (hitpoint.ref:get_luaentity().is_mob or hitpoint.ref:get_luaentity()._hittable_by_projectile) then if (hitpoint.ref:get_luaentity().is_mob or hitpoint.ref:get_luaentity()._hittable_by_projectile) then
ok = true ok = true
end end