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

Conflicts: src/server/game/Entities/Unit/Unit.cpp
2026-01-23 02:25:38 +01:00 · 2014-08-24 22:42:47 +02:00
parent 2433a184ca 1c1f4fe33d
commit 4bdedcb878
6 changed files with 21 additions and 8 deletions
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
@@ -577,9 +577,6 @@ class boss_twilight_halion : public CreatureScript
                        break;
                }
            }
-
-        private:
-            EventMap events;
        };

        CreatureAI* GetAI(Creature* creature) const override