pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-02 06:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uleat 2015-10-12 18:27:54 -04:00
commit 4a61558de8
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

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

2
cmake/FindMySQL.cmake
View File

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

4
zone/aa.cpp
View File

@ -1419,11 +1419,11 @@ bool Mob::CanUseAlternateAdvancementRank(AA::Rank *rank) {
} }
if(IsClient()) { if(IsClient()) {
if(!(CastToClient()->GetPP().expansions & (1 << (rank->expansion - 1)))) { if(rank->expansion && !(CastToClient()->GetPP().expansions & (1 << (rank->expansion - 1)))) {
return false; return false;
} }
} else { } else {
if(!(RuleI(World, ExpansionSettings) & (1 << (rank->expansion - 1)))) { if(rank->expansion && !(RuleI(World, ExpansionSettings) & (1 << (rank->expansion - 1)))) {
return false; return false;
} }
} }