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

fix build

Browse source
This commit is contained in:
goaaats 2017-12-19 16:29:22 +01:00
parent 84c9b3b39c
commit 055a665516
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
View file

@ -126,12 +126,12 @@ void Core::DebugCommandHandler::scriptReload( char * data, Entity::Player& playe
void Core::DebugCommandHandler::help( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command ) void Core::DebugCommandHandler::help( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
{ {
pPlayer->sendDebug( "Registered debug commands:" ); player.sendDebug( "Registered debug commands:" );
for( auto cmd : m_commandMap ) for( auto cmd : m_commandMap )
{ {
if( pPlayer->getGmRank() >= cmd.second->m_gmLevel ) if( player.getGmRank() >= cmd.second->m_gmLevel )
{ {
pPlayer->sendDebug( " - " + cmd.first + " - " + cmd.second->getHelpText() ); player.sendDebug( " - " + cmd.first + " - " + cmd.second->getHelpText() );
} }
} }
@ -403,11 +403,11 @@ void Core::DebugCommandHandler::add( char * data, Entity::Player& player, boost:
int32_t id; int32_t id;
sscanf( params.c_str(), "%d", &id ); sscanf( params.c_str(), "%d", &id );
pPlayer->learnAction( id ); player.learnAction( id );
} }
else if( subCommand == "enablecompanion" ) else if( subCommand == "enablecompanion" )
{ {
pPlayer->learnAction( 17 ); player.learnAction( 17 );
} }
else else
{ {
@ -531,5 +531,5 @@ void Core::DebugCommandHandler::serverInfo( char * data, Entity::Player& player,
void Core::DebugCommandHandler::unlockCharacter( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command ) void Core::DebugCommandHandler::unlockCharacter( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
{ {
pPlayer->unlock(); player.unlock();
} }

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

@ -190,8 +190,8 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
} }
case GmCommand::Call: case GmCommand::Call:
{ {
if( targetPlayer->getZoneId() != pPlayer->getZoneId() ) if( targetPlayer->getZoneId() != player.getZoneId() )
targetPlayer->setZone( pPlayer->getZoneId() ); targetPlayer->setZone( player.getZoneId() );
targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z,
player.getRotation() ); player.getRotation() );
@ -307,13 +307,13 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
for( uint8_t i = 0; i < 255; i++ ) for( uint8_t i = 0; i < 255; i++ )
targetActor->getAsPlayer()->learnMount( i ); targetActor->getAsPlayer()->learnMount( i );
pPlayer->sendNotice( "All mounts for " + targetPlayer->getName() + player.sendNotice( "All mounts for " + targetPlayer->getName() +
" were turned on." ); " were turned on." );
} }
else else
{ {
targetActor->getAsPlayer()->learnMount( param1 ); targetActor->getAsPlayer()->learnMount( param1 );
pPlayer->sendNotice( "Mount " + std::to_string( param1 ) + " for " + targetPlayer->getName() + player.sendNotice( "Mount " + std::to_string( param1 ) + " for " + targetPlayer->getName() +
" was turned on." ); " was turned on." );
} }
@ -433,7 +433,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
targetPlayer->setPosition( targetPlayer->getPos() ); targetPlayer->setPosition( targetPlayer->getPos() );
targetPlayer->performZoning( param1, targetPlayer->getPos(), 0 ); targetPlayer->performZoning( param1, targetPlayer->getPos(), 0 );
pPlayer->sendNotice( targetPlayer->getName() + " was warped to zone " + std::to_string( param1 ) + " (" + zoneInfo->getName() + ")" ); player.sendNotice( targetPlayer->getName() + " was warped to zone " + std::to_string( param1 ) + " (" + zoneInfo->getName() + ")" );
} }
break; break;
} }