From 65bdba4dfe7c1de2ff2ff7d849a9b62a3d92bf01 Mon Sep 17 00:00:00 2001
From: mordred <you@example.com>
Date: Thu, 14 Mar 2019 14:08:21 +0100
Subject: [PATCH] Refactor -> removal of unnessecary player pointer in
 eventhandler

---
 src/world/Actor/BNpc.h           | 2 +-
 src/world/Actor/PlayerEvent.cpp  | 2 +-
 src/world/Event/EventHandler.cpp | 5 ++---
 src/world/Event/EventHandler.h   | 6 +-----
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/world/Actor/BNpc.h b/src/world/Actor/BNpc.h
index facf2916..490e2b22 100644
--- a/src/world/Actor/BNpc.h
+++ b/src/world/Actor/BNpc.h
@@ -13,7 +13,7 @@
 namespace Sapphire::Entity
 {
 
-  using HateListEntry = struct
+  struct HateListEntry
   {
     uint32_t m_hateAmount;
     CharaPtr m_pChara;
diff --git a/src/world/Actor/PlayerEvent.cpp b/src/world/Actor/PlayerEvent.cpp
index 281ea092..f264d180 100644
--- a/src/world/Actor/PlayerEvent.cpp
+++ b/src/world/Actor/PlayerEvent.cpp
@@ -90,7 +90,7 @@ void Sapphire::Entity::Player::eventStart( uint64_t actorId, uint32_t eventId,
                                            uint32_t eventParam2, Event::EventHandler::EventFinishCallback callback )
 {
 
-  auto newEvent = Event::make_EventHandler( this, actorId, eventId, eventType, eventParam2 );
+  auto newEvent = Event::make_EventHandler( actorId, eventId, eventType, eventParam2 );
 
   newEvent->setEventFinishCallback( callback );
 
diff --git a/src/world/Event/EventHandler.cpp b/src/world/Event/EventHandler.cpp
index c9b40c72..81c66836 100644
--- a/src/world/Event/EventHandler.cpp
+++ b/src/world/Event/EventHandler.cpp
@@ -1,8 +1,7 @@
 #include "EventHandler.h"
 
-Sapphire::Event::EventHandler::EventHandler( Entity::Player* pOwner, uint64_t actorId, uint32_t eventId,
-                                         EventType eventType, uint32_t eventParam ) :
-  m_pOwner( pOwner ),
+Sapphire::Event::EventHandler::EventHandler( uint64_t actorId, uint32_t eventId,
+                                             EventType eventType, uint32_t eventParam ) :
   m_actorId( actorId ),
   m_eventId( eventId ),
   m_eventType( eventType ),
diff --git a/src/world/Event/EventHandler.h b/src/world/Event/EventHandler.h
index 4ace5d59..96c50924 100644
--- a/src/world/Event/EventHandler.h
+++ b/src/world/Event/EventHandler.h
@@ -79,8 +79,7 @@ namespace Sapphire::Event
     using SceneChainCallback = std::function< void( Entity::Player& ) >;
     using EventFinishCallback = std::function< void( Entity::Player&, uint64_t ) >;
 
-    EventHandler( Entity::Player* pOwner, uint64_t actorId, uint32_t eventId, EventType eventType,
-                  uint32_t eventParam );
+    EventHandler( uint64_t actorId, uint32_t eventId, EventType eventType, uint32_t eventParam );
 
     ~EventHandler()
     {
@@ -118,10 +117,7 @@ namespace Sapphire::Event
 
     void removeNestedEvent();
 
-
   protected:
-    Entity::Player* m_pOwner;
-
     uint64_t m_actorId;
     uint32_t m_eventId;
     uint16_t m_entryId;