diff --git a/src/libraries b/src/libraries index 4e08821a..f24f9418 160000 --- a/src/libraries +++ b/src/libraries @@ -1 +1 @@ -Subproject commit 4e08821a45adbff969f6c4863bbe156d4229ffda +Subproject commit f24f9418a993c8359be74fbaf6e13bbabe21c99b diff --git a/src/servers/Server_Common/Exd/ExdData.cpp b/src/servers/Server_Common/Exd/ExdData.cpp index 0c5fd98f..edb12add 100644 --- a/src/servers/Server_Common/Exd/ExdData.cpp +++ b/src/servers/Server_Common/Exd/ExdData.cpp @@ -344,21 +344,13 @@ bool Core::Data::ExdData::loadActionInfo() uint8_t points_type = getField< uint8_t >( fields, 30 ); // 30 uint16_t points_cost = getField< uint16_t >( fields, 31 ); // 31 - uint32_t instantval = getField< bool >( fields, 35 ); // 35 + bool is_instant = getField< bool >( fields, 35 ); // 35 uint16_t cast_time = getField< uint16_t >( fields, 36 ); // 36 uint16_t recast_time = getField< uint16_t >( fields, 37 ); // 37 int8_t model = getField< int8_t >( fields, 39 ); // 39: Action model uint8_t aspect = getField< uint8_t >( fields, 40 ); // 40: Action aspect - uint8_t typeshift = 0x6; - uint8_t mask = 1 << typeshift; - instantval &= mask; - bool final = ( instantval & mask ) == mask; - bool is_instant = final; - - - info->id = id; info->name = name; info->category = category; diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp index 6a4f6e84..b3137453 100644 --- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp +++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp @@ -239,25 +239,6 @@ void Core::DebugCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlaye else pPlayer->setClassJob( static_cast ( id ) ); } - else if( subCommand == "no" ) - { - int32_t id; - - sscanf( params.c_str(), "%d", &id ); - - uint8_t typeshift = 0x6; - uint8_t mask = 1 << typeshift; - id &= mask; - bool final = ( id & mask ) == mask; - pPlayer->sendDebug( std::to_string(final) ); - } - else if( subCommand == "aaah" ) - { - int32_t id; - sscanf( params.c_str(), "%d", &id ); - - pPlayer->sendDebug( std::to_string( pPlayer->actionHasCastTime( id ) ) ); - } else if ( subCommand == "cfpenalty" ) { int32_t minutes; @@ -486,6 +467,7 @@ void Core::DebugCommandHandler::nudge( char * data, Entity::PlayerPtr pPlayer, b void Core::DebugCommandHandler::serverInfo( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr< Core::DebugCommand > command ) { - pPlayer->sendDebug( "SapphireServer " + Version::VERSION + " - " + Version::GIT_HASH ); + pPlayer->sendDebug( "SapphireServer " + Version::VERSION + "\nRev: " + Version::GIT_HASH ); + pPlayer->sendDebug( "Compiled: " __DATE__ " " __TIME__ ); pPlayer->sendDebug( "Sessions: " + std::to_string( g_serverZone.getSessionCount() ) ); }