From 1378ff4a438dfa1ac91d2c90e9f6fa08455185d6 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 2 Dec 2021 23:02:52 +0100
Subject: [PATCH] Event cleanup from linkshell changes

---
 src/world/Manager/EventMgr.cpp               | 12 ++++++------
 src/world/Network/GameConnection.h           |  2 --
 src/world/Network/Handlers/EventHandlers.cpp | 14 --------------
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/world/Manager/EventMgr.cpp b/src/world/Manager/EventMgr.cpp
index 0fcf150f..34feaf07 100644
--- a/src/world/Manager/EventMgr.cpp
+++ b/src/world/Manager/EventMgr.cpp
@@ -548,17 +548,17 @@ void EventMgr::resumeScene( Entity::Player& player, uint32_t eventId, uint32_t s
   if( !pEvent )
     return;
 
-  auto linkshellEvent = makeZonePacket< FFXIVIpcResumeEventScene2 >( player.getId() );
-  linkshellEvent->data().handlerId = eventId;
-  linkshellEvent->data().sceneId = static_cast< uint8_t >( scene );
-  linkshellEvent->data().numOfArgs = values.size();
+  auto resumeEvent = makeZonePacket< FFXIVIpcResumeEventScene2 >( player.getId() );
+  resumeEvent->data().handlerId = eventId;
+  resumeEvent->data().sceneId = static_cast< uint8_t >( scene );
+  resumeEvent->data().numOfArgs = values.size();
   int i = 0;
   for( auto& val : values )
   {
-    linkshellEvent->data().args[ i++ ] = val;
+    resumeEvent->data().args[ i++ ] = val;
   }
   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 )
diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h
index 39d775ce..23fdbc49 100644
--- a/src/world/Network/GameConnection.h
+++ b/src/world/Network/GameConnection.h
@@ -158,8 +158,6 @@ namespace Sapphire::Network
 
     DECLARE_HANDLER( startUiEvent );
 
-    DECLARE_HANDLER( eventHandlerLinkshell );
-
     DECLARE_HANDLER( yieldEventString );
 
     DECLARE_HANDLER( logoutHandler );
diff --git a/src/world/Network/Handlers/EventHandlers.cpp b/src/world/Network/Handlers/EventHandlers.cpp
index 1a098956..4f28c159 100644
--- a/src/world/Network/Handlers/EventHandlers.cpp
+++ b/src/world/Network/Handlers/EventHandlers.cpp
@@ -287,20 +287,6 @@ void Sapphire::Network::GameConnection::returnEventScene255( const Packets::FFXI
   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 )
 {
   auto& server = Common::Service< World::WorldServer >::ref();