diff --git a/src/world/Actor/EventObject.cpp b/src/world/Actor/EventObject.cpp index bdd36be9..fe8fd951 100644 --- a/src/world/Actor/EventObject.cpp +++ b/src/world/Actor/EventObject.cpp @@ -86,8 +86,6 @@ uint8_t Sapphire::Entity::EventObject::getState() const void Sapphire::Entity::EventObject::setState( uint8_t state ) { m_state = state; - - sendToInRangeSet( makeActorControl( getId(), DirectorEObjMod, state ) ); } void Sapphire::Entity::EventObject::setAnimationFlag( uint32_t flag, uint32_t animationFlag ) @@ -144,6 +142,7 @@ void Sapphire::Entity::EventObject::spawn( Sapphire::Entity::PlayerPtr pTarget ) eobjStatePacket->data().EntityId = getId(); eobjStatePacket->data().Dir = Util::floatToUInt16Rot( getRot() ); eobjStatePacket->data().OwnerId = getOwnerId(); + eobjStatePacket->data().PermissionInvisibility = getPermissionInvisibility(); eobjStatePacket->data().Args = 0xE0; eobjStatePacket->data().Args2 = 0; // initial animation state eobjStatePacket->data().Args3 = getHousingLink(); @@ -178,6 +177,8 @@ uint8_t Sapphire::Entity::EventObject::getPermissionInvisibility() const void Sapphire::Entity::EventObject::setPermissionInvisibility( uint8_t permissionInvisibility ) { m_permissionInvisibility = permissionInvisibility; + + sendToInRangeSet( makeActorControl( getId(), DirectorEObjMod, permissionInvisibility ) ); } uint32_t Sapphire::Entity::EventObject::getOwnerId() const diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp index fb4682c6..61613421 100644 --- a/src/world/Manager/DebugCommandMgr.cpp +++ b/src/world/Manager/DebugCommandMgr.cpp @@ -993,7 +993,7 @@ void DebugCommandMgr::instance( char* data, Entity::Player& player, std::shared_ if( !obj ) return; - obj->setState( state ); + obj->setPermissionInvisibility( state ); } else if( subCommand == "objflag" ) { diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp index ff33ddcb..064f6915 100644 --- a/src/world/Territory/InstanceContent.cpp +++ b/src/world/Territory/InstanceContent.cpp @@ -154,7 +154,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount ) sendDutyCommence(); if( m_pEntranceEObj ) - m_pEntranceEObj->setState( 1 ); + m_pEntranceEObj->setPermissionInvisibility( 1 ); m_state = DutyInProgress; break; }