etc/Mineclonia
Archived
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Let players shoot themselves with regular arrows

Browse source
This commit is contained in:
epCode 2021-03-17 13:47:02 -07:00 committed by Nils Dagsson Moskopp
parent 9f086a9242
commit 6951ecdfc9
No known key found for this signature in database
GPG key ID: A3BC671C35191080
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mods/ITEMS/mcl_bows/arrow.lua
View file

@ -136,6 +136,8 @@ end
ARROW_ENTITY.on_step = function(self, dtime) ARROW_ENTITY.on_step = function(self, dtime)
mcl_burning.tick(self.object, dtime) mcl_burning.tick(self.object, dtime)
self._time_in_air = self._time_in_air + .001
local pos = self.object:get_pos() local pos = self.object:get_pos()
local dpos = table.copy(pos) -- digital pos local dpos = table.copy(pos) -- digital pos
dpos = vector.round(dpos) dpos = vector.round(dpos)
@ -201,10 +203,10 @@ ARROW_ENTITY.on_step = function(self, dtime)
for k, obj in pairs(objs) do for k, obj in pairs(objs) do
local ok = false local ok = false
-- Arrows can only damage players and mobs -- Arrows can only damage players and mobs
if obj ~= self._shooter and obj:is_player() then if obj:is_player() then
ok = true ok = true
elseif obj:get_luaentity() ~= nil then elseif obj:get_luaentity() ~= nil then
if obj ~= self._shooter and (obj:get_luaentity()._cmi_is_mob or obj:get_luaentity()._hittable_by_projectile) then if obj:get_luaentity()._cmi_is_mob or obj:get_luaentity()._hittable_by_projectile then
ok = true ok = true
end end
end end
@ -226,7 +228,7 @@ ARROW_ENTITY.on_step = function(self, dtime)
local obj = closest_object local obj = closest_object
local is_player = obj:is_player() local is_player = obj:is_player()
local lua = obj:get_luaentity() local lua = obj:get_luaentity()
if obj ~= self._shooter and (is_player or (lua and (lua._cmi_is_mob or lua._hittable_by_projectile))) then if obj == self._shooter and self._time_in_air > 1.02 or obj ~= self._shooter and (is_player or (lua and (lua._cmi_is_mob or lua._hittable_by_projectile))) then
if obj:get_hp() > 0 then if obj:get_hp() > 0 then
-- Check if there is no solid node between arrow and object -- Check if there is no solid node between arrow and object
local ray = minetest.raycast(self.object:get_pos(), obj:get_pos(), true) local ray = minetest.raycast(self.object:get_pos(), obj:get_pos(), true)
@ -411,6 +413,7 @@ end
ARROW_ENTITY.on_activate = function(self, staticdata, dtime_s) ARROW_ENTITY.on_activate = function(self, staticdata, dtime_s)
local data = minetest.deserialize(staticdata) local data = minetest.deserialize(staticdata)
self._time_in_air = 1.0
if data then if data then
self._stuck = data.stuck self._stuck = data.stuck
if data.stuck then if data.stuck then