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

2013-06-18 21:04:31 +02:00
parent 3367dd5be9 89ec907539
commit f517467817
116 changed files with 7709 additions and 3082 deletions
@@ -986,7 +986,7 @@ class spell_gen_parachute_ic : public SpellScriptLoader
            void HandleTriggerSpell(AuraEffect const* /*aurEff*/)
            {
                if (Player* target = GetTarget()->ToPlayer())
-                    if (target->m_movementInfo.fallTime > 2000)
+                    if (target->m_movementInfo.jump.fallTime > 2000)
                        target->CastSpell(target, SPELL_PARACHUTE_IC, true);
            }