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

Merge pull request #344 from NotAdam/develop

Browse source 
fixed inter-instance gm calling
This commit is contained in:
Mordred 2018-07-10 12:26:05 +02:00 • committed by GitHub
commit ae38f300e0
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -551,8 +551,14 @@ void Core::Network::GameConnection::gm2Handler( const Packets::FFXIVARR_PACKET_R
} }
case GmCommand::Call: case GmCommand::Call:
{ {
if( targetPlayer->getZoneId() != player.getZoneId() ) // We shouldn't be able to call a player into an instance, only call them out of one
targetPlayer->setZone( player.getZoneId() ); if( player.getCurrentInstance() )
{
player.sendUrgent( "You are unable to call a player while bound to a battle instance." );
return;
}
targetPlayer->setInstance( player.getCurrentZone() );
targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, player.getRot() ); targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, player.getRot() );
player.sendNotice( "Calling " + targetPlayer->getName() ); player.sendNotice( "Calling " + targetPlayer->getName() );