pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 19:10:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Feature] Fix ignore_default on lua mod damage (#4228)

Browse Source 
* Fix ignore_default on lua mod damage

* Add missing init calls
This commit is contained in:
Xackery
2024-04-15 03:39:29 -07:00
committed by GitHub
parent 0d09edf9aa
commit d7d99152ac
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/attack.cpp
+2 -10
View File
@@ -3976,12 +3976,8 @@ void Mob::CommonDamage(Mob* attacker, int64 &damage, const uint16 spell_id, cons
int64 lua_ret = 0;
bool ignore_default = false;
lua_ret = LuaParser::Instance()->CommonDamage(this, attacker, damage, spell_id, static_cast<int>(skill_used), avoidable, buffslot, iBuffTic, static_cast<int>(special), ignore_default);
if (lua_ret != 0) {
damage = lua_ret;
}
if (ignore_default) {
//return lua_ret;
damage = lua_ret;
}
#endif
// This method is called with skill_used=ABJURE for Damage Shield damage.
@@ -4716,12 +4712,8 @@ void Mob::HealDamage(uint64 amount, Mob* caster, uint16 spell_id)
bool ignore_default = false;
lua_ret = LuaParser::Instance()->HealDamage(this, caster, amount, spell_id, ignore_default);
if (lua_ret != 0) {
amount = lua_ret;
}
if (ignore_default) {
//return lua_ret;
amount = lua_ret;
}
#endif
int64 maxhp = GetMaxHP();