From b086b2120710b6cffe25d0f1e588898b05768b67 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 24 Aug 2014 17:27:12 +0200 Subject: [PATCH 1/7] SQL: Fix typo --- sql/updates/world/2014_08_24_03_world_version.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/updates/world/2014_08_24_03_world_version.sql b/sql/updates/world/2014_08_24_03_world_version.sql index 4fdfda68ded..2531a982b34 100644 --- a/sql/updates/world/2014_08_24_03_world_version.sql +++ b/sql/updates/world/2014_08_24_03_world_version.sql @@ -1 +1 @@ -UPDATE `version` SET `db_version`='TDB 335.54', `cache_id`=54 LIMIT 1; +UPDATE `version` SET `db_version`='TDB 335.55', `cache_id`=55 LIMIT 1; From 4a58341e6db4ffb26356cfd7af90385de94128ff Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 24 Aug 2014 18:08:29 +0200 Subject: [PATCH 2/7] Core: Fix warnings --- contrib/merge_updates_windows.bat | 1 - src/server/game/Conditions/ConditionMgr.cpp | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/merge_updates_windows.bat b/contrib/merge_updates_windows.bat index 96fafb817ba..c43d4adf907 100644 --- a/contrib/merge_updates_windows.bat +++ b/contrib/merge_updates_windows.bat @@ -1,2 +1 @@ copy /a ..\sql\updates\world\*.sql /b world_updates.sql -copy /a ..\sql\updates\auth\*.sql /b auth_updates.sql \ No newline at end of file diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 948dc9b7cb3..03051451193 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -227,6 +227,8 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) case TYPEID_GAMEOBJECT: condMeets &= object->ToGameObject()->GetDBTableGUIDLow() == ConditionValue3; break; + default: + break; } } } From 32673f63c57612fde9dfb3dcd0f67b2a459fa7ca Mon Sep 17 00:00:00 2001 From: DDuarte Date: Sun, 24 Aug 2014 17:24:21 +0100 Subject: [PATCH 3/7] CI/Travis: Change to gcc in an attempt to reduce the number of killed builds --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4f4c6870ec7..f3626a8473a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: cpp compiler: - - clang + - gcc git: depth: 1 @@ -18,6 +18,8 @@ install: - mysql -uroot -e 'create database test_mysql;' - mkdir bin - cd bin + - export CC=gcc-4.8 + - export CXX=g++-4.8 - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=1 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=1 -DSERVERS=1 -DNOJEM=1 -DCMAKE_BUILD_TYPE=Release script: From 98fb33003c4e58a6b7d9d2a64c9ea615940d86d8 Mon Sep 17 00:00:00 2001 From: DDuarte Date: Sun, 24 Aug 2014 19:18:24 +0100 Subject: [PATCH 4/7] Revert "CI/Travis: Change to gcc in an attempt to reduce the number of killed builds" This reverts commit 32673f63c57612fde9dfb3dcd0f67b2a459fa7ca. --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3626a8473a..97b8ec30f07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: cpp compiler: - - gcc + - clang git: depth: 1 @@ -18,8 +18,6 @@ install: - mysql -uroot -e 'create database test_mysql;' - mkdir bin - cd bin - - export CC=gcc-4.8 - - export CXX=g++-4.8 - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=1 -DUSE_COREPCH=0 -DUSE_SCRIPTPCH=0 -DTOOLS=1 -DSCRIPTS=1 -DSERVERS=1 -DNOJEM=1 -DCMAKE_BUILD_TYPE=Release script: @@ -31,4 +29,4 @@ script: - for file in sql/updates/world/*.sql; do mysql -uroot world < $file; done - mysql -uroot < sql/create/drop_mysql.sql - cd bin - - make -j 8 + - make -j 4 From 7fa49c8d62f9284c2a31f939612771ea980246de Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 24 Aug 2014 20:35:44 +0200 Subject: [PATCH 5/7] Scripts/Ruby Sanctum: Fix Halion event ai not being updated Fix Halion event ai not being updated due to private member hiding base class member. Fixes #12835 --- .../Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 43c295d5f64..d08c6f66903 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -578,9 +578,6 @@ class boss_twilight_halion : public CreatureScript break; } } - - private: - EventMap events; }; CreatureAI* GetAI(Creature* creature) const override From 72b9b50bc76badf3a473d6995abc08c2d512081f Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 24 Aug 2014 22:08:48 +0200 Subject: [PATCH 6/7] Core/Unit: Fix some phasing change problems with vehicle --- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index aed06441dd7..d75e7db11fe 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -16328,8 +16328,6 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update) if (IsInWorld()) { - RemoveNotOwnSingleTargetAuras(newPhaseMask); // we can lost access to caster or target - // modify hostile references for new phasemask, some special cases deal with hostile references themselves if (GetTypeId() == TYPEID_UNIT || (!ToPlayer()->IsGameMaster() && !ToPlayer()->GetSession()->PlayerLogout())) { @@ -16377,6 +16375,8 @@ void Unit::SetPhaseMask(uint32 newPhaseMask, bool update) if (m_SummonSlot[i]) if (Creature* summon = GetMap()->GetCreature(m_SummonSlot[i])) summon->SetPhaseMask(newPhaseMask, true); + + RemoveNotOwnSingleTargetAuras(newPhaseMask); // we can lost access to caster or target } // Update visibility after phasing pets and summons so they wont despawn From 1c1f4fe33d75ca00fa6fd3370ff0f13731523f14 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sun, 24 Aug 2014 21:25:30 +0100 Subject: [PATCH 7/7] DB/Conditions: Injured rainspeaker oracle Rewrite of conditions I used in https://github.com/TrinityCore/TrinityCore/commit/0c1587cc916de846eedf3ccf48f80caf053f427b for a few things I overlooked when I writ original conditions, like fix the issue where someone without quest could click gossip menus and select the gossip menu to get the injured oracle to his feet and then make it impossible to turn in just following orders, gossip is now only displayed if player has or needs to take quest or select gossip option to start event. conditions to prevent gossip option been selected to start wp while has feign death. --- .../world/2014_08_24_04_world_conditions.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/world/2014_08_24_04_world_conditions.sql diff --git a/sql/updates/world/2014_08_24_04_world_conditions.sql b/sql/updates/world/2014_08_24_04_world_conditions.sql new file mode 100644 index 00000000000..6f4da23e590 --- /dev/null +++ b/sql/updates/world/2014_08_24_04_world_conditions.sql @@ -0,0 +1,17 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=9677; +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=28217; + +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15, 9677, 0, 0, 0, 1, 1, 51329, 0, 0, 0, 0, 0, '', 'Injured Rainspeaker Oracle only display gossip if injured rainspeaker oracle has aura Feign Death'), +(15, 9677, 0, 0, 0, 9, 0, 12540, 0, 0, 0, 0, 0, '', 'Injured Rainspeaker Oracle only display gossip if Just following orders taken'), +(15, 9677, 0, 0, 0, 8, 0, 12570, 0, 0, 1, 0, 0, '', 'Injured Rainspeaker Oracle only display gossip if Player does not have Fortunate Misunderstandings rewarded'), +(15, 9677, 0, 0, 0,28, 0, 12570, 0, 0, 1, 0, 0, '', 'Injured Rainspeaker Oracle only display gossip if Player does not have Fortunate Misunderstandings complete'), +(15, 9677, 0, 0, 1, 1, 1, 51329, 0, 0, 0, 0, 0, '', 'Injured Rainspeaker Oracle only display gossip if injured rainspeaker oracle has aura Feign Death'), +(15, 9677, 0, 0, 1, 8, 0, 12540, 0, 0, 0, 0, 0, '', 'Injured Rainspeaker Oracle only display gossip if Just following orders rewarded'), +(15, 9677, 0, 0, 1, 8, 0, 12570, 0, 0, 1, 0, 0, '', 'Injured Rainspeaker Oracle only display gossip if Player does not have Fortunate Misunderstandings rewarded'), +(15, 9677, 0, 0, 1,28, 0, 12570, 0, 0, 1, 0, 0, '', 'Injured Rainspeaker Oracle only display gossip if Player does not have Fortunate Misunderstandings complete'), +(22, 7, 28217, 0, 0, 9, 0, 12540, 0, 0, 0, 0, 0, '', 'Injured Rainspeaker Oracle - Only run SAI if player has Just Following Orders taken'), +(22, 8, 28217, 0, 0, 9, 0, 12570, 0, 0, 0, 0, 0, '', 'Injured Rainspeaker Oracle - Only run SAI if player has Fortunate Misunderstandings Taken'), +(22, 8, 28217, 0, 0, 1, 1, 51329, 0, 0, 1, 0, 0, '', 'Injured Rainspeaker Oracle - Only run SAI if Injured rainspeaker oracle does have aura - feign death'), +(22, 9, 28217, 0, 0, 16, 0, 1101, 0, 0, 0, 0, 0, '', 'Injured Rainspeaker Oracle - Only run SAI if player is Alliance'), +(22, 10, 28217, 0, 0, 16, 0, 690, 0, 0, 0, 0, 0, '', 'Injured Rainspeaker Oracle - Only run SAI if player is Horde');