diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | contrib/merge_updates_windows.bat | 1 | ||||
| -rw-r--r-- | sql/updates/world/2014_08_24_03_world_version.sql | 2 | ||||
| -rw-r--r-- | sql/updates/world/2014_08_24_04_world_conditions.sql | 17 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp | 3 |
6 files changed, 21 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 4f4c6870ec7..97b8ec30f07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,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 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/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; 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'); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 6742852a481..e056b6d87b1 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -14651,8 +14651,6 @@ void Unit::SetInPhase(uint32 id, bool update, bool apply) if (!IsInWorld()) return; - RemoveNotOwnSingleTargetAuras(0, true); - if (GetTypeId() == TYPEID_UNIT || (!ToPlayer()->IsGameMaster() && !ToPlayer()->GetSession()->PlayerLogout())) { HostileRefManager& refManager = getHostileRefManager(); @@ -14692,6 +14690,8 @@ void Unit::SetInPhase(uint32 id, bool update, bool apply) if (m_SummonSlot[i]) if (Creature* summon = GetMap()->GetCreature(m_SummonSlot[i])) summon->SetInPhase(id, true, apply); + + RemoveNotOwnSingleTargetAuras(0, true); } void Unit::UpdateObjectVisibility(bool forced) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 78e8f2d248e..a6743811b34 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -577,9 +577,6 @@ class boss_twilight_halion : public CreatureScript break; } } - - private: - EventMap events; }; CreatureAI* GetAI(Creature* creature) const override |