From 5412677e9d233bd618004fbcbce7d78b2537b13c Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Tue, 19 Mar 2019 00:01:34 +1100
Subject: [PATCH] pass actionid through to onEObjHit script callback

---
 src/world/Action/Action.cpp          | 2 +-
 src/world/Script/NativeScriptApi.cpp | 2 +-
 src/world/Script/NativeScriptApi.h   | 2 +-
 src/world/Script/ScriptMgr.cpp       | 4 ++--
 src/world/Script/ScriptMgr.h         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 8d318064..b4a08918 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -285,7 +285,7 @@ void Sapphire::Action::Action::execute()
   }
   else if( auto player = m_pSource->getAsPlayer() )
   {
-    pScriptMgr->onEObjHit( *player, m_targetId );
+    pScriptMgr->onEObjHit( *player, m_targetId, getId() );
     return;
   }
 }
diff --git a/src/world/Script/NativeScriptApi.cpp b/src/world/Script/NativeScriptApi.cpp
index 193342db..4b45a333 100644
--- a/src/world/Script/NativeScriptApi.cpp
+++ b/src/world/Script/NativeScriptApi.cpp
@@ -141,7 +141,7 @@ namespace Sapphire::ScriptAPI
   {
   }
 
-  void EventScript::onEObjHit( Sapphire::Entity::Player& player, uint64_t actorId )
+  void EventScript::onEObjHit( Sapphire::Entity::Player& player, uint64_t actorId, uint32_t actionId )
   {
   }
 
diff --git a/src/world/Script/NativeScriptApi.h b/src/world/Script/NativeScriptApi.h
index 1bd1ce7c..9b2fdb6f 100644
--- a/src/world/Script/NativeScriptApi.h
+++ b/src/world/Script/NativeScriptApi.h
@@ -181,7 +181,7 @@ namespace Sapphire::ScriptAPI
     virtual void onEventHandlerTradeReturn( Sapphire::Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param,
                                             uint32_t catalogId );
 
-    virtual void onEObjHit( Sapphire::Entity::Player& player, uint64_t actorId );
+    virtual void onEObjHit( Sapphire::Entity::Player& player, uint64_t actorId, uint32_t actionId );
   };
 
   /*!
diff --git a/src/world/Script/ScriptMgr.cpp b/src/world/Script/ScriptMgr.cpp
index f6d3350e..e1512e01 100644
--- a/src/world/Script/ScriptMgr.cpp
+++ b/src/world/Script/ScriptMgr.cpp
@@ -300,7 +300,7 @@ bool Sapphire::Scripting::ScriptMgr::onBNpcKill( Entity::Player& player, uint16_
   return true;
 }
 
-bool Sapphire::Scripting::ScriptMgr::onEObjHit( Sapphire::Entity::Player& player, uint64_t actorId )
+bool Sapphire::Scripting::ScriptMgr::onEObjHit( Sapphire::Entity::Player& player, uint64_t actorId, uint32_t actionId )
 {
   auto pEventMgr = framework()->get< World::Manager::EventMgr >();
   bool didCallScript = false;
@@ -321,7 +321,7 @@ bool Sapphire::Scripting::ScriptMgr::onEObjHit( Sapphire::Entity::Player& player
 
       player.sendDebug( "Calling: {0}.onEObjHit actorId#{1}", objName, actorId );
 
-      script->onEObjHit( player, actorId );
+      script->onEObjHit( player, actorId, actionId );
     }
   }
 
diff --git a/src/world/Script/ScriptMgr.h b/src/world/Script/ScriptMgr.h
index 5085f680..10d676a6 100644
--- a/src/world/Script/ScriptMgr.h
+++ b/src/world/Script/ScriptMgr.h
@@ -70,7 +70,7 @@ namespace Sapphire::Scripting
 
     bool onBNpcKill( Entity::Player& player, uint16_t nameId );
 
-    bool onEObjHit( Entity::Player& player, uint64_t actorId );
+    bool onEObjHit( Entity::Player& player, uint64_t actorId, uint32_t actionId );
 
     bool onStart( Action::Action& action );