From bea3cae2164cb2d78e80862a6bf5282b01cd6e45 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 10 Feb 2018 22:35:02 +1100 Subject: [PATCH] huhuhu --- .../DebugCommand/DebugCommandHandler.cpp | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp index 1f3cd889..f7ec1bef 100644 --- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp +++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp @@ -770,17 +770,14 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo } else if( subCommand == "objupdate" ) { - uint32_t instanceId; uint32_t objId; - sscanf( params.c_str(), "%d %d", &instanceId, &objId ); + sscanf( params.c_str(), "%d", &objId ); - auto pInstance = g_territoryMgr.getInstanceZonePtr( instanceId ); - if( !pInstance ) + auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() ); + if( !instance ) return; - auto instance = boost::dynamic_pointer_cast< InstanceContent >( pInstance ); - auto obj = instance->getInstanceObject( objId ); if( !obj ) return; @@ -789,18 +786,15 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo } else if( subCommand == "objstate" ) { - uint32_t instanceId; uint32_t objId; - uint32_t state; + uint8_t state; - sscanf( params.c_str(), "%d %d %d", &instanceId, &objId, &state ); + sscanf( params.c_str(), "%d %hhu", &objId, &state ); - auto pInstance = g_territoryMgr.getInstanceZonePtr( instanceId ); - if( !pInstance ) + auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() ); + if( !instance ) return; - auto instance = boost::dynamic_pointer_cast< InstanceContent >( pInstance ); - auto obj = instance->getInstanceObject( objId ); if( !obj ) return;