pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-16 17:41:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Re-enable spellbar and reset Discipline timer when stopping casts in EVENT_CAST_BEGIN (#1891)

Browse Source
This commit is contained in:
Natedog2012 2021-12-19 15:17:04 -06:00 committed by GitHub
parent 898b1ea4d1
commit 85971590c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zone/spells.cpp
View File

@ -307,7 +307,12 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
std::string export_string = fmt::format("{}", spell_id); std::string export_string = fmt::format("{}", spell_id);
if(IsClient()) { if(IsClient()) {
if (parse->EventPlayer(EVENT_CAST_BEGIN, CastToClient(), export_string, 0) != 0) { if (parse->EventPlayer(EVENT_CAST_BEGIN, CastToClient(), export_string, 0) != 0) {
return false; if (IsDiscipline(spell_id)) {
CastToClient()->SendDisciplineTimer(spells[spell_id].timer_id, 0);
} else {
CastToClient()->SendSpellBarEnable(spell_id);
}
return(false);
} }
} else if(IsNPC()) { } else if(IsNPC()) {
parse->EventNPC(EVENT_CAST_BEGIN, CastToNPC(), nullptr, export_string, 0); parse->EventNPC(EVENT_CAST_BEGIN, CastToNPC(), nullptr, export_string, 0);