Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Restored totem category check

Browse Source 
Revert "Core/Totems: In cata totem items are no longer needed"

This reverts commit 45e0cae7be

(cherry picked from commit ea9eccae85)

Conflicts:
	src/server/game/Entities/Item/ItemPrototype.h
This commit is contained in:
Shauren
2015-02-21 16:58:09 +01:00
committed by Duarte Duarte
parent 8aa7c1995b
commit 6cc38ad7d2
4 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/game/Spells/Spell.cpp
View File

@@ -6034,8 +6034,28 @@ SpellCastResult Spell::CheckItems()
else
totems -= 1;
}
if (totems != 0)
return SPELL_FAILED_TOTEMS;
// Check items for TotemCategory (items presence in inventory)
uint32 totemCategory = 2;
for (uint8 i = 0; i < 2; ++i)
{
if (m_spellInfo->TotemCategory[i] != 0)
{
if (player->HasItemTotemCategory(m_spellInfo->TotemCategory[i]))
{
totemCategory -= 1;
continue;
}
}
else
totemCategory -= 1;
}
if (totemCategory != 0)
return SPELL_FAILED_TOTEM_CATEGORY;
}
// special checks for spell effects