diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-06 10:03:44 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-06 10:03:44 +0200 |
| commit | 820f002135c03fb200488756479d878430019caa (patch) | |
| tree | 9312532f983f477b2337bc55a70291fb03a444ed /sql | |
| parent | 7b2ee373b14d9b37919804ec68e92567acd763c0 (diff) | |
| parent | dc8385f4c0e192e037924e1d2c29be200fffc0d7 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Miscellaneous/SharedDefines.h
src/server/scripts/Commands/cs_reload.cpp
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2013_08_05_02_world_quest_relation_tables.sql | 28 | ||||
| -rw-r--r-- | sql/updates/world/2013_08_06_00_world_item_template.sql | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/sql/updates/world/2013_08_05_02_world_quest_relation_tables.sql b/sql/updates/world/2013_08_05_02_world_quest_relation_tables.sql new file mode 100644 index 00000000000..a7d2af1725a --- /dev/null +++ b/sql/updates/world/2013_08_05_02_world_quest_relation_tables.sql @@ -0,0 +1,28 @@ +ALTER TABLE `creature_questrelation` RENAME `creature_queststarter`; +ALTER TABLE `creature_involvedrelation` RENAME `creature_questender`; +ALTER TABLE `gameobject_questrelation` RENAME `gameobject_queststarter`; +ALTER TABLE `gameobject_involvedrelation` RENAME `gameobject_questender`; + +UPDATE `command` SET + `name` = 'reload gameobject_queststarter', + `help` = 'Syntax: .reload gameobject_queststarter\nReload gameobject_queststarter table.' +WHERE + `name` = 'reload gameobject_questrelation'; + +UPDATE `command` SET + `name` = 'reload gameobject_questender', + `help` = 'Syntax: .reload gameobject_questender\nReload gameobject_questender table.' +WHERE + `name` = 'reload gameobject_questrelation'; + +UPDATE `command` SET + `name` = 'reload creature_queststarter', + `help` = 'Syntax: .reload creature_queststarter\nReload creature_queststarter table.' +WHERE + `name` = 'reload creature_questrelation'; + +UPDATE `command` SET + `name` = 'reload creature_questender', + `help` = 'Syntax: .reload creature_questender\nReload creature_questender table.' +WHERE + `name` = 'reload creature_involvedrelation'; diff --git a/sql/updates/world/2013_08_06_00_world_item_template.sql b/sql/updates/world/2013_08_06_00_world_item_template.sql new file mode 100644 index 00000000000..15cc7ddfa5a --- /dev/null +++ b/sql/updates/world/2013_08_06_00_world_item_template.sql @@ -0,0 +1 @@ +UPDATE `item_template` SET `spellcharges_1`=-1 WHERE `entry`=45008; -- confirmed in 4.x itemsparse |