Merge branch 'master' of https://github.com/azerothcore/azerothcore-wotlk into dir-restructure

This commit is contained in:
Yehonal
2017-12-21 11:26:43 +01:00
445 changed files with 49192 additions and 15431 deletions

View File

@@ -880,7 +880,7 @@ public:
}
else
{
NextWaveTimer = 65000;
NextWaveTimer = 150000;
uint8 num_to_activate = 5;
if (WaveNumber <= 2)