diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-11 18:37:31 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-11 18:37:31 +0200 |
| commit | f506ee3077a5a8c86d3a02ab06c1c3e91b7d8d7e (patch) | |
| tree | f0844a12facac7cd7a94c47cbab56d2bb55962a4 /sql | |
| parent | fa0aaa5fa4ed93992e54cce411944e41d1fd831d (diff) | |
| parent | eefdceea71135c6b281d181233da04159e63b179 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.h
src/server/game/Spells/SpellMgr.cpp
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2013_08_11_00_world_spell_script_names.sql | 3 | ||||
| -rw-r--r-- | sql/updates/world/2013_08_11_01_world_eai_335.sql | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sql/updates/world/2013_08_11_00_world_spell_script_names.sql b/sql/updates/world/2013_08_11_00_world_spell_script_names.sql new file mode 100644 index 00000000000..00aee104022 --- /dev/null +++ b/sql/updates/world/2013_08_11_00_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=66545; +INSERT INTO `spell_script_names` (`spell_id` ,`ScriptName`) VALUES +(66545, 'spell_paletress_summon_memory'); diff --git a/sql/updates/world/2013_08_11_01_world_eai_335.sql b/sql/updates/world/2013_08_11_01_world_eai_335.sql new file mode 100644 index 00000000000..94b5324e50e --- /dev/null +++ b/sql/updates/world/2013_08_11_01_world_eai_335.sql @@ -0,0 +1,3 @@ +UPDATE `creature_ai_scripts` SET `action1_param1`=15 WHERE `id`=1730003; -- Call For Help radius from 0 to 15 +UPDATE `creature_ai_scripts` SET `action1_type`=`action2_type`,`action2_type`=0,`action1_param1`=`action2_param1`,`action2_param1`=0 WHERE `id` IN (1772701,3547605); -- Action type gap +UPDATE `creature_ai_scripts` SET `action1_param1`=10255 WHERE `id`=1688002; -- Wrong quest credit (used npc id, should use quest id), fixes quest Testing the Antidote (or at least it should) |