[Spells] Normal Group Spells (non-raid) landed twice on caster (#4240)

This commit is contained in:
Paul Coene 2024-04-15 06:07:24 -04:00 committed by GitHub
parent 989d199908
commit ac12ba153e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 4 deletions

View File

@ -793,7 +793,6 @@ bool Group::DelMember(Mob* oldmember, bool ignoresender)
return true; return true;
} }
// does the caster + group
void Group::CastGroupSpell(Mob* caster, uint16 spell_id) { void Group::CastGroupSpell(Mob* caster, uint16 spell_id) {
uint32 z; uint32 z;
float range, distance; float range, distance;
@ -807,8 +806,6 @@ void Group::CastGroupSpell(Mob* caster, uint16 spell_id) {
float range2 = range*range; float range2 = range*range;
float min_range2 = spells[spell_id].min_range * spells[spell_id].min_range; float min_range2 = spells[spell_id].min_range * spells[spell_id].min_range;
// caster->SpellOnTarget(spell_id, caster);
for(z=0; z < MAX_GROUP_MEMBERS; z++) for(z=0; z < MAX_GROUP_MEMBERS; z++)
{ {
if(members[z] == caster) { if(members[z] == caster) {

View File

@ -2669,7 +2669,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, in
Group *target_group = entity_list.GetGroupByMob(spell_target); Group *target_group = entity_list.GetGroupByMob(spell_target);
if (target_group) { if (target_group) {
target_group->CastGroupSpell(this, spell_id); target_group->CastGroupSpell(this, spell_id);
if (GetClass() != Class::Bard) { if (target_group != GetGroup() && GetClass() != Class::Bard) {
SpellOnTarget(spell_id, this); SpellOnTarget(spell_id, this);
} }
} }