pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 07:21:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

validspell check (#1895)

Browse Source
This commit is contained in:
KayenEQ 2021-12-21 09:17:35 -05:00 committed by GitHub
parent 886b321e66
commit f26d56d6d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zone/client_packet.cpp
View File

@ -4061,7 +4061,12 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
return; return;
} }
CastSpell(spell_to_cast, castspell->target_id, slot); if (IsValidSpell(spell_to_cast)) {
CastSpell(spell_to_cast, castspell->target_id, slot);
}
else {
InterruptSpell();
}
} }
/* Spell Slot or Potion Belt Slot */ /* Spell Slot or Potion Belt Slot */
else if (slot == CastingSlot::Item || slot == CastingSlot::PotionBelt) // ITEM or POTION cast else if (slot == CastingSlot::Item || slot == CastingSlot::PotionBelt) // ITEM or POTION cast

13
zone/spells.cpp
View File

@ -180,14 +180,19 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
{ {
LogSpells("Spell casting canceled: not able to cast now. Valid? [{}], casting [{}], waiting? [{}], spellend? [{}], stunned? [{}], feared? [{}], mezed? [{}], silenced? [{}], amnesiad? [{}]", LogSpells("Spell casting canceled: not able to cast now. Valid? [{}], casting [{}], waiting? [{}], spellend? [{}], stunned? [{}], feared? [{}], mezed? [{}], silenced? [{}], amnesiad? [{}]",
IsValidSpell(spell_id), casting_spell_id, delaytimer, spellend_timer.Enabled(), IsStunned(), IsFeared(), IsMezzed(), IsSilenced(), IsAmnesiad() ); IsValidSpell(spell_id), casting_spell_id, delaytimer, spellend_timer.Enabled(), IsStunned(), IsFeared(), IsMezzed(), IsSilenced(), IsAmnesiad() );
if(IsSilenced() && !IsDiscipline(spell_id))
if (IsSilenced() && !IsDiscipline(spell_id)) {
MessageString(Chat::Red, SILENCED_STRING); MessageString(Chat::Red, SILENCED_STRING);
if(IsAmnesiad() && IsDiscipline(spell_id)) }
if (IsAmnesiad() && IsDiscipline(spell_id)) {
MessageString(Chat::Red, MELEE_SILENCE); MessageString(Chat::Red, MELEE_SILENCE);
if(IsClient()) }
if (IsClient()) {
CastToClient()->SendSpellBarEnable(spell_id); CastToClient()->SendSpellBarEnable(spell_id);
if(casting_spell_id && IsNPC()) }
if (casting_spell_id && IsNPC()) {
CastToNPC()->AI_Event_SpellCastFinished(false, static_cast<uint16>(casting_spell_slot)); CastToNPC()->AI_Event_SpellCastFinished(false, static_cast<uint16>(casting_spell_slot));
}
return(false); return(false);
} }
//It appears that the Sanctuary effect is removed by a check on the client side (keep this however for redundancy) //It appears that the Sanctuary effect is removed by a check on the client side (keep this however for redundancy)