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

[Bug Fix] TGB - Added logic to stop bard errors on group songs. (#3906)

Browse Source 
* [Bug Fix] TGB - Added logic to stop bard errors on group songs.

Occasionally bards would get an error when singing songs with another group member targetted.

* Logic Fix

* Fixed missing brace
This commit is contained in:
Fryguy 2024-01-08 02:27:45 -05:00 committed by GitHub
parent 47e2eb0acf
commit b2d5007466
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
zone/spells.cpp
View File

@ -2619,74 +2619,75 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, in
case GroupSpell:
{
if(IsBot()) {
bool StopLogic = false;
if(!CastToBot()->DoFinishedSpellGroupTarget(spell_id, spell_target, slot, StopLogic))
if (IsBot()) {
bool stop_logic = false;
if (!CastToBot()->DoFinishedSpellGroupTarget(spell_id, spell_target, slot, stop_logic)) {
return false;
if(StopLogic)
}
if(stop_logic) {
break;
}
}
// We hold off turning MBG off so we can still use it to calc the mana cost
if(spells[spell_id].can_mgb && HasMGB())
{
if (spells[spell_id].can_mgb && HasMGB()) {
SpellOnTarget(spell_id, this);
entity_list.MassGroupBuff(this, this, spell_id, true);
}
else
{
} else {
// at this point spell_target is a member of the other group, or the
// caster if they're not using TGB
// NOTE: this will always hit the caster, plus the target's group so
// it can affect up to 7 people if the targeted group is not our own
// Allow pets who cast group spells to affect the group.
if (spell_target->IsPetOwnerClient() && IsPetOwnerClient()){
if (spell_target->IsPetOwnerClient() && IsPetOwnerClient()) {
Mob* owner = spell_target->GetOwner();
if (owner)
if (owner) {
spell_target = owner;
}
}
if(spell_target->IsGrouped())
{
if (spell_target->IsGrouped()) {
Group *target_group = entity_list.GetGroupByMob(spell_target);
if(target_group)
{
if (target_group) {
target_group->CastGroupSpell(this, spell_id);
if (GetClass() != Class::Bard) {
SpellOnTarget(spell_id, this);
}
}
}
else if(spell_target->IsRaidGrouped() && spell_target->IsClient())
{
} else if (spell_target->IsRaidGrouped() && spell_target->IsClient()) {
Raid *target_raid = entity_list.GetRaidByClient(spell_target->CastToClient());
uint32 gid = 0xFFFFFFFF;
if(target_raid){
if (target_raid) {
gid = target_raid->GetGroup(spell_target->GetName());
if(gid < 12)
if (gid < 12) {
target_raid->CastGroupSpell(this, spell_id, gid);
else
} else {
SpellOnTarget(spell_id, spell_target);
}
}
}
else
{
} else {
// if target is grouped, CastGroupSpell will cast it on the caster
// too, but if not then we have to do that here.
if(spell_target != this){
if (spell_target != this) {
SpellOnTarget(spell_id, this);
#ifdef GROUP_BUFF_PETS
//pet too
if (spells[spell_id].target_type != ST_GroupNoPets && GetPet() && HasPetAffinity() && !GetPet()->IsCharmed())
if (spells[spell_id].target_type != ST_GroupNoPets && GetPet() && HasPetAffinity() && !GetPet()->IsCharmed()) {
SpellOnTarget(spell_id, GetPet());
}
#endif
}
SpellOnTarget(spell_id, spell_target);
#ifdef GROUP_BUFF_PETS
//pet too
if (spells[spell_id].target_type != ST_GroupNoPets && spell_target->GetPet() && spell_target->HasPetAffinity() && !spell_target->GetPet()->IsCharmed())
if (spells[spell_id].target_type != ST_GroupNoPets && spell_target->GetPet() && spell_target->HasPetAffinity() && !spell_target->GetPet()->IsCharmed()) {
SpellOnTarget(spell_id, spell_target->GetPet());
}
#endif
}
}