[Callbacks] check combat state of player instead of target

Author: gastank

engine/action/action_callback.cpp

@@ -74,10 +74,10 @@ action_callback_t::action_callback_t( player_t* l )
     l->callbacks.all_callbacks.push_back( this );
 }
 
-void action_callback_t::trigger( const std::vector<action_callback_t*>& v, const proc_data_t& data, player_t* target,
-                                 action_state_t* state, proc_trigger_type_e type )
+void action_callback_t::trigger( const std::vector<action_callback_t*>& v, const proc_data_t& data, player_t* player,
+                                 player_t* target, action_state_t* state, proc_trigger_type_e type )
 {
-  if ( !target->in_combat )
+  if ( !player->in_combat )
     return;
 
   for ( auto cb : v )

engine/action/action_callback.hpp

@@ -63,8 +63,8 @@ struct action_callback_t : private noncopyable
   virtual void activate() { active = true; }
   virtual void deactivate() { active = false; }
 
-  static void trigger( const std::vector<action_callback_t*>& v, const proc_data_t& data, player_t* target,
-                       action_state_t* state, proc_trigger_type_e type );
+  static void trigger( const std::vector<action_callback_t*>& v, const proc_data_t& data, player_t* player,
+                       player_t* target, action_state_t* state, proc_trigger_type_e type );
 
   static void reset( const std::vector<action_callback_t*>& v );
 };

engine/player/pet.cpp

@@ -368,7 +368,7 @@ void pet_t::trigger_callbacks( proc_types pt, proc_types2 pt2, action_t* action,
   // currently only works for pets and guardians.
   if ( type == PLAYER_GUARDIAN || type == PLAYER_PET )
   {
-    action_callback_t::trigger( owner->callbacks.pet_procs[ pt ][ pt2 ], action->proc_data, state->target, state,
+    action_callback_t::trigger( owner->callbacks.pet_procs[ pt ][ pt2 ], action->proc_data, this, state->target, state,
                                 pt_type );
   }
 }

engine/player/player.cpp

@@ -8857,20 +8857,20 @@ void player_t::trigger_callbacks( proc_types pt, proc_types2 pt2, action_t* acti
                                   proc_trigger_type_e pt_type )
 {
   assert( action && state && state->target );
-  action_callback_t::trigger( callbacks.procs[ pt ][ pt2 ], action->proc_data, state->target, state, pt_type );
+  action_callback_t::trigger( callbacks.procs[ pt ][ pt2 ], action->proc_data, this, state->target, state, pt_type );
 }
 
 void player_t::trigger_callbacks( proc_types pt, proc_types2 pt2, buff_t* buff, proc_trigger_type_e pt_type )
 {
   assert( buff && buff->player );
-  action_callback_t::trigger( callbacks.procs[ pt ][ pt2 ], buff->proc_data, buff->player, nullptr, pt_type );
+  action_callback_t::trigger( callbacks.procs[ pt ][ pt2 ], buff->proc_data, this, buff->player, nullptr, pt_type );
 }
 
 void player_t::trigger_callbacks( proc_types pt, proc_types2 pt2, const proc_data_t& data, player_t* t,
                                   proc_trigger_type_e pt_type )
 {
   assert( t );
-  action_callback_t::trigger( callbacks.procs[ pt ][ pt2 ], data, t, nullptr, pt_type );
+  action_callback_t::trigger( callbacks.procs[ pt ][ pt2 ], data, this, t, nullptr, pt_type );
 }
 
 void player_t::trigger_aura_applied_callbacks( const proc_data_t& data, player_t* t )