pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 16:51:29 +00:00
Code Issues Actions 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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/attack.cpp
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();

2
zone/lua_mod.cpp
View File

@ -38,6 +38,8 @@ void LuaMod::Init()
m_has_common_outgoing_hit_success = parser_->HasFunction("CommonOutgoingHitSuccess", package_name_);
m_has_calc_spell_effect_value_formula = parser_->HasFunction("CalcSpellEffectValue_formula", package_name_);
m_has_register_bug = parser_->HasFunction("RegisterBug", package_name_);
m_has_common_damage = parser_->HasFunction("CommonDamage", package_name_);
m_has_heal_damage = parser_->HasFunction("HealDamage", package_name_);
}
void PutDamageHitInfo(lua_State *L, luabind::adl::object &e, DamageHitInfo &hit) {