diff options
Diffstat (limited to 'src/server/game/Handlers/PetHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/PetHandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 3ef03ffc80b..87c12e95943 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -130,7 +130,7 @@ void WorldSession::HandlePetStopAttack(WorldPacket &recvData) 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", guid.ToString().c_str(), GetPlayer()->GetName().c_str()); @@ -705,7 +705,7 @@ void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket) uint8 state; //1 for on, 0 for off recvPacket >> guid >> spellid >> state; - if (!_player->GetGuardianPet() && !_player->GetCharm()) + if (!_player->GetGuardianPet() && !_player->GetCharmed()) return; if (guid.IsPlayer()) @@ -713,7 +713,7 @@ void WorldSession::HandlePetSpellAutocastOpcode(WorldPacket& recvPacket) Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid); - if (!pet || (pet != _player->GetGuardianPet() && pet != _player->GetCharm())) + if (!pet || (pet != _player->GetGuardianPet() && pet != _player->GetCharmed())) { TC_LOG_ERROR("entities.pet", "HandlePetSpellAutocastOpcode. %s isn't pet of player %s (%s).", guid.ToString().c_str(), GetPlayer()->GetName().c_str(), GetPlayer()->GetGUID().ToString().c_str()); return; @@ -759,12 +759,12 @@ void WorldSession::HandlePetCastSpellOpcode(WorldPacket& recvPacket) TC_LOG_DEBUG("entities.pet", "WORLD: CMSG_PET_CAST_SPELL, %s, castCount: %u, spellId %u, castFlags %u", guid.ToString().c_str(), castCount, spellId, castFlags); // This opcode is also sent from charmed and possessed units (players and creatures) - if (!_player->GetGuardianPet() && !_player->GetCharm()) + if (!_player->GetGuardianPet() && !_player->GetCharmed()) return; Unit* caster = ObjectAccessor::GetUnit(*_player, guid); - if (!caster || (caster != _player->GetGuardianPet() && caster != _player->GetCharm())) + if (!caster || (caster != _player->GetGuardianPet() && caster != _player->GetCharmed())) { TC_LOG_ERROR("entities.pet", "HandlePetCastSpellOpcode: %s isn't pet of player %s (%s).", guid.ToString().c_str(), GetPlayer()->GetName().c_str(), GetPlayer()->GetGUID().ToString().c_str()); return; |