From 32e10ec6e83093b1322ef14e93c5ae2e667978cd Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Tue, 6 Mar 2018 18:00:57 +1100
Subject: [PATCH] make mordred happy

---
 src/servers/sapphire_zone/Zone/InstanceContent.cpp | 5 +++--
 src/servers/sapphire_zone/Zone/InstanceContent.h   | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index ed4e63c7..b56ff102 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -115,7 +115,7 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
 
          if( m_instanceCommenceTime == 0 )
          {
-            m_instanceCommenceTime = Util::getTimeMs() + INSTANCE_COMMENCE_DELAY;
+            m_instanceCommenceTime = Util::getTimeMs() + instanceStartDelay;
             return;
          }
          else if( Util::getTimeMs() < m_instanceCommenceTime )
@@ -129,7 +129,8 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
                                            getDirectorId(), 0x40000001, m_instanceContentInfo->timeLimitmin * 60u ) );
          }
 
-         m_pEntranceEObj->setState( 7 );
+         if( m_pEntranceEObj )
+            m_pEntranceEObj->setState( 7 );
          m_state = DutyInProgress;
          m_instanceExpireTime = Util::getTimeSeconds() + ( m_instanceContentInfo->timeLimitmin * 60u );
          break;
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index e58e4abd..0dad9d5c 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -22,9 +22,6 @@ public:
       DutyFinished
    };
 
-   /*! number of milliseconds after all players are ready for the instance to commence (spawn circle removed) */
-   const uint32_t INSTANCE_COMMENCE_DELAY = 1250;
-
    InstanceContent( boost::shared_ptr< Core::Data::InstanceContent > pInstanceContent,
                     uint32_t guId,
                     const std::string& internalName,
@@ -55,6 +52,8 @@ public:
 
    Entity::EventObjectPtr getEObjByName( const std::string& name );
 
+   /*! number of milliseconds after all players are ready for the instance to commence (spawn circle removed) */
+   const uint32_t instanceStartDelay = 1250;
 private:
    Event::DirectorPtr m_pDirector;
    boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentInfo;