From 6a2be94282d0a2174c92b74732a2e5d8031dee7c Mon Sep 17 00:00:00 2001 From: Paul Coene Date: Wed, 21 Dec 2016 14:38:24 -0500 Subject: [PATCH 1/9] Alliance spell line for chanters was not working. --- zone/spells.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zone/spells.cpp b/zone/spells.cpp index 814f01be6..a44a2ef5d 100644 --- a/zone/spells.cpp +++ b/zone/spells.cpp @@ -3631,7 +3631,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r } - if(!IsBeneficialAllowed(spelltar) || + if((!IsAllianceSpellLine(spell_id) && !IsBeneficialAllowed(spelltar)) || (IsGroupOnlySpell(spell_id) && !( (pBasicGroup && ((pBasicGroup == pBasicGroupTarget) || (pBasicGroup == pBasicGroupTargetPet))) || //Basic Group From 0a4ccb11aa7cb4cf430bc5a1e94564c5f13b4167 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 12 Jan 2017 17:55:08 -0500 Subject: [PATCH 2/9] Update travis-ci to use newer VM --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 74e5701ae..8083c7772 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: cpp compiler: gcc +dist: trusty sudo: false addons: apt: @@ -21,4 +22,4 @@ notifications: email: false irc: channels: "irc.eqemulator.net#eqemucoders" -os: linux \ No newline at end of file +os: linux From 50a67c76e7eb63d6009785b76e40f8b4be0d7aab Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 12 Jan 2017 18:06:13 -0500 Subject: [PATCH 3/9] Try newer GCC versions? --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8083c7772..392c509ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,11 @@ dist: trusty sudo: false addons: apt: + sources: + - ubuntu-toolchain-r-test packages: + - gcc-5 + - g++-5 - libmysqlclient-dev - libperl-dev - libboost-dev From da08a622f153326b52161daab1a7e7bfcefa212a Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 12 Jan 2017 18:10:45 -0500 Subject: [PATCH 4/9] Gotta update env vars too I guess --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 392c509ca..7d6688b99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ addons: - libboost-dev - liblua5.1-0-dev - zlib1g-dev +env: COMPILER=g++-5 script: - cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON - make -j8 From 6cef5c6beb99514bc774f038687b06c7ae856416 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 12 Jan 2017 18:19:04 -0500 Subject: [PATCH 5/9] Gotta set them actually --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d6688b99..40ea4f915 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,8 @@ addons: - libboost-dev - liblua5.1-0-dev - zlib1g-dev -env: COMPILER=g++-5 script: - - cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON + - CC=gcc-5 CXX=g++-5 cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON - make -j8 - ./bin/tests branches: From e3f15de1f869cdfb9eaf7c7ff3d6597acbe0a506 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 12 Jan 2017 18:25:06 -0500 Subject: [PATCH 6/9] Revert "Gotta set them actually" This reverts commit 6cef5c6beb99514bc774f038687b06c7ae856416. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 40ea4f915..7d6688b99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,9 @@ addons: - libboost-dev - liblua5.1-0-dev - zlib1g-dev +env: COMPILER=g++-5 script: - - CC=gcc-5 CXX=g++-5 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 -j8 - ./bin/tests branches: From ffdc933ce01d320487aee24655f0b3107bdf82c7 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 12 Jan 2017 18:25:16 -0500 Subject: [PATCH 7/9] Revert "Gotta update env vars too I guess" This reverts commit da08a622f153326b52161daab1a7e7bfcefa212a. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7d6688b99..392c509ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,6 @@ addons: - libboost-dev - liblua5.1-0-dev - zlib1g-dev -env: COMPILER=g++-5 script: - cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON - make -j8 From a4fda2a951591779a7c8eb5a71c733ecaf12a843 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 12 Jan 2017 18:25:25 -0500 Subject: [PATCH 8/9] Revert "Try newer GCC versions?" This reverts commit 50a67c76e7eb63d6009785b76e40f8b4be0d7aab. --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 392c509ca..8083c7772 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,7 @@ dist: trusty sudo: false addons: apt: - sources: - - ubuntu-toolchain-r-test packages: - - gcc-5 - - g++-5 - libmysqlclient-dev - libperl-dev - libboost-dev From 891fa0411c437b3fa3f3e1404d4c293e4ee68ea8 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 12 Jan 2017 18:25:32 -0500 Subject: [PATCH 9/9] Revert "Update travis-ci to use newer VM" This reverts commit 0a4ccb11aa7cb4cf430bc5a1e94564c5f13b4167. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8083c7772..74e5701ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: cpp compiler: gcc -dist: trusty sudo: false addons: apt: @@ -22,4 +21,4 @@ notifications: email: false irc: channels: "irc.eqemulator.net#eqemucoders" -os: linux +os: linux \ No newline at end of file