From be763ea60306cf2c4c8a0db177e6a28c2825ad5f Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 27 Feb 2022 15:00:27 -0500 Subject: [PATCH] Core/Quests: Fixed quest select query Port From (https://github.com/TrinityCore/TrinityCore/commit/18cc0b2e4a5023adf61aa959b339dd6114865680) --- Source/Game/Globals/ObjectManager.cs | 48 ++++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Source/Game/Globals/ObjectManager.cs b/Source/Game/Globals/ObjectManager.cs index 210f7cf49..ee952ee03 100644 --- a/Source/Game/Globals/ObjectManager.cs +++ b/Source/Game/Globals/ObjectManager.cs @@ -3655,7 +3655,7 @@ namespace Game } } } - + public void AddCreatureToGrid(CreatureData data) { AddSpawnDataToGrid(data); @@ -6893,36 +6893,36 @@ namespace Game SQLResult result = DB.World.Query("SELECT " + //0 1 2 3 4 5 6 7 8 9 "ID, QuestType, QuestPackageID, ContentTuningID, QuestSortID, QuestInfoID, SuggestedGroupNum, RewardNextQuest, RewardXPDifficulty, RewardXPMultiplier, " + - //10 11 12 13 14 15 16 17 - "RewardMoney, RewardMoneyDifficulty, RewardMoneyMultiplier, RewardBonusMoney, RewardSpell, RewardHonor, RewardKillHonor, StartItem, " + - //18 19 20 21 22 23 + //10 11 12 13 14 15 16 + "RewardMoneyDifficulty, RewardMoneyMultiplier, RewardBonusMoney, RewardSpell, RewardHonor, RewardKillHonor, StartItem, " + + //17 18 19 20 21 22 "RewardArtifactXPDifficulty, RewardArtifactXPMultiplier, RewardArtifactCategoryID, Flags, FlagsEx, FlagsEx2, " + - //24 25 26 27 28 29 30 31 + //23 24 25 26 27 28 29 30 "RewardItem1, RewardAmount1, ItemDrop1, ItemDropQuantity1, RewardItem2, RewardAmount2, ItemDrop2, ItemDropQuantity2, " + - //32 33 34 35 36 37 38 39 + //31 32 33 34 35 36 37 38 "RewardItem3, RewardAmount3, ItemDrop3, ItemDropQuantity3, RewardItem4, RewardAmount4, ItemDrop4, ItemDropQuantity4, " + - //40 41 42 43 44 45 + //39 40 41 42 43 44 "RewardChoiceItemID1, RewardChoiceItemQuantity1, RewardChoiceItemDisplayID1, RewardChoiceItemID2, RewardChoiceItemQuantity2, RewardChoiceItemDisplayID2, " + - //46 47 48 49 50 51 + //45 46 47 48 49 50 "RewardChoiceItemID3, RewardChoiceItemQuantity3, RewardChoiceItemDisplayID3, RewardChoiceItemID4, RewardChoiceItemQuantity4, RewardChoiceItemDisplayID4, " + - //52 53 54 55 56 57 + //51 52 53 54 55 56 "RewardChoiceItemID5, RewardChoiceItemQuantity5, RewardChoiceItemDisplayID5, RewardChoiceItemID6, RewardChoiceItemQuantity6, RewardChoiceItemDisplayID6, " + - //58 59 60 61 62 63 64 65 + //57 58 59 60 61 62 63 64 "POIContinent, POIx, POIy, POIPriority, RewardTitle, RewardArenaPoints, RewardSkillLineID, RewardNumSkillUps, " + - //66 67 68 69 + //65 66 67 68 "PortraitGiver, PortraitGiverMount, PortraitGiverModelSceneID, PortraitTurnIn, " + - //70 71 72 73 74 75 76 77 + //69 70 71 72 73 74 75 76 "RewardFactionID1, RewardFactionValue1, RewardFactionOverride1, RewardFactionCapIn1, RewardFactionID2, RewardFactionValue2, RewardFactionOverride2, RewardFactionCapIn2, " + - //78 79 80 81 82 83 84 85 + //77 78 79 80 81 82 83 84 "RewardFactionID3, RewardFactionValue3, RewardFactionOverride3, RewardFactionCapIn3, RewardFactionID4, RewardFactionValue4, RewardFactionOverride4, RewardFactionCapIn4, " + - //86 87 88 89 90 + //85 86 87 88 89 "RewardFactionID5, RewardFactionValue5, RewardFactionOverride5, RewardFactionCapIn5, RewardFactionFlags, " + - //91 92 93 94 95 96 97 98 + //90 91 92 93 94 95 96 97 "RewardCurrencyID1, RewardCurrencyQty1, RewardCurrencyID2, RewardCurrencyQty2, RewardCurrencyID3, RewardCurrencyQty3, RewardCurrencyID4, RewardCurrencyQty4, " + - //99 100 101 102 103 104 105 106 107 + //98 99 100 101 102 103 104 105 106 "AcceptedSoundKitID, CompleteSoundKitID, AreaGroupID, TimeAllowed, AllowableRaces, TreasurePickerID, Expansion, ManagedWorldStateID, QuestSessionBonus, " + - //108 109 110 111 112 113 114 115 116 - "LogTitle, LogDescription, QuestDescription, AreaDescription, PortraitGiverText, PortraitGiverName, PortraitTurnInText, PortraitTurnInName, QuestCompletionLog" + + //107 108 109 110 111 112 113 114 115 + "LogTitle, LogDescription, QuestDescription, AreaDescription, PortraitGiverText, PortraitGiverName, PortraitTurnInText, PortraitTurnInName, QuestCompletionLog " + " FROM quest_template"); if (result.IsEmpty()) @@ -8135,8 +8135,8 @@ namespace Game return _questTemplatesAutoPush; } public MultiMap GetGOQuestRelationMapHACK() { return _goQuestRelations; } - public QuestRelationResult GetGOQuestRelations(uint entry) { return GetQuestRelationsFrom(_goQuestRelations, entry, true); } - public QuestRelationResult GetGOQuestInvolvedRelations(uint entry) { return GetQuestRelationsFrom(_goQuestInvolvedRelations, entry, false);} + public QuestRelationResult GetGOQuestRelations(uint entry) { return GetQuestRelationsFrom(_goQuestRelations, entry, true); } + public QuestRelationResult GetGOQuestInvolvedRelations(uint entry) { return GetQuestRelationsFrom(_goQuestInvolvedRelations, entry, false); } public List GetGOQuestInvolvedRelationReverseBounds(uint questId) { return _goQuestInvolvedRelationsReverse.LookupByKey(questId); } public MultiMap GetCreatureQuestRelationMapHACK() { return _creatureQuestRelations; } public QuestRelationResult GetCreatureQuestRelations(uint entry) { return GetQuestRelationsFrom(_creatureQuestRelations, entry, true); } @@ -8182,8 +8182,8 @@ namespace Game { return _exclusiveQuestGroups.LookupByKey(exclusiveGroupId); } - QuestRelationResult GetQuestRelationsFrom(MultiMap map, uint key, bool onlyActive) { return new QuestRelationResult(map.LookupByKey(key), onlyActive);} - + QuestRelationResult GetQuestRelationsFrom(MultiMap map, uint key, bool onlyActive) { return new QuestRelationResult(map.LookupByKey(key), onlyActive); } + //Spells /Skills / Phases public void LoadPhases() { @@ -10683,7 +10683,7 @@ namespace Game { return _vehicleSeatAddonStore.LookupByKey(seatId); } - + #region Fields //General Dictionary CypherStringStorage = new(); @@ -11862,7 +11862,7 @@ namespace Game } public bool HasQuest(uint questId) - { + { return Contains(questId) && (!_onlyActive || Quest.IsTakingQuestEnabled(questId)); } }