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

.travis.yml

@@ -1,11 +1,17 @@
 language: cpp
 compiler: gcc
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y libmysqlclient-dev libperl-dev libboost-dev liblua5.1-0-dev zlib1g-dev
+sudo: false
+addons:
+  apt:
+    packages:
+    - libmysqlclient-dev
+    - libperl-dev
+    - libboost-dev
+    - liblua5.1-0-dev
+    - zlib1g-dev
 script:
   - cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON
-  - make
+  - make -j8
   - ./bin/tests
 branches:
   only:

cmake/FindMySQL.cmake

@@ -30,7 +30,7 @@ ELSE(MYSQL_ROOT)
 ENDIF(MYSQL_ROOT)
 
 # Library
-SET(MySQL_NAMES mysqlclient_r mysqlclient)
+SET(MySQL_NAMES libmysql mysqlclient_r mysqlclient)
 IF(MYSQL_ROOT)
 	FIND_LIBRARY(MySQL_LIBRARY_DEBUG
 		NAMES ${MySQL_NAMES}

zone/aa.cpp

@@ -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;
 		}
 	}