diff --git a/src/world/Encounter/InstanceContent/IfritNormal.h b/src/world/Encounter/InstanceContent/IfritNormal.h index 9db4adfd..8b2760be 100644 --- a/src/world/Encounter/InstanceContent/IfritNormal.h +++ b/src/world/Encounter/InstanceContent/IfritNormal.h @@ -18,7 +18,7 @@ namespace Sapphire void init() override { - Logger::info( "ifrit FAN CLUB GEOcities EUNUCH ONLY" ); + Logger::info( "stage 2 init" ); } void update( uint64_t deltaTime ) override @@ -55,7 +55,7 @@ namespace Sapphire void init() override { - Logger::info( "ifrit FAN CLUB GEOcities EUNUCH ONLY" ); + Logger::info( "stage 1 init" ); } void update( uint64_t deltaTime ) override @@ -76,7 +76,7 @@ namespace Sapphire m_pEncounter->addState( ifritTwoState ); } - if( timeElapsedMs > 10000 ) + if( timeElapsedMs > 12000 ) { pIfrit->hateListGetHighest()->die(); } diff --git a/src/world/Network/PacketWrappers/MoveActorPacket.h b/src/world/Network/PacketWrappers/MoveActorPacket.h index d11f8e9e..fd65249d 100644 --- a/src/world/Network/PacketWrappers/MoveActorPacket.h +++ b/src/world/Network/PacketWrappers/MoveActorPacket.h @@ -10,8 +10,7 @@ namespace Sapphire::Network::Packets::WorldPackets::Server { /** - * @brief The Client UI Initialization packet. This must be sent to the client - * once upon connection to configure the UI. + * @brief The MoveActor packet for updating an actor's position. */ class MoveActorPacket : public ZoneChannelPacket< FFXIVIpcActorMove > { diff --git a/src/world/Territory/InstanceContent.cpp b/src/world/Territory/InstanceContent.cpp index ae5f4097..fee9886a 100644 --- a/src/world/Territory/InstanceContent.cpp +++ b/src/world/Territory/InstanceContent.cpp @@ -177,7 +177,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount ) // todo: revive players if trial/enclosed raid arena, add reset timer if( m_instanceResetTime == 0 ) { - //sendDutyReset(); + sendDutyReset(); m_instanceResetTime = tickCount + 3000; return; @@ -187,7 +187,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount ) if( m_instanceResetFinishTime == 0 ) { - m_instanceResetFinishTime = tickCount + 3000; + m_instanceResetFinishTime = tickCount + 5000; m_pEncounter->reset(); auto& server = Common::Service< World::WorldServer >::ref(); @@ -202,6 +202,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount ) movePlayerToEntrance( *pPlayer ); auto zoneInPacket = makeActorControlSelf( pPlayer->getId(), Appear, 0x3, 0, 0, 0 ); auto setStatusPacket = makeActorControl( pPlayer->getId(), SetStatus, static_cast< uint8_t >( Common::ActorStatus::Idle ) ); + server.queueForPlayer( pPlayer->getCharacterId(), zoneInPacket ); server.queueForPlayers( pPlayer->getInRangePlayerIds( true ), setStatusPacket );