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

Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/scripts/Commands/cs_reload.cpp
This commit is contained in:
Vincent-Michael committed 2014-04-25 23:42:40 +02:00
commit 1390621f4d
66 files changed
+388 -332

No files matched your search

+1 -2
View File
@@ -567,8 +567,7 @@ class spell_pri_leap_of_faith_effect_trigger : public SpellScriptLoader
void HandleEffectDummy(SpellEffIndex /*effIndex*/)
{
Position destPos;
GetHitDest()->GetPosition(&destPos);
Position destPos = GetHitDest()->GetPosition();
SpellCastTargets targets;
targets.SetDst(destPos);