Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/shared/Packets/ByteBuffer.h
This commit is contained in:
Nay committed 2012-09-13 17:24:37 +01:00
commit 528b9d4f7d
30 files changed
+623 -56

No files matched your search

+8
View File
@@ -1026,6 +1026,14 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/)
if (unitTarget->getLevel() > uiMaxSafeLevel)
{
unitTarget->AddAura(60444, unitTarget); //Apply Lost! Aura
// ALLIANCE from 60323 to 60330 - HORDE from 60328 to 60335
uint32 spellId = 60323;
if (m_caster->ToPlayer()->GetTeam() == HORDE)
spellId += 5;
spellId += urand(0, 7);
m_caster->CastSpell(m_caster, spellId, true);
return;
}
break;