Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9780 from Mihapro/4.3.4

Browse Source 
Core/Players: Create default pet for new hunter characters
This commit is contained in:
Shauren
2013-05-11 14:02:58 -07:00
parent d3d06d2cdf 090951ba71
commit e99b404a02
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/server/game/Handlers/CharacterHandler.cpp
View File

@@ -1089,8 +1089,31 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
}
if (pCurrChar->HasAtLoginFlag(AT_LOGIN_FIRST))
{
pCurrChar->RemoveAtLoginFlag(AT_LOGIN_FIRST);
if (pCurrChar->getClass() == CLASS_HUNTER)
{
static uint32 const HunterCreatePetSpells[MAX_RACES] =
{
0, /* None */ 79597, /* Human - Young Wolf */
79598, /* Orc - Young Boar */ 79593, /* Dwarf - Young Bear */
79602, /* Night Elf - Young Cat */ 79600, /* Undead - Young Widow */
79603, /* Tauren - Young Tallstrider */ 0, /* Gnome */
79599, /* Troll - Young Raptor */ 79595, /* Goblin - Young Crab */
79594, /* Blood Elf - Young Dragonhawk */ 79601, /* Draenei - Young Moth */
0, /* Fel Orc */ 0, /* Naga */
0, /* Broken */ 0, /* Skeleton */
0, /* Vrykul */ 0, /* Tuskarr */
0, /* Forest Troll */ 0, /* Taunka */
0, /* Northrend Skeleton */ 0, /* Ice Troll */
79596, /* Worgen - Young Mastiff */
};
pCurrChar->CastSpell(pCurrChar, HunterCreatePetSpells[pCurrChar->getRace()], true);
}
}
// show time before shutdown if shutdown planned.
if (sWorld->IsShuttingDown())
sWorld->ShutdownMsg(true, pCurrChar);

5
src/server/game/Spells/SpellEffects.cpp
View File

@@ -5460,6 +5460,11 @@ void Spell::EffectCreateTamedPet(SpellEffIndex effIndex)
if (!pet)
return;
// relocate
float px, py, pz;
unitTarget->GetClosePoint(px, py, pz, pet->GetObjectSize(), PET_FOLLOW_DIST, pet->GetFollowAngle());
pet->Relocate(px, py, pz, unitTarget->GetOrientation());
// add to world
pet->GetMap()->AddToMap(pet->ToCreature());