pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 03:08:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Add SE_MakeDrunk to avoid error message. (#2601)

Browse Source 
* [Bug Fix] Add SE_MakeDrunk to avoid error message.

Currently sends error message about unknown spell effect ID.

* Message types cleanup.

* Update spdat.cpp
This commit is contained in:
Alex King
2022-11-30 22:09:59 -05:00
committed by GitHub
parent de7a632d67
commit dbba22b153
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/spdat.cpp
+17 -11
View File
@@ -374,13 +374,16 @@ bool IsAEDurationSpell(uint16 spell_id)
There are plenty of spells with aoe_duration set at single digit numbers, but these
do not act as duration effects.
*/
if (IsValidSpell(spell_id) &&
if (
IsValidSpell(spell_id) &&
spells[spell_id].aoe_duration >= 2500 &&
( spells[spell_id].target_type == ST_AETarget ||
(
spells[spell_id].target_type == ST_AETarget ||
spells[spell_id].target_type == ST_UndeadAE ||
spells[spell_id].target_type == ST_AECaster ||
spells[spell_id].target_type == ST_Ring)
) {
spells[spell_id].target_type == ST_Ring
)
) {
return true;
}
@@ -1482,6 +1485,7 @@ bool IsInstrumentModAppliedToSpellEffect(int32 spell_id, int effect)
case SE_WaterBreathing:
case SE_ModelSize:
case SE_ChangeHeight:
case SE_MakeDrunk:
return false;
default:
return true;
@@ -1494,15 +1498,17 @@ bool IsPulsingBardSong(int32 spell_id)
if (!IsValidSpell(spell_id)) {
return false;
}
if (spells[spell_id].buff_duration == 0xFFFF ||
spells[spell_id].recast_time> 0 ||
spells[spell_id].mana > 0 ||
IsEffectInSpell(spell_id, SE_TemporaryPets) ||
IsEffectInSpell(spell_id, SE_Familiar)) {
if (
spells[spell_id].buff_duration == 0xFFFF ||
spells[spell_id].recast_time > 0 ||
spells[spell_id].mana > 0 ||
IsEffectInSpell(spell_id, SE_TemporaryPets) ||
IsEffectInSpell(spell_id, SE_Familiar)
) {
return false;
}
return true;
}