Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
Vincent-Michael committed 2013-08-11 18:37:31 +02:00
commit f506ee3077
15 files changed
+228 -79

No files matched your search

-8
View File
@@ -3823,14 +3823,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
}
break;
}
case 66545: //Summon Memory
{
uint8 uiRandom = urand(0, 25);
uint32 uiSpells[26] = {66704, 66705, 66706, 66707, 66709, 66710, 66711, 66712, 66713, 66714, 66715, 66708, 66708, 66691, 66692, 66694, 66695, 66696, 66697, 66698, 66699, 66700, 66701, 66702, 66703, 66543};
m_caster->CastSpell(m_caster, uiSpells[uiRandom], true);
break;
}
case 45668: // Ultra-Advanced Proto-Typical Shortening Blaster
{
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)