diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-05 21:15:35 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-05 21:15:35 +0200 |
| commit | 2d3fd62aeea189d67fb1fc8f3f018634e5b59196 (patch) | |
| tree | d5c7305f8b92977fca530c4e9aa08fcfe945f361 /sql | |
| parent | 341dabb4234f0cf7911c9d1f3365d0537642967f (diff) | |
| parent | d24bb958da09da08666f31541a1be5e59bdbb8f4 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Commands/cs_npc.cpp
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2013_08_05_00_world_sai.sql | 3 | ||||
| -rw-r--r-- | sql/updates/world/2013_08_05_01_world_misc.sql | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sql/updates/world/2013_08_05_00_world_sai.sql b/sql/updates/world/2013_08_05_00_world_sai.sql new file mode 100644 index 00000000000..05a675394c2 --- /dev/null +++ b/sql/updates/world/2013_08_05_00_world_sai.sql @@ -0,0 +1,3 @@ +-- Fix Redridge Mystic +DELETE FROM `smart_scripts` WHERE `entryorguid`=430 AND `id`=12; +UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=430 AND `id`=11; diff --git a/sql/updates/world/2013_08_05_01_world_misc.sql b/sql/updates/world/2013_08_05_01_world_misc.sql new file mode 100644 index 00000000000..a1e9aee50e7 --- /dev/null +++ b/sql/updates/world/2013_08_05_01_world_misc.sql @@ -0,0 +1,2 @@ +UPDATE `smart_scripts` SET `event_type`=2 WHERE `entryorguid`=7271 AND `source_type`=0 AND `id`=5 AND `link`=0; +UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='', `InhabitType`=7, `faction_A`=35, `faction_H`=35, `unit_flags`=0, `type_flags`=8, `dynamicflags`=128, `flags_extra`=0, `speed_walk`=2 WHERE `entry`= 15491; |