josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Also exit vehicle in uncharm function.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-18 21:51:52 -06:00
parent 281d20be0d
commit 9f84e9cb22
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
+5 -3
View File
@@ -17150,12 +17150,14 @@ void Player::Uncharm()
if(!charm) if(!charm)
return; return;
if(charm->GetTypeId() == TYPEID_UNIT && ((Creature*)charm)->isPet() if(charm->GetTypeId() == TYPEID_UNIT)
&& ((Pet*)charm)->getPetType() == POSSESSED_PET)
{ {
if(((Creature*)charm)->isPet() && ((Pet*)charm)->getPetType() == POSSESSED_PET)
((Pet*)charm)->Remove(PET_SAVE_AS_DELETED); ((Pet*)charm)->Remove(PET_SAVE_AS_DELETED);
else if(((Creature*)charm)->isVehicle())
ExitVehicle((Vehicle*)charm);
} }
else if(GetCharmGUID())
{ {
charm->RemoveSpellsCausingAura(SPELL_AURA_MOD_CHARM); charm->RemoveSpellsCausingAura(SPELL_AURA_MOD_CHARM);
charm->RemoveSpellsCausingAura(SPELL_AURA_MOD_POSSESS_PET); charm->RemoveSpellsCausingAura(SPELL_AURA_MOD_POSSESS_PET);