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

Rearrange conditions to minimize executed code

Browse Source
This commit is contained in:
teknomunk 2024-11-24 06:31:43 -06:00
parent 37bae54b9e
commit 94845d8b2b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mods/ITEMS/vl_projectile/init.lua
View File

@ -450,18 +450,18 @@ function mod.collides_with_solids(self, dtime, entity_def, projectile_def)
end end
local function handle_entity_collision(self, entity_def, projectile_def, object) local function handle_entity_collision(self, entity_def, projectile_def, object)
local pos = self.object:get_pos() -- Arrows stuck in players can't collide with entities
local dir = vector.normalize(self.object:get_velocity()) if self._in_player then return end
-- Check if this is allowed -- Check if this is allowed
local allow_punching = projectile_def.allow_punching or true local allow_punching = projectile_def.allow_punching or true
if type(allow_punching) == "function" then if type(allow_punching) == "function" then
allow_punching = allow_punching(self, entity_def, projectile_def, object) allow_punching = allow_punching(self, entity_def, projectile_def, object)
end end
if self._in_player then allow_punching = false end
if not allow_punching then return end if not allow_punching then return end
local pos = self.object:get_pos()
local dir = vector.normalize(self.object:get_velocity())
local object_lua = object:get_luaentity() local object_lua = object:get_luaentity()
-- Normally objects should be removed on collision with entities -- Normally objects should be removed on collision with entities