diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2018-08-25 00:27:37 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-10-23 00:11:44 +0200 |
| commit | a5989dcee9150565e7f4b8e3f7a62a414a484a3f (patch) | |
| tree | e20ec1eeddf0857b1f44fa045a8ed40a72081ab7 /src/server/game/Handlers/PetHandler.cpp | |
| parent | ab95c5e9d7b848716e1c9432754f29c65cdb9382 (diff) | |
Core/Unit: Store charmer and charmed pointers on Unit directly, no more map lookups for Unit::GetCharmer and Unit::GetCharmed
(cherry picked from commit d4ef2529e91043bc719c3238714413fd21c9005c)
Diffstat (limited to 'src/server/game/Handlers/PetHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/PetHandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index a92119e7685..286fcf2e584 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -123,7 +123,7 @@ void WorldSession::HandlePetStopAttack(WorldPackets::Pet::PetStopAttack& packet) return; } - if (pet != GetPlayer()->GetPet() && pet != GetPlayer()->GetCharm()) + if (pet != GetPlayer()->GetPet() && pet != GetPlayer()->GetCharmed()) { TC_LOG_ERROR("entities.pet", "HandlePetStopAttack: %s isn't a pet or charmed creature of player %s", packet.PetGUID.ToString().c_str(), GetPlayer()->GetName().c_str()); @@ -616,7 +616,7 @@ void WorldSession::HandlePetSpellAutocastOpcode(WorldPackets::Pet::PetSpellAutoc return; } - if (pet != _player->GetGuardianPet() && pet != _player->GetCharm()) + if (pet != _player->GetGuardianPet() && pet != _player->GetCharmed()) { TC_LOG_ERROR("entities.pet", "WorldSession::HandlePetSpellAutocastOpcode: %s isn't pet of player %s (%s).", packet.PetGUID.ToString().c_str(), GetPlayer()->GetName().c_str(), GetPlayer()->GetGUID().ToString().c_str()); @@ -667,7 +667,7 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPackets::Spells::PetCastSpell& } // This opcode is also sent from charmed and possessed units (players and creatures) - if (caster != _player->GetGuardianPet() && caster != _player->GetCharm()) + if (caster != _player->GetGuardianPet() && caster != _player->GetCharmed()) { TC_LOG_ERROR("spells.pet", "WorldSession::HandlePetCastSpellOpcode: %s isn't pet of player %s (%s).", petCastSpell.PetGUID.ToString().c_str(), GetPlayer()->GetName().c_str(), GetPlayer()->GetGUID().ToString().c_str()); return; |