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

This commit is contained in:
Vincent-Michael
2014-07-07 09:58:43 +02:00
5 changed files with 22 additions and 3 deletions

View File

@@ -159,7 +159,7 @@ class instance_magisters_terrace : public InstanceMapScript
switch (type)
{
case DATA_DELRISSA:
if (type == IN_PROGRESS)
if (state == IN_PROGRESS)
DelrissaDeathCount = 0;
break;
default: