From f939b92c1b6dcdad793505d30d54b96f028bda61 Mon Sep 17 00:00:00 2001
From: Alexander Sedov <alex0player@gmail.com>
Date: Sat, 13 Dec 2014 09:14:34 +0300
Subject: [PATCH] Moved on_takehit together with callback and hook.
---
game/modules/tome/class/Actor.lua | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 7ba7a1bbbc..4dea45247c 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -2597,8 +2597,6 @@ function _M:onTakeHit(value, src, death_note)
end
end
- if self.on_takehit then value = self:check("on_takehit", value, src, death_note) end
-
-- Apply Solipsism hit
if damage_to_psi > 0 then
local t = self:getTalentFromId(self.T_SOLIPSISM)
@@ -2776,6 +2774,8 @@ function _M:onTakeHit(value, src, death_note)
end
end
+ if self.on_takehit then value = self:check("on_takehit", value, src, death_note) end
+
local cb = {value=value}
if self:fireTalentCheck("callbackOnHit", cb, src, death_note) then
value = cb.value
--
GitLab