PowerOlive/mobf_core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sun damage not applied while fighting

Browse Source 
Fix mob rotated 180° on hit even if mob is within combat
This commit is contained in:
sapier 2013-12-16 18:34:08 +01:00
parent 38f61ddb36
commit 4fd83b1c32
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mobf/fighting.lua
View File

@ -213,9 +213,8 @@ function fighting.hit(entity,attacker)
entity.object:get_hp() > (entity.data.generic.base_health/3) then
--face attacker
if entity.mode == "3d" then
entity.object:setyaw(mobf_calc_yaw(dir.x,dir.z))
else
--TODO this may be wrong for 2d mode too
if entity.mode ~= "3d" then
entity.object:setyaw(mobf_calc_yaw(dir.x,dir.z)-math.pi)
end
@ -482,6 +481,11 @@ function fighting.combat(entity,now,dtime)
return false
end
--fight against generic enemy "sun"
if fighting.sun_damage_handler(entity,now) then
return false
end
if entity.dynamic_data.combat ~= nil and
entity.dynamic_data.combat.target ~= nil then
@ -620,11 +624,6 @@ function fighting.combat(entity,now,dtime)
end
end
--fight against generic enemy "sun"
if fighting.sun_damage_handler(entity,now) then
return false
end
return true
end