From 13a5580b0aa107572b50408252367d5810442822 Mon Sep 17 00:00:00 2001 From: Tristan Cormier Date: Tue, 27 Aug 2024 23:42:44 -0400 Subject: [PATCH] chore: rename Unit::CreateTamedPetFrom method to Unit::CreatePet --- src/server/game/Entities/Player/Player.cpp | 4 ++-- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- src/server/game/Entities/Unit/Unit.h | 4 ++-- src/server/game/Spells/SpellEffects.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index ffa1620e0f0e58..bea518af0a8872 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -9215,7 +9215,7 @@ Pet* Player::CreatePet(Creature* creatureTarget, uint32 spellID /*= 0*/) } // Everything looks OK, create new pet - Pet* pet = CreateTamedPetFrom(creatureTarget, spellID); + Pet* pet = CreatePet(creatureTarget, spellID); if (!pet) { return nullptr; @@ -9262,7 +9262,7 @@ Pet* Player::CreatePet(uint32 creatureEntry, uint32 spellID /*= 0*/) } // Everything looks OK, create new pet - Pet* pet = CreateTamedPetFrom(creatureEntry, spellID); + Pet* pet = CreatePet(creatureEntry, spellID); if (!pet) { return nullptr; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 5f18065c147743..028495704457f4 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -17546,7 +17546,7 @@ bool Unit::IsPetAura(Aura const* aura) return false; } -Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget, uint32 spell_id) +Pet* Unit::CreatePet(Creature* creatureTarget, uint32 spell_id) { if (GetTypeId() != TYPEID_PLAYER) return nullptr; @@ -17570,7 +17570,7 @@ Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget, uint32 spell_id) return pet; } -Pet* Unit::CreateTamedPetFrom(uint32 creatureEntry, uint32 spell_id) +Pet* Unit::CreatePet(uint32 creatureEntry, uint32 spell_id) { if (GetTypeId() != TYPEID_PLAYER) return nullptr; diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 1dc47bd83e9c88..949e3cd20ae2ed 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1974,8 +1974,8 @@ class Unit : public WorldObject void RemoveBindSightAuras(); void RemoveCharmAuras(); - Pet* CreateTamedPetFrom(Creature* creatureTarget, uint32 spell_id = 0); - Pet* CreateTamedPetFrom(uint32 creatureEntry, uint32 spell_id = 0); + Pet* CreatePet(Creature* creatureTarget, uint32 spell_id = 0); + Pet* CreatePet(uint32 creatureEntry, uint32 spell_id = 0); bool InitTamedPet(Pet* pet, uint8 level, uint32 spell_id); // aura apply/remove helpers - you should better not use these diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index dc98b3fd5f96a9..77a84c1d31fe33 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3083,7 +3083,7 @@ void Spell::EffectTameCreature(SpellEffIndex /*effIndex*/) //SendChannelUpdate(0); finish(); - Pet* pet = m_caster->CreateTamedPetFrom(creatureTarget, m_spellInfo->Id); + Pet* pet = m_caster->CreatePet(creatureTarget, m_spellInfo->Id); if (!pet) // in very specific state like near world end/etc. return; @@ -5822,7 +5822,7 @@ void Spell::EffectCreateTamedPet(SpellEffIndex effIndex) return; uint32 creatureEntry = m_spellInfo->Effects[effIndex].MiscValue; - Pet* pet = unitTarget->CreateTamedPetFrom(creatureEntry, m_spellInfo->Id); + Pet* pet = unitTarget->CreatePet(creatureEntry, m_spellInfo->Id); if (!pet) return;