From aba22a319b56d88a2bd734592d8ffe3dec71e415 Mon Sep 17 00:00:00 2001
From: amibu <fakecake@icloud.com>
Date: Tue, 5 Sep 2017 21:30:50 +0200
Subject: [PATCH] Added getters for effects

---
 src/servers/Server_Zone/Actor/Actor.cpp                      | 5 +++++
 src/servers/Server_Zone/Actor/Actor.h                        | 2 ++
 .../Server_Zone/StatusEffect/StatusEffectContainer.cpp       | 5 +++++
 src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h | 3 ++-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/servers/Server_Zone/Actor/Actor.cpp b/src/servers/Server_Zone/Actor/Actor.cpp
index 6a3d45e3..c4bea0bb 100644
--- a/src/servers/Server_Zone/Actor/Actor.cpp
+++ b/src/servers/Server_Zone/Actor/Actor.cpp
@@ -645,3 +645,8 @@ void Core::Entity::Actor::addStatusEffectByIdIfNotExist( int32_t id, int32_t dur
    }
 }
 
+Core::StatusEffect::StatusEffectContainerPtr Core::Entity::Actor::getStatusEffectContainer() const
+{
+   return m_pStatusEffectContainer;
+}
+
diff --git a/src/servers/Server_Zone/Actor/Actor.h b/src/servers/Server_Zone/Actor/Actor.h
index 49ec397c..824ace8e 100644
--- a/src/servers/Server_Zone/Actor/Actor.h
+++ b/src/servers/Server_Zone/Actor/Actor.h
@@ -298,6 +298,8 @@ public:
    // add a status effect by id if it doesn't exist
    void addStatusEffectByIdIfNotExist( int32_t id, int32_t duration, uint16_t param = 0 );
 
+   StatusEffect::StatusEffectContainerPtr getStatusEffectContainer() const;
+
    // TODO: Why did i even declare them publicly here?!
    std::set< ActorPtr >            m_inRangeActors;
    std::set< PlayerPtr >           m_inRangePlayers;
diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
index 3feea268..92252677 100644
--- a/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
+++ b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp
@@ -40,6 +40,11 @@ void Core::StatusEffect::StatusEffectContainer::freeSlot( uint8_t slotId )
    m_freeEffectSlotQueue.push( slotId );
 }
 
+std::map< uint8_t, Core::StatusEffect::StatusEffectPtr > Core::StatusEffect::StatusEffectContainer::getEffectMap() const
+{
+   return m_effectMap;
+}
+
 
 Core::StatusEffect::StatusEffectContainer::~StatusEffectContainer()
 {
diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h
index 6d479090..84a6826f 100644
--- a/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h
+++ b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.h
@@ -28,6 +28,8 @@ public:
    int8_t getFreeSlot();
    void freeSlot( uint8_t slotId );
 
+   std::map< uint8_t, Core::StatusEffect::StatusEffectPtr > getEffectMap() const;
+
    void sendUpdate();
 
 
@@ -37,7 +39,6 @@ private:
    Entity::ActorPtr m_pOwner;
    std::queue< uint8_t > m_freeEffectSlotQueue;
 
-   std::vector< StatusEffectPtr > m_effectList;
    std::vector< std::pair< uint8_t, uint32_t> > m_tickEffectList;
    std::map< uint8_t, StatusEffectPtr > m_effectMap;
 };