diff --git a/.travis.yml b/.travis.yml
index 3bfd0f7..da4e481 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,42 +1,76 @@
 sudo: required
-dist: trusty # (14.04)
-# xenial (16.04) is not supported yet
+dist: xenial # (16.04)
+# bionic (18.04) is not yet available in travis
 
 language: cpp
-compiler:
-  - clang
+
+cache: ccache
+
+addons:
+  apt:
+    update: true
+
+services:
+  - mysql
 
 git:
-  depth: 1
+  depth: 10
 
-before_install:
-  - sudo apt-get -y install build-essential libtool make cmake cmake-data openssl
-  - sudo apt-get -y install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev libace-dev
-  - git config user.email "travis@build.bot" && git config user.name "Travis CI"
-  - git tag -a -m "Travis build" init
-  
-install:
-  - cd ..
-  - git clone --depth=1 --branch=master https://github.com/azerothcore/azerothcore-wotlk.git azerothcore
-  - mv mod-duelreset azerothcore/modules
-  - cd azerothcore
-  - git submodule update --init --recursive
+stages:
+  - prepare_cache
+  - run
 
-  - mysql -uroot -e 'create database test_mysql;'
-  - cd bin
-  - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=0 -DSCRIPTS=1 -DSERVERS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=check_install
-  - cd ..
+jobs:
+  include:
+    - stage: prepare_cache
+      env: TRAVIS_BUILD_ID="1"
+      before_install:
+        - cd ..
+        - git clone --depth=1 --branch=master https://github.com/azerothcore/azerothcore-wotlk.git azerothcore-wotlk
+        - cd azerothcore-wotlk
+        - source ./apps/ci/ci-before_install.sh
+      install:
+        - source ./apps/ci/ci-install.sh OFF
+      script:
+        - source ./apps/ci/ci-compile.sh
 
-script:
-  - $CXX --version
-  - mysql -uroot < data/sql/create/create_mysql.sql
-  - cat data/sql/base/db_auth/*.sql | mysql -uacore -pacore auth
-  - cat data/sql/base/db_characters/*.sql | mysql -uacore -pacore characters
-  - cat data/sql/base/db_world/*.sql | mysql -uacore -pacore world
-  - cat data/sql/updates/db_auth/*.sql | mysql -uacore -pacore auth
-  - cat data/sql/updates/db_characters/*.sql | mysql -uacore -pacore characters
-  - cat data/sql/updates/db_world/*.sql | mysql -uacore -pacore world
-  - mysql -uroot < data/sql/create/drop_mysql.sql
-  - cd bin
-  - make -j 8 -k && make install
-  - cd check_install/bin
+    - stage: run
+      env: TRAVIS_BUILD_ID="1"
+      before_install:
+        - cd ..
+        - git clone --depth=1 --branch=master https://github.com/azerothcore/azerothcore-wotlk.git azerothcore-wotlk
+        - mv "$TRAVIS_BUILD_DIR" azerothcore-wotlk/modules
+        - cd azerothcore-wotlk
+        - source ./apps/ci/ci-before_install.sh
+      install:
+        - source ./apps/ci/ci-install.sh ON
+        - source ./apps/ci/ci-import-db.sh
+        - mysql -u root world_$DB_RND_NAME <modules/$(basename "$TRAVIS_BUILD_DIR")/sql/example_item_9017.sql
+      script:
+        - source ./apps/ci/ci-compile.sh
+        - source ./apps/ci/ci-worldserver-dry-run.sh
+
+    - stage: prepare_cache
+      env: TRAVIS_BUILD_ID="2"
+      before_install:
+        - cd ..
+        - git clone --depth=1 --branch=master https://github.com/azerothcore/azerothcore-wotlk.git azerothcore-wotlk
+        - cd azerothcore-wotlk
+        - source ./apps/ci/ci-before_install.sh
+      install:
+        - source ./apps/ci/ci-install.sh OFF
+      script:
+        - source ./apps/ci/ci-compile.sh
+
+    - stage: run
+      env: TRAVIS_BUILD_ID="2"
+      before_install:
+        - cd ..
+        - git clone --depth=1 --branch=master https://github.com/azerothcore/azerothcore-wotlk.git azerothcore-wotlk
+        - mv "$TRAVIS_BUILD_DIR" azerothcore-wotlk/modules
+        - cd azerothcore-wotlk
+        - source ./apps/ci/ci-before_install.sh
+      install:
+        - source ./apps/ci/ci-install.sh ON
+      script:
+        - source ./apps/ci/ci-compile.sh
diff --git a/README.md b/README.md
index fe4b45a..b5afa62 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Premium Account
 
-- Latest Premium Account build status with azerothcore: [![Build Status](https://travis-ci.org/azerothcore/mod-duelreset.svg?branch=master)](https://travis-ci.org/azerothcore/mod-duelreset)
+- Latest Premium Account build status with azerothcore: [![Build Status](https://travis-ci.org/azerothcore/mod-premium.svg?branch=master)](https://travis-ci.org/azerothcore/mod-premium)
 
 This is a module for [AzerothCore](http://www.azerothcore.org) that adds Premium account features to players.
 
diff --git a/src/premium.cpp b/src/premium.cpp
index a4f7195..62d09f9 100644
--- a/src/premium.cpp
+++ b/src/premium.cpp
@@ -122,7 +122,7 @@ public:
         return false; // Cast the spell on use normally
     }
 
-    void OnGossipSelect(Player* player, Item* item, uint32 /*sender*/, uint32 action)
+    void OnGossipSelect(Player* player, Item* item, uint32 /*sender*/, uint32 action) override
     {
         switch (action)
         {
@@ -318,7 +318,7 @@ public:
         npc->GetMotionMaster()->MoveFollow(player, PET_FOLLOW_DIST, player->GetFollowAngle());
         npc->setFaction(player->getFaction());
 
-        if (salute && !salute[0] == '\0')
+        if (salute && !(salute[0] == '\0'))
             npc->MonsterWhisper(salute, player, false);
     }
 };