pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Spells] Update to Charm target restriction code (#1666)

Browse Source 
* charm target restrictions

* fixed

* Update spells.cpp

* Update spells.cpp

* Update spells.cpp

only send spell bar when we have to, avoid potential exploit.

* logs
This commit is contained in:
KayenEQ
2021-11-05 10:39:17 -04:00
committed by GitHub
parent 5874deeffc
commit 8c95323728
3 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spells.cpp
+15
View File
@@ -229,6 +229,21 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
return false;
}
if (IsEffectInSpell(spell_id, SE_Charm) && !PassCharmTargetRestriction(entity_list.GetMobID(target_id))) {
bool can_send_spellbar_enable = true;
if ((item_slot != -1 && cast_time == 0) || aa_id) {
can_send_spellbar_enable = false;
}
if (can_send_spellbar_enable) {
SendSpellBarEnable(spell_id);
}
if (casting_spell_id && IsNPC()) {
CastToNPC()->AI_Event_SpellCastFinished(false, static_cast<uint16>(casting_spell_slot));
}
return false;
}
if (HasActiveSong() && IsBardSong(spell_id)) {
LogSpells("Casting a new song while singing a song. Killing old song [{}]", bardsong);
//Note: this does NOT tell the client