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

Merge pull request #17138 from ForesterDev/creature_family

Browse Source 
Core/Misc: Define CREATURE_FAMILY_NONE to avoid magic numbers in code
(cherry picked from commit 62635f07d0)
This commit is contained in:
Shocker
2016-05-27 12:29:12 +03:00
committed by joschiwald
parent 5d4569a11b
commit 0cddecf2d4
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/scripts/Commands/cs_pet.cpp
View File

@@ -69,10 +69,10 @@ public:
}
CreatureTemplate const* creatureTemplate = creatureTarget->GetCreatureTemplate();
// Creatures with family 0 crashes the server
if (!creatureTemplate->family)
// Creatures with family CREATURE_FAMILY_NONE crashes the server
if (creatureTemplate->family == CREATURE_FAMILY_NONE)
{
handler->PSendSysMessage("This creature cannot be tamed. (family id: 0).");
handler->PSendSysMessage("This creature cannot be tamed. Family id: 0 (CREATURE_FAMILY_NONE).");
handler->SetSentErrorMessage(true);
return false;
}

2
src/server/scripts/Spells/spell_warlock.cpp
View File

@@ -494,6 +494,8 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader
case CREATURE_FAMILY_IMP:
targetCreature->CastSpell(targetCreature, SPELL_WARLOCK_DEMONIC_EMPOWERMENT_IMP, true);
break;
default:
break;
}
}
}