Skip to content

Instantly share code, notes, and snippets.

@Demonid
Last active August 29, 2015 14:24
Show Gist options
  • Save Demonid/3815da17c34103da72b2 to your computer and use it in GitHub Desktop.
Save Demonid/3815da17c34103da72b2 to your computer and use it in GitHub Desktop.
From 546767d3ccdeed0fd4f851201bd6e4c4c8fb86c4 Mon Sep 17 00:00:00 2001
From: PaulHellCore <pashka2030@bk.ru>
Date: Wed, 8 Jul 2015 15:33:53 +0300
Subject: [PATCH] Core/Spells: Full hp for dismount pet's
---
src/server/game/Entities/Pet/Pet.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index dbdb924..2ebb7b7 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -255,6 +255,11 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petEntry, uint32 petnumber, bool c
SetReactState(ReactStates(fields[6].GetUInt8()));
SetCanModifyStats(true);
+ InitTalentForLevel(); // set original talents points before spell loading
+
+ uint32 timediff = uint32(time(NULL) - fields[14].GetUInt32());
+ _LoadAuras(timediff);
+
if (getPetType() == SUMMON_PET && !current) //all (?) summon pets come with full health when called, but not when they are current
SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
else
@@ -312,11 +317,6 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petEntry, uint32 petnumber, bool c
owner->SetMinion(this, true);
map->AddToMap(this->ToCreature());
- InitTalentForLevel(); // set original talents points before spell loading
-
- uint32 timediff = uint32(time(NULL) - fields[14].GetUInt32());
- _LoadAuras(timediff);
-
// load action bar, if data broken will fill later by default spells.
if (!isTemporarySummon)
{
--
1.8.3.msysgit.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment