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

[Charm] Fix to update target windows on charm on/off (#3549)

Browse Source 
* [Charm] Fix to update target windows on charm on/off

* Removed accidental change

* Removed magic #

* reformated brace style in function that was modified

* Use better names for clear variables

* Forgot header with name change

* More header name changes
This commit is contained in:
Paul Coene
2023-08-20 16:43:10 -04:00
committed by GitHub
parent 9cbe25f712
commit 4357b8c731
5 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/spell_effects.cpp
+15
View File
@@ -799,6 +799,12 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
SetPetType(petCharmed);
// This was done in AddBuff, but we were not a pet yet, so
// the target windows didn't get updated.
EQApplicationPacket *outapp = MakeBuffsPacket();
entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, EQ::versions::maskSoDAndLater);
safe_delete(outapp);
if(caster->IsClient()){
auto app = new EQApplicationPacket(OP_Charm, sizeof(Charm_Struct));
Charm_Struct *ps = (Charm_Struct*)app->pBuffer;
@@ -4355,6 +4361,15 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses)
{
owner->SetPet(0);
}
// Any client that has a previous charmed pet targetted shouldo
// no longer see the buffs on the old pet.
// QueueClientsByTarget preserves GM and leadership cases.
EQApplicationPacket *outapp = MakeBuffsPacket(true, true);
entity_list.QueueClientsByTarget(this, outapp, false, nullptr, true, false, EQ::versions::maskSoDAndLater, true, true);
if (IsAIControlled())
{
//Remove damage over time effects on charmed pet and those applied by charmed pet.