Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/ZoneScript: Add "invoker" param to ProcessEvent

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/15b91836351a61f471865a751d4ff9ab0b5775a0)
This commit is contained in:
hondacrx
2022-01-09 14:12:34 -05:00
parent 64de342e49
commit 860bf84280
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/BattleFields/Zones/WinterGrasp.cs
+1 -1
View File
@@ -870,7 +870,7 @@ namespace Game.BattleFields
} }
} }
public override void ProcessEvent(WorldObject obj, uint eventId) public override void ProcessEvent(WorldObject obj, uint eventId, WorldObject invoker)
{ {
if (!obj || !IsWarTime()) if (!obj || !IsWarTime())
return; return;
Source/Game/Entities/GameObject/GameObject.cs
+1 -1
View File
@@ -2201,7 +2201,7 @@ namespace Game.Entities
GetAI().EventInform(eventId); GetAI().EventInform(eventId);
if (m_zoneScript != null) if (m_zoneScript != null)
m_zoneScript.ProcessEvent(this, eventId); m_zoneScript.ProcessEvent(this, eventId, invoker);
BattlegroundMap bgMap = GetMap().ToBattlegroundMap(); BattlegroundMap bgMap = GetMap().ToBattlegroundMap();
if (bgMap) if (bgMap)
Source/Game/Maps/ZoneScript.cs
+1 -1
View File
@@ -44,7 +44,7 @@ namespace Game.Maps
public virtual uint GetData(uint dataId) { return 0; } public virtual uint GetData(uint dataId) { return 0; }
public virtual void SetData(uint dataId, uint value) { } public virtual void SetData(uint dataId, uint value) { }
public virtual void ProcessEvent(WorldObject obj, uint eventId) { } public virtual void ProcessEvent(WorldObject obj, uint eventId, WorldObject invoker) { }
protected EventMap _events = new(); protected EventMap _events = new();
} }
Source/Game/Spells/SpellEffects.cs
+2 -2
View File
@@ -720,9 +720,9 @@ namespace Game.Spells
ZoneScript zoneScript = m_caster.GetZoneScript(); ZoneScript zoneScript = m_caster.GetZoneScript();
InstanceScript instanceScript = m_caster.GetInstanceScript(); InstanceScript instanceScript = m_caster.GetInstanceScript();
if (zoneScript != null) if (zoneScript != null)
zoneScript.ProcessEvent(target, (uint)effectInfo.MiscValue); zoneScript.ProcessEvent(target, (uint)effectInfo.MiscValue, m_caster);
else if (instanceScript != null) // needed in case Player is the caster else if (instanceScript != null) // needed in case Player is the caster
instanceScript.ProcessEvent(target, (uint)effectInfo.MiscValue); instanceScript.ProcessEvent(target, (uint)effectInfo.MiscValue, m_caster);
m_caster.GetMap().ScriptsStart(ScriptsType.Event, (uint)effectInfo.MiscValue, m_caster, target); m_caster.GetMap().ScriptsStart(ScriptsType.Event, (uint)effectInfo.MiscValue, m_caster, target);
} }