diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-25 23:42:40 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-04-25 23:42:40 +0200 |
| commit | 1390621f4da88d6749e42bea0a131fae74742fa4 (patch) | |
| tree | 5c6b3c03866feb85ade9f5f95b5cb7cbd5617f61 /sql/updates | |
| parent | 7edfbaeb6ee667584b14fc3f59189aa762ae38c5 (diff) | |
| parent | c81d6e9b4bec14a46fd4eb01ce51d874a12bf5f7 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/MiscHandler.cpp
src/server/scripts/Commands/cs_reload.cpp
Diffstat (limited to 'sql/updates')
| -rw-r--r-- | sql/updates/auth/2014_04_26_00_rbac_permissions.sql | 10 | ||||
| -rw-r--r-- | sql/updates/world/2014_04_24_04_world_creature_template.sql | 12 | ||||
| -rw-r--r-- | sql/updates/world/2014_04_26_00_world_command.sql | 5 |
3 files changed, 27 insertions, 0 deletions
diff --git a/sql/updates/auth/2014_04_26_00_rbac_permissions.sql b/sql/updates/auth/2014_04_26_00_rbac_permissions.sql new file mode 100644 index 00000000000..11beed8f106 --- /dev/null +++ b/sql/updates/auth/2014_04_26_00_rbac_permissions.sql @@ -0,0 +1,10 @@ +SET @id = 614; + +-- Add new permissions +DELETE FROM `rbac_permissions` WHERE `id`=@id; +INSERT INTO `rbac_permissions` (`id`, `name`) VALUES +(@id, 'Command: broadcast_text'); + +DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=@id; +INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES +(196, @id); diff --git a/sql/updates/world/2014_04_24_04_world_creature_template.sql b/sql/updates/world/2014_04_24_04_world_creature_template.sql new file mode 100644 index 00000000000..50fb9d77624 --- /dev/null +++ b/sql/updates/world/2014_04_24_04_world_creature_template.sql @@ -0,0 +1,12 @@ +-- +UPDATE `creature_template` SET `faction_A`=14, `faction_H`=14 WHERE `entry`=40142; +UPDATE `creature_template` SET `faction_A`=974, `faction_H`=974 WHERE `entry`=37813; +UPDATE `creature_template` SET `faction_A`=714, `faction_H`=714 WHERE `entry`=37581; +UPDATE `creature_template` SET `faction_A`=1078, `faction_H`=1078 WHERE `entry`=34705; + +UPDATE `creature_template` SET `faction_A`=21, `faction_H`=21 WHERE `entry` IN (37232,38362); +UPDATE `creature_template` SET `faction_A`=534, `faction_H`=534 WHERE `entry` IN (37591,37606); +UPDATE `creature_template` SET `faction_A`=1770, `faction_H`=1770 WHERE `entry` IN (37580,37606); +UPDATE `creature_template` SET `faction_A`=534, `faction_H`=534 WHERE `entry` IN (37498,37605); +UPDATE `creature_template` SET `faction_A`=875, `faction_H`=875 WHERE `entry` IN (34702,36082); +UPDATE `creature_template` SET `faction_A`=55, `faction_H`=55 WHERE `entry` IN (34703,36087); diff --git a/sql/updates/world/2014_04_26_00_world_command.sql b/sql/updates/world/2014_04_26_00_world_command.sql new file mode 100644 index 00000000000..6189e81a1d7 --- /dev/null +++ b/sql/updates/world/2014_04_26_00_world_command.sql @@ -0,0 +1,5 @@ +SET @id = 614; + +DELETE FROM `command` WHERE `name` = 'broadcast_text'; +INSERT INTO `command` (`name`, `permission`, `help`) VALUES +('broadcast_text', @id, 'Syntax: .broadcast_text\r\n\r\nReload broadcast_text table.'); |