Merge branch 'master' of https://github.com/EQEmu/Server into bots_updater

This commit is contained in:
Uleat
2015-10-12 18:27:54 -04:00
3 changed files with 13 additions and 7 deletions
+2 -2
View File
@@ -1419,11 +1419,11 @@ bool Mob::CanUseAlternateAdvancementRank(AA::Rank *rank) {
}
if(IsClient()) {
if(!(CastToClient()->GetPP().expansions & (1 << (rank->expansion - 1)))) {
if(rank->expansion && !(CastToClient()->GetPP().expansions & (1 << (rank->expansion - 1)))) {
return false;
}
} else {
if(!(RuleI(World, ExpansionSettings) & (1 << (rank->expansion - 1)))) {
if(rank->expansion && !(RuleI(World, ExpansionSettings) & (1 << (rank->expansion - 1)))) {
return false;
}
}