chmodsayshello
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge beacon-branch into fork beacon branch #7

Merged
chmodsayshello merged 453 commits from VoxeLibre/VoxeLibre:beacons into beacon-"fork" 2022-07-23 11:30:49 +02:00
Conversation 0 Commits 453 Files Changed 366 +3 -3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bf23c61e34 - Show all commits

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

@ -207,7 +207,7 @@ function ARROW_ENTITY.on_step(self, dtime)
local ok = false
if hitpoint.ref:is_player() and enable_pvp then
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
ok = true
end

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

@ -420,7 +420,7 @@ function ARROW_ENTITY.on_step(self, dtime)
local ok = false
if hitpoint.ref:is_player() and enable_pvp then
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
ok = true
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
if hitpoint.ref:is_player() and enable_pvp then
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
ok = true
end