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

fixed inter-instance gm calling, fixes #341

Browse source 
as a note, calling someone into an instance has been disabled
This commit is contained in:
NotAdam 2018-07-10 20:22:46 +10:00
parent 4979c8780d
commit 66fd8ba7fe
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:
{
if( targetPlayer->getZoneId() != player.getZoneId() )
targetPlayer->setZone( player.getZoneId() );
// We shouldn't be able to call a player into an instance, only call them out of one
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() );
player.sendNotice( "Calling " + targetPlayer->getName() );