Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
This commit is contained in:
Vincent-Michael
2014-08-24 22:42:47 +02:00
parent 2433a184ca 1c1f4fe33d
commit 4bdedcb878
6 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -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

1
contrib/merge_updates_windows.bat
View File

@@ -1,2 +1 @@
copy /a ..\sql\updates\world\*.sql /b world_updates.sql
copy /a ..\sql\updates\auth\*.sql /b auth_updates.sql

2
sql/updates/world/2014_08_24_03_world_version.sql
View File

@@ -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;

17
sql/updates/world/2014_08_24_04_world_conditions.sql Normal file
View File

@@ -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');

4
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -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)

3
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
View File

@@ -577,9 +577,6 @@ class boss_twilight_halion : public CreatureScript
break;
}
}
private:
EventMap events;
};
CreatureAI* GetAI(Creature* creature) const override