aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Unit
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2017-04-28 18:11:23 -0300
committerariel- <ariel-@users.noreply.github.com>2017-04-28 19:12:48 -0300
commit231ec8331b2ba3cded9f0d67c77c949cd45f5a60 (patch)
treed932a65626a74c19e106d2bccd827c6cfd4ccf99 /src/server/game/Entities/Unit
parentb6b59f6c239bc0259c92c28bf43bbb50573330b5 (diff)
Core/Entities: moved PetAura handling to Player where it belongs
Diffstat (limited to 'src/server/game/Entities/Unit')
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp20
-rw-r--r--src/server/game/Entities/Unit/Unit.h7
2 files changed, 0 insertions, 27 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index effd158dd2a..51739b3a864 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -11823,26 +11823,6 @@ void Unit::SetContestedPvP(Player* attackedPlayer)
}
}
-void Unit::AddPetAura(PetAura const* petSpell)
-{
- if (GetTypeId() != TYPEID_PLAYER)
- return;
-
- m_petAuras.insert(petSpell);
- if (Pet* pet = ToPlayer()->GetPet())
- pet->CastPetAura(petSpell);
-}
-
-void Unit::RemovePetAura(PetAura const* petSpell)
-{
- if (GetTypeId() != TYPEID_PLAYER)
- return;
-
- m_petAuras.erase(petSpell);
- if (Pet* pet = ToPlayer()->GetPet())
- pet->RemoveAurasDueToSpell(petSpell->GetAura(pet->GetEntry()));
-}
-
Pet* Unit::CreateTamedPetFrom(Creature* creatureTarget, uint32 spell_id)
{
if (GetTypeId() != TYPEID_PLAYER)
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h
index f404302d3f1..baf91f41779 100644
--- a/src/server/game/Entities/Unit/Unit.h
+++ b/src/server/game/Entities/Unit/Unit.h
@@ -363,7 +363,6 @@ class DynamicObject;
class GameObject;
class Item;
class Pet;
-class PetAura;
class Minion;
class Guardian;
class UnitAI;
@@ -2147,12 +2146,6 @@ class TC_GAME_API Unit : public WorldObject
bool CanProc() const { return !m_procDeep; }
void SetCantProc(bool apply);
- // pet auras
- typedef std::set<PetAura const*> PetAuraSet;
- PetAuraSet m_petAuras;
- void AddPetAura(PetAura const* petSpell);
- void RemovePetAura(PetAura const* petSpell);
-
uint32 GetModelForForm(ShapeshiftForm form, uint32 spellId) const;
uint32 GetModelForTotem(PlayerTotemType totemType);