From 49cf411e04c01e35af3d233dbf9638286df665c1 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 5 Feb 2024 13:27:36 -0500 Subject: [PATCH] Core/Battleground: Moved DoAction hook to ZoneScript Port From (https://github.com/TrinityCore/TrinityCore/commit/22614d6bcc1a9c201d16779a93ee886facf6f7b4) --- Source/Game/BattleGrounds/BattleGround.cs | 3 --- Source/Game/Maps/ZoneScript.cs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/Game/BattleGrounds/BattleGround.cs b/Source/Game/BattleGrounds/BattleGround.cs index 87d0f95d9..947a873b5 100644 --- a/Source/Game/BattleGrounds/BattleGround.cs +++ b/Source/Game/BattleGrounds/BattleGround.cs @@ -1895,9 +1895,6 @@ namespace Game.BattleGrounds public override void ProcessEvent(WorldObject obj, uint eventId, WorldObject invoker = null) { } - // this function can be used by spell to interact with the BG map - public virtual void DoAction(uint action, ulong arg) { } - public virtual void HandlePlayerResurrect(Player player) { } public virtual WorldSafeLocsEntry GetExploitTeleportLocation(Team team) { return null; } diff --git a/Source/Game/Maps/ZoneScript.cs b/Source/Game/Maps/ZoneScript.cs index 699834d4f..75a84d7a8 100644 --- a/Source/Game/Maps/ZoneScript.cs +++ b/Source/Game/Maps/ZoneScript.cs @@ -43,7 +43,7 @@ namespace Game.Maps public virtual void SetData(uint dataId, uint value) { } public virtual void ProcessEvent(WorldObject obj, uint eventId, WorldObject invoker) { } - + public virtual void DoAction(uint actionId, WorldObject source = null, WorldObject target = null) { } public virtual void OnFlagStateChange(GameObject flagInBase, FlagState oldValue, FlagState newValue, Player player) { } public virtual bool CanCaptureFlag(AreaTrigger areaTrigger, Player player) { return false; }