Skip to content

Commit c984383

Browse files
committed
[Database] Adjustments for the new gossip format
1 parent fb23a78 commit c984383

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

WDE.DatabaseEditors/DbDefinitions/gossip_menu.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "gossip_menu",
33
"compatibility": [
4-
"TrinityWrath", "TrinityCata"
4+
"TrinityWrath", "TrinityCata", "TrinityMaster"
55
],
66
"name": "Gossip Menu",
77
"single_solution_name": "{key} gossip menu",

WDE.DatabaseEditors/DbDefinitions/gossip_menu_option.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "gossip_menu_option",
33
"compatibility": [
4-
"TrinityWrath", "Azeroth"
4+
"TrinityWrath", "Azeroth", "TrinityMaster"
55
],
66
"name": "Gossip Menu Option",
77
"single_solution_name": "{key} gossip menu options",

WDE.DatabaseEditors/DbDefinitions/spell_linked_spell.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "spell_linked_spell",
33
"compatibility": [
4-
"TrinityWrath", "TrinityCata"
4+
"TrinityWrath", "TrinityCata", "TrinityMaster"
55
],
66
"name": "Spell Linked Spell",
77
"single_solution_name": "{name} linked spell editor",

WoWDatabaseEditor.Common/WDE.TrinityMySqlDatabase/Database/TrinityMasterMySqlDatabaseProvider.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,7 @@ public override async Task<List<ICreatureTemplate>> GetCreatureTemplatesAsync()
3737
public override async Task<List<IGossipMenuOption>> GetGossipMenuOptionsAsync(uint menuId)
3838
{
3939
await using var model = Database();
40-
return await (from t in model.SplitGossipMenuOptions
41-
join actions in model.SplitGossipMenuOptionActions on t.MenuId equals actions.MenuId into adn
42-
from subaddon in adn.DefaultIfEmpty()
43-
join boxes in model.SplitGossipMenuOptionBoxes on t.MenuId equals boxes.MenuId into box
44-
from subaddon2 in box.DefaultIfEmpty()
45-
orderby t.MenuId
46-
select t.SetAction(subaddon).SetBox(subaddon2)).ToListAsync<IGossipMenuOption>();
40+
return await model.GossipMenuOptions.Where(option => option.MenuId == menuId).ToListAsync<IGossipMenuOption>();
4741
}
4842

4943
public override async Task<List<IBroadcastText>> GetBroadcastTextsAsync()

0 commit comments

Comments
 (0)