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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
index afcbf1f0046..0adc6190d4b 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
@@ -413,7 +413,7 @@ public:
                             }
                             break;
                         case EVENT_MOVEMENT:         // Phase PHASE_BREATH
-                            if (!IsMoving)
+                            if (!IsMoving && !(me->HasUnitState(UNIT_STATE_CASTING)))
                             {
                                 SetNextRandomPoint();
                                 PointData = GetMoveData();