From 8e74681db1c69e171237ee7d9e1f844d031e7efd Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Mon, 11 Feb 2019 14:51:56 +1100
Subject: [PATCH] cleanup some unneeded log output

---
 .../playeractions/archer/ActionHeavyShot97.cpp    |  7 -------
 src/world/Action/Action.cpp                       | 15 +++------------
 src/world/Manager/ActionMgr.cpp                   |  2 --
 src/world/Network/Handlers/ActionHandler.cpp      |  6 +++---
 4 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
index 9f3d6bf7..26a7d9e8 100644
--- a/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
+++ b/src/scripts/action/playeractions/archer/ActionHeavyShot97.cpp
@@ -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
   {
     currentAction.damageTarget( 150, hitActor );
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 3a07709e..c0c7f8ee 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -172,10 +172,6 @@ void Sapphire::Action::Action::castStart()
   m_startTime = Util::getTimeMs();
 
   auto player = m_pSource->getAsPlayer();
-  if( player )
-  {
-    player->sendDebug( "castStart()" );
-  }
 
   if( hasCastTime() )
   {
@@ -233,8 +229,6 @@ void Sapphire::Action::Action::castInterrupt()
     // reset state flag
     //player->unsetStateFlag( PlayerStateFlag::Occupied1 );
     player->unsetStateFlag( PlayerStateFlag::Casting );
-
-    player->sendDebug( "castInterrupt()" );
   }
 
   if( hasCastTime() )
@@ -261,9 +255,6 @@ void Sapphire::Action::Action::castFinish()
 
   auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
 
-  auto pPlayer = m_pSource->getAsPlayer();
-  pPlayer->sendDebug( "castFinish()" );
-
   if( hasCastTime() )
   {
     /*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
     pScriptMgr->onCharaHit( *this, *m_pTarget );
   }
-  else
+  else if( auto player = m_pSource->getAsPlayer() )
   {
-    pScriptMgr->onEObjHit( *pPlayer, m_targetId );
+    pScriptMgr->onEObjHit( *player, m_targetId );
     return;
   }
 
@@ -372,7 +363,7 @@ void Sapphire::Action::Action::damageTarget( uint32_t potency, Entity::Chara& ch
   chara.takeDamage( potency );
 
   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 );
 
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 4222e182..5b23cb67 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -31,8 +31,6 @@ void World::Manager::ActionMgr::handleAoEPlayerAction( Entity::Player& player, u
 void World::Manager::ActionMgr::handleTargetedPlayerAction( Entity::Player& player, uint32_t actionId,
                                                             Data::ActionPtr actionData, uint64_t targetId )
 {
-  player.sendDebug( "got act: {0}", actionData->name );
-
   auto action = Action::make_Action( player.getAsPlayer(), actionId, actionData, framework() );
 
   if( targetId != player.getId() )
diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp
index cb71bb6e..e7a5020c 100644
--- a/src/world/Network/Handlers/ActionHandler.cpp
+++ b/src/world/Network/Handlers/ActionHandler.cpp
@@ -27,7 +27,7 @@ void Sapphire::Network::GameConnection::actionHandler( FrameworkPtr pFw,
   const auto itemSourceSlot = packet.data().itemSourceSlot;
   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 >();
   assert( exdData );
@@ -99,8 +99,8 @@ void Sapphire::Network::GameConnection::aoeActionHandler( FrameworkPtr pFw,
     return;
   }
 
-  player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, x:{3}, y:{4}, z:{5}",
-                    type, sequence, actionId, pos.x, pos.y, pos.z );
+//  player.sendDebug( "Skill type: {0}, sequence: {1}, actionId: {2}, x:{3}, y:{4}, z:{5}",
+//                    type, sequence, actionId, pos.x, pos.y, pos.z );
 
   auto exdData = m_pFw->get< Data::ExdDataGenerated >();
   assert( exdData );