From 5d198c77430c9ce24e78091f9637c6af3180829c Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 16 Mar 2018 20:33:28 +1100 Subject: [PATCH] fix zone crash when using a normal zones instance id vs zone id --- .../sapphire_zone/Network/Handlers/GMCommandHandlers.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp index 336608bf..f1470ff9 100644 --- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp @@ -418,7 +418,9 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac // if the zone is an instanceContent instance, make sure the player is actually bound to it auto pInstance = instance->getAsInstanceContent(); - if( !pInstance->isPlayerBound( player.getId() ) ) + + // pInstance will be nullptr if you're accessing a normal zone via its allocated instance id rather than its zoneid + if( pInstance && !pInstance->isPlayerBound( player.getId() ) ) { player.sendUrgent( "Not able to join instance: " + std::to_string( param1 ) ); player.sendUrgent( "Player not bound! ( run !instance bind first ) " + std::to_string( param1 ) );