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

GM Call is now closer to retail behavior

Browse source
This commit is contained in:
JeidoUran 2019-01-05 18:50:27 +01:00
parent d41ac16eda
commit 39da2d2bc9
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -148,6 +148,7 @@ void Sapphire::Network::GameConnection::gm1Handler( FrameworkPtr pFw,
targetPlayer->despawn( actor->getAsPlayer() ); targetPlayer->despawn( actor->getAsPlayer() );
targetPlayer->spawn( actor->getAsPlayer() ); targetPlayer->spawn( actor->getAsPlayer() );
} }
}
break; break;
} }
case GmCommand::Tribe: case GmCommand::Tribe:
@ -640,9 +641,16 @@ void Sapphire::Network::GameConnection::gm2Handler( FrameworkPtr pFw,
player.sendUrgent( "You are unable to call a player while bound to a battle instance." ); player.sendUrgent( "You are unable to call a player while bound to a battle instance." );
return; return;
} }
targetPlayer->prepareZoning( player.getZoneId(), true, 1, 0 );
targetPlayer->setInstance( player.getCurrentZone() ); if( targetPlayer->getCurrentInstance() )
{
targetPlayer->exitInstance();
}
if ( targetPlayer->getZoneId() != player.getZoneId() )
{
targetPlayer->setZone( player.getZoneId() );
}
targetPlayer->sendToInRangeSet( makeActorControl143( player.getId(), ZoneIn, 0, 0, 0, 0 ) );
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() );
break; break;