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

Conflicts: src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/scripts/Kalimdor/zone_desolace.cpp
2026-01-23 18:36:31 +01:00 · 2013-08-26 12:40:41 +01:00
parent d9a136fd58 8eaf763235
commit b2134dbbe3
13 changed files with 200 additions and 16 deletions
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -835,8 +835,6 @@ class npc_halion_controller : public CreatureScript
                        _twilightDamageTaken = 0;
                        return;
                    }
-                    default:
-                        break;
                }

                _materialDamageTaken = 0;