From 8f2f82742726e372e9a495bd8ca689152841e88d Mon Sep 17 00:00:00 2001 From: Biscuit Boy Date: Sat, 20 Jan 2018 01:56:00 +1100 Subject: [PATCH 1/2] Fixed GM Call GM Call was placed in GM1 instead of GM2 for some reason /shrug --- .../Network/Handlers/GMCommandHandlers.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp index 736a1fd8..68e24f2f 100644 --- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp @@ -187,16 +187,6 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac targetPlayer->getName() + " set in range." ); break; } - case GmCommand::Call: - { - if ( targetPlayer->getZoneId() != player.getZoneId() ) - targetPlayer->setZone( player.getZoneId() ); - - targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, - player.getRotation() ); - player.sendNotice( "Calling " + targetPlayer->getName() ); - break; - } case GmCommand::Inspect: { player.sendNotice( "Name: " + targetPlayer->getName() + @@ -506,6 +496,16 @@ void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPac player.sendNotice( "Jumping to " + targetPlayer->getName() ); break; } + case GmCommand::Call: + { + if ( targetPlayer->getZoneId() != player.getZoneId() ) + targetPlayer->setZone( player.getZoneId() ); + + targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, + player.getRotation() ); + player.sendNotice( "Calling " + targetPlayer->getName() ); + break; + } default: player.sendUrgent( "GM2 Command not implemented: " + std::to_string( commandId ) ); break; From f80a2fd0a5d5d3f9dbe6bfe5db4298d69a062526 Mon Sep 17 00:00:00 2001 From: Biscuit Boy Date: Sat, 20 Jan 2018 02:04:38 +1100 Subject: [PATCH 2/2] Added GM1 Back since its needed --- .../Network/Handlers/GMCommandHandlers.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp index 68e24f2f..15dc09fc 100644 --- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp @@ -187,6 +187,16 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac targetPlayer->getName() + " set in range." ); break; } + case GmCommand::Call: + { + if ( targetPlayer->getZoneId() != player.getZoneId() ) + targetPlayer->setZone( player.getZoneId() ); + + targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, + player.getRotation() ); + player.sendNotice( "Calling " + targetPlayer->getName() ); + break; + } case GmCommand::Inspect: { player.sendNotice( "Name: " + targetPlayer->getName() +