From de0929bc8e30d8b40ffb1a3499f3adbc47377660 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 18 May 2021 12:39:00 -0400 Subject: [PATCH] Core/Scripts: Remove deprecated overload of QuestReward without LootItemType argument Port From (https://github.com/TrinityCore/TrinityCore/commit/b9d63c2009c842a12876c2069ba0a3dd7d277f4a) --- Source/Game/AI/CoreAI/CreatureAI.cs | 4 ---- Source/Game/AI/CoreAI/GameObjectAI.cs | 4 ---- Source/Game/AI/SmartScripts/SmartAI.cs | 4 ++-- Source/Scripts/World/NpcSpecial.cs | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Source/Game/AI/CoreAI/CreatureAI.cs b/Source/Game/AI/CoreAI/CreatureAI.cs index 3347d84d3..d11309d14 100644 --- a/Source/Game/AI/CoreAI/CreatureAI.cs +++ b/Source/Game/AI/CoreAI/CreatureAI.cs @@ -488,10 +488,6 @@ namespace Game.AI public virtual void QuestAccept(Player player, Quest quest) { } // Called when a player completes a quest and is rewarded, opt is the selected item's index or 0 - public virtual void QuestReward(Player player, Quest quest, uint opt) - { - QuestReward(player, quest, LootItemType.Item, opt); - } public virtual void QuestReward(Player player, Quest quest, LootItemType type, uint opt) { } /// == Waypoints system ============================= diff --git a/Source/Game/AI/CoreAI/GameObjectAI.cs b/Source/Game/AI/CoreAI/GameObjectAI.cs index 33c0d432c..5b99b2846 100644 --- a/Source/Game/AI/CoreAI/GameObjectAI.cs +++ b/Source/Game/AI/CoreAI/GameObjectAI.cs @@ -75,10 +75,6 @@ namespace Game.AI /// /// Called when a player completes a quest and is rewarded, opt is the selected item's index or 0 /// - public virtual void QuestReward(Player player, Quest quest, uint opt) - { - QuestReward(player, quest, LootItemType.Item, opt); - } public virtual void QuestReward(Player player, Quest quest, LootItemType type, uint opt) { } // Called when a Player clicks a GameObject, before GossipHello diff --git a/Source/Game/AI/SmartScripts/SmartAI.cs b/Source/Game/AI/SmartScripts/SmartAI.cs index f6cbffdee..138dbd8c0 100644 --- a/Source/Game/AI/SmartScripts/SmartAI.cs +++ b/Source/Game/AI/SmartScripts/SmartAI.cs @@ -821,7 +821,7 @@ namespace Game.AI GetScript().ProcessEventsFor(SmartEvents.AcceptedQuest, player, quest.Id); } - public override void QuestReward(Player player, Quest quest, uint opt) + public override void QuestReward(Player player, Quest quest, LootItemType type, uint opt) { GetScript().ProcessEventsFor(SmartEvents.RewardQuest, player, quest.Id, opt); } @@ -1130,7 +1130,7 @@ namespace Game.AI GetScript().ProcessEventsFor(SmartEvents.AcceptedQuest, player, quest.Id, 0, false, null, me); } - public override void QuestReward(Player player, Quest quest, uint opt) + public override void QuestReward(Player player, Quest quest, LootItemType type, uint opt) { GetScript().ProcessEventsFor(SmartEvents.RewardQuest, player, quest.Id, opt, false, null, me); } diff --git a/Source/Scripts/World/NpcSpecial.cs b/Source/Scripts/World/NpcSpecial.cs index 1fac21a34..4719e9c28 100644 --- a/Source/Scripts/World/NpcSpecial.cs +++ b/Source/Scripts/World/NpcSpecial.cs @@ -668,7 +668,7 @@ namespace Scripts.World.NpcSpecial Reset(); } - public override void QuestReward(Player player, Quest quest, uint opt) + public override void QuestReward(Player player, Quest quest, LootItemType type, uint opt) { if (quest.Id == QuestConst.Cluck) Reset();