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

cleanup some unneeded log output

Browse source
This commit is contained in:
NotAdam 2019-02-11 14:51:56 +11:00
parent 5a94679b2d
commit 8e74681db1
4 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
View file

@ -12,13 +12,6 @@ public:
{ {
} }
void onCastFinish( Sapphire::Action::Action& currentAction ) override
{
auto source = currentAction.getSourceChara();
if( auto player = source->getAsPlayer() )
player->sendDebug( "cast finished" );
}
void onCharaHit( Sapphire::Action::Action& currentAction, Sapphire::Entity::Chara& hitActor ) override void onCharaHit( Sapphire::Action::Action& currentAction, Sapphire::Entity::Chara& hitActor ) override
{ {
currentAction.damageTarget( 150, hitActor ); currentAction.damageTarget( 150, hitActor );

15
src/world/Action/Action.cpp
View file

@ -172,10 +172,6 @@ void Sapphire::Action::Action::castStart()
m_startTime = Util::getTimeMs(); m_startTime = Util::getTimeMs();
auto player = m_pSource->getAsPlayer(); auto player = m_pSource->getAsPlayer();
if( player )
{
player->sendDebug( "castStart()" );
}
if( hasCastTime() ) if( hasCastTime() )
{ {
@ -233,8 +229,6 @@ void Sapphire::Action::Action::castInterrupt()
// reset state flag // reset state flag
//player->unsetStateFlag( PlayerStateFlag::Occupied1 ); //player->unsetStateFlag( PlayerStateFlag::Occupied1 );
player->unsetStateFlag( PlayerStateFlag::Casting ); player->unsetStateFlag( PlayerStateFlag::Casting );
player->sendDebug( "castInterrupt()" );
} }
if( hasCastTime() ) if( hasCastTime() )
@ -261,9 +255,6 @@ void Sapphire::Action::Action::castFinish()
auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >(); auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
auto pPlayer = m_pSource->getAsPlayer();
pPlayer->sendDebug( "castFinish()" );
if( hasCastTime() ) if( hasCastTime() )
{ {
/*auto control = ActorControlPacket143( m_pTarget->getId(), ActorControlType::Unk7, /*auto control = ActorControlPacket143( m_pTarget->getId(), ActorControlType::Unk7,
@ -280,9 +271,9 @@ void Sapphire::Action::Action::castFinish()
// todo: calculate final hit targets and call onCharaHit in action script // todo: calculate final hit targets and call onCharaHit in action script
pScriptMgr->onCharaHit( *this, *m_pTarget ); pScriptMgr->onCharaHit( *this, *m_pTarget );
} }
else else if( auto player = m_pSource->getAsPlayer() )
{ {
pScriptMgr->onEObjHit( *pPlayer, m_targetId ); pScriptMgr->onEObjHit( *player, m_targetId );
return; return;
} }
@ -372,7 +363,7 @@ void Sapphire::Action::Action::damageTarget( uint32_t potency, Entity::Chara& ch
chara.takeDamage( potency ); chara.takeDamage( potency );
if( auto player = m_pSource->getAsPlayer() ) if( auto player = m_pSource->getAsPlayer() )
player->sendDebug( "hit actorId#{0} for damage: {1}", chara.getId(), potency ); player->sendDebug( "hit actorId#{0} for potency: {1}", chara.getId(), potency );
m_effects[ EffectPacketIdentity::DamageEffect ].m_entries.emplace_back( entry ); m_effects[ EffectPacketIdentity::DamageEffect ].m_entries.emplace_back( entry );

2
src/world/Manager/ActionMgr.cpp
View file

@ -31,8 +31,6 @@ void World::Manager::ActionMgr::handleAoEPlayerAction( Entity::Player& player, u
void World::Manager::ActionMgr::handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId, void World::Manager::ActionMgr::handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId,
Data::ActionPtr actionData, uint64_t targetId ) Data::ActionPtr actionData, uint64_t targetId )
{ {
player.sendDebug( "got act: {0}", actionData->name );
auto action = Action::make_Action( player.getAsPlayer(), actionId, actionData, framework() ); auto action = Action::make_Action( player.getAsPlayer(), actionId, actionData, framework() );
if( targetId != player.getId() ) if( targetId != player.getId() )

6
src/world/Network/Handlers/ActionHandler.cpp
View file

@ -27,7 +27,7 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
const auto itemSourceSlot = packet.data().itemSourceSlot; const auto itemSourceSlot = packet.data().itemSourceSlot;
const auto itemSourceContainer = packet.data().itemSourceContainer; const auto itemSourceContainer = packet.data().itemSourceContainer;
player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, targetId: {3}", type, sequence, actionId, targetId ); // player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, targetId: {3}", type, sequence, actionId, targetId );
auto exdData = m_pFw->get< Data::ExdDataGenerated >(); auto exdData = m_pFw->get< Data::ExdDataGenerated >();
assert( exdData ); assert( exdData );
@ -99,8 +99,8 @@ void Sapphire::Network::GameConnection::aoeActionHandler( FrameworkPtr pFw,
return; return;
} }
player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, x:{3}, y:{4}, z:{5}", // player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, x:{3}, y:{4}, z:{5}",
type, sequence, actionId, pos.x, pos.y, pos.z ); // type, sequence, actionId, pos.x, pos.y, pos.z );
auto exdData = m_pFw->get< Data::ExdDataGenerated >(); auto exdData = m_pFw->get< Data::ExdDataGenerated >();
assert( exdData ); assert( exdData );