mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-02 08:57:44 +00:00
Code Activity

Event cleanup from linkshell changes

Browse source
This commit is contained in:
Mordred 2021-12-02 23:02:52 +01:00
parent e385522e52
commit 1378ff4a43
3 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/world/Manager/EventMgr.cpp
View file

@ -548,17 +548,17 @@ void EventMgr::resumeScene( Entity::Player& player, uint32_t eventId, uint32_t s
if( !pEvent ) if( !pEvent )
return; return;
auto linkshellEvent = makeZonePacket< FFXIVIpcResumeEventScene2 >( player.getId() ); auto resumeEvent = makeZonePacket< FFXIVIpcResumeEventScene2 >( player.getId() );
linkshellEvent->data().handlerId = eventId; resumeEvent->data().handlerId = eventId;
linkshellEvent->data().sceneId = static_cast< uint8_t >( scene ); resumeEvent->data().sceneId = static_cast< uint8_t >( scene );
linkshellEvent->data().numOfArgs = values.size(); resumeEvent->data().numOfArgs = values.size();
int i = 0; int i = 0;
for( auto& val : values ) for( auto& val : values )
{ {
linkshellEvent->data().args[ i++ ] = val; resumeEvent->data().args[ i++ ] = val;
} }
auto& server = Common::Service< World::WorldServer >::ref(); auto& server = Common::Service< World::WorldServer >::ref();
server.queueForPlayer( player.getCharacterId(), linkshellEvent ); server.queueForPlayer( player.getCharacterId(), resumeEvent );
} }
void EventMgr::playScene( Entity::Player& player, uint32_t eventId, uint32_t scene, uint32_t flags, Event::EventHandler::SceneReturnCallback eventCallback ) void EventMgr::playScene( Entity::Player& player, uint32_t eventId, uint32_t scene, uint32_t flags, Event::EventHandler::SceneReturnCallback eventCallback )

2
src/world/Network/GameConnection.h
View file

@ -158,8 +158,6 @@ namespace Sapphire::Network
DECLARE_HANDLER( startUiEvent ); DECLARE_HANDLER( startUiEvent );
DECLARE_HANDLER( eventHandlerLinkshell );
DECLARE_HANDLER( yieldEventString ); DECLARE_HANDLER( yieldEventString );
DECLARE_HANDLER( logoutHandler ); DECLARE_HANDLER( logoutHandler );

14
src/world/Network/Handlers/EventHandlers.cpp
View file

@ -287,20 +287,6 @@ void Sapphire::Network::GameConnection::returnEventScene255( const Packets::FFXI
eventMgr.handleReturnEventScene( player, data.handlerId, data.sceneId, data.errorCode, data.numOfResults, results ); eventMgr.handleReturnEventScene( player, data.handlerId, data.sceneId, data.errorCode, data.numOfResults, results );
} }
void Sapphire::Network::GameConnection::eventHandlerLinkshell( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player )
{
auto& server = Common::Service< World::WorldServer >::ref();
const auto packet = ZoneChannelPacket< FFXIVIpcYieldEventSceneString8 >( inPacket );
auto linkshellEvent = makeZonePacket< FFXIVIpcResumeEventScene2 >( player.getId() );
linkshellEvent->data().handlerId = packet.data().handlerId;
linkshellEvent->data().sceneId = static_cast< uint8_t >( packet.data().sceneId );
linkshellEvent->data().numOfArgs = 1;
linkshellEvent->data().args[ 0 ] = 0x15a;
server.queueForPlayer( player.getCharacterId(), linkshellEvent );
}
void Sapphire::Network::GameConnection::yieldEventString( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) void Sapphire::Network::GameConnection::yieldEventString( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player )
{ {
auto& server = Common::Service< World::WorldServer >::ref(); auto& server = Common::Service< World::WorldServer >::ref();