Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

[svn] Merge from mangos.

Browse Source 
Wed Oct 29 15:06:00 034b8a34a9
Mon Oct 27 14:36:42 fa072d1510

--HG--
branch : trunk
This commit is contained in:
megamage
2008-10-29 18:06:01 -05:00
parent cca2c3a603
commit 7ea14f94f1
5 changed files with 113 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/PetHandler.cpp
View File

@@ -166,6 +166,9 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data )
else
unit_target = NULL;
if (((Creature*)pet)->GetGlobalCooldown() > 0)
return;
// do not cast unknown spells
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid );
if(!spellInfo)
@@ -601,6 +604,9 @@ void WorldSession::HandleAddDynamicTargetObsoleteOpcode( WorldPacket& recvPacket
return;
}
if (pet->GetGlobalCooldown() > 0)
return;
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellid);
if(!spellInfo)
{