diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-08-12 13:18:19 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-08-12 13:18:19 -0500 |
| commit | 61fcae113b92053388433c2a98e0ec7f3c360acd (patch) | |
| tree | 10f3da98a5f8dd7056fc28a4edb6bd1cda0c30e8 /sql/updates | |
| parent | 75af5ac3535e8726a03f9575357f44f3981989a0 (diff) | |
| parent | f92946e128ed44de21c97900b0a935c7c55fcd65 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Kalimdor/moonglade.cpp
Diffstat (limited to 'sql/updates')
| -rw-r--r-- | sql/updates/world/2012_08_12_00_world_conditions.sql | 3 | ||||
| -rw-r--r-- | sql/updates/world/2012_08_12_01_world_spell_script_names.sql (renamed from sql/updates/world/2012_05_15_00_world_spell_script_names.sql) | 0 | ||||
| -rw-r--r-- | sql/updates/world/2012_08_12_02_world_spell_script_names.sql (renamed from sql/updates/world/2012_02_02_01_world_spell_script_names.sql) | 0 |
3 files changed, 3 insertions, 0 deletions
diff --git a/sql/updates/world/2012_08_12_00_world_conditions.sql b/sql/updates/world/2012_08_12_00_world_conditions.sql new file mode 100644 index 00000000000..6e1fd0ac1db --- /dev/null +++ b/sql/updates/world/2012_08_12_00_world_conditions.sql @@ -0,0 +1,3 @@ +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=58124; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES +(13,1,58124,0,0,32,0,0x90,0,0,0,0,'','Mal''Ganis Kill Credit - Player target'); diff --git a/sql/updates/world/2012_05_15_00_world_spell_script_names.sql b/sql/updates/world/2012_08_12_01_world_spell_script_names.sql index 980aceff519..980aceff519 100644 --- a/sql/updates/world/2012_05_15_00_world_spell_script_names.sql +++ b/sql/updates/world/2012_08_12_01_world_spell_script_names.sql diff --git a/sql/updates/world/2012_02_02_01_world_spell_script_names.sql b/sql/updates/world/2012_08_12_02_world_spell_script_names.sql index 15ca9c43cc5..15ca9c43cc5 100644 --- a/sql/updates/world/2012_02_02_01_world_spell_script_names.sql +++ b/sql/updates/world/2012_08_12_02_world_spell_script_names.sql |