mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-25 22:17:45 +00:00
Code Activity

Gm teri will now tele to the main aetheryte if there is one in the zone

Browse source
This commit is contained in:
Biscuit Boy 2018-09-21 02:02:51 +10:00
parent 06abc5f33d
commit d8c71d69ca
1 changed files with 36 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
View file

@ -7,6 +7,7 @@
#include <Network/PacketContainer.h> #include <Network/PacketContainer.h>
#include <Network/CommonActorControl.h> #include <Network/CommonActorControl.h>
#include <Network/PacketDef/Zone/ClientZoneDef.h> #include <Network/PacketDef/Zone/ClientZoneDef.h>
#include <Exd/ExdDataGenerated.h>
#include <unordered_map> #include <unordered_map>
@ -455,10 +456,42 @@ void Core::Network::GameConnection::gm1Handler( const Packets::FFXIVARR_PACKET_R
break; break;
} }
targetPlayer->setPos( targetPlayer->getPos() ); bool doTeleport = false;
targetPlayer->performZoning( param1, targetPlayer->getPos(), 0 ); uint16_t teleport;
auto pExdData = g_fw.get< Data::ExdDataGenerated >();
auto idList = pExdData->getAetheryteIdList();
for( auto i : idList )
{
auto data = pExdData->get< Core::Data::Aetheryte >( i );
if( !data ) {
continue;
}
if( data->territory == param1 ) {
if( data->isAetheryte ) {
{
doTeleport = true;
teleport = i;
break;
}
}
}
}
if( doTeleport )
{
player.teleport( teleport );
}
else
{
targetPlayer->setPos( targetPlayer->getPos() );
targetPlayer->performZoning( param1, targetPlayer->getPos(), 0 );
}
player.sendNotice( targetPlayer->getName() + " was warped to zone " + player.sendNotice( targetPlayer->getName() + " was warped to zone " +
std::to_string( param1 ) + " (" + pZone->getName() + ")" ); std::to_string( param1 ) + " (" + pZone->getName() + ")" );
} }
break; break;
} }