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

Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Spells/SpellMgr.cpp
	src/tools/map_extractor/loadlib.cpp
This commit is contained in:
Vincent-Michael committed 2013-09-05 16:46:14 +02:00
commit d25c2e7f5b
43 files changed
+318 -165

No files matched your search

-23
View File
@@ -997,29 +997,6 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/)
if (!unitTarget || unitTarget->IsInFlight())
return;
// Pre effects
switch (m_spellInfo->Id)
{
case 66550: // teleports outside (Isle of Conquest)
if (Player* target = unitTarget->ToPlayer())
{
if (target->GetTeamId() == TEAM_ALLIANCE)
m_targets.SetDst(442.24f, -835.25f, 44.30f, 0.06f, 628);
else
m_targets.SetDst(1120.43f, -762.11f, 47.92f, 2.94f, 628);
}
break;
case 66551: // teleports inside (Isle of Conquest)
if (Player* target = unitTarget->ToPlayer())
{
if (target->GetTeamId() == TEAM_ALLIANCE)
m_targets.SetDst(389.57f, -832.38f, 48.65f, 3.00f, 628);
else
m_targets.SetDst(1174.85f, -763.24f, 48.72f, 6.26f, 628);
}
break;
}
// If not exist data for dest location - return
if (!m_targets.HasDst())
{