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

This commit is contained in:
Vincent_Michael committed 2013-12-18 23:48:20 +01:00
commit 2ded11354d
20 files changed
+1287 -95

No files matched your search

+3 -1
View File
@@ -11898,6 +11898,9 @@ void CharmInfo::InitPossessCreateSpells()
switch (_unit->GetEntry())
{
case 23575: // Mindless Abomination
case 24783: // Trained Rock Falcon
case 27664: // Crashin' Thrashin' Racer
case 40281: // Crashin' Thrashin' Racer
break;
default:
InitEmptyActionBar();
@@ -14165,7 +14168,6 @@ void Unit::RemoveCharmedBy(Unit* charmer)
}
}
break;
default:
case CHARM_TYPE_CONVERT:
break;
}