diff --git a/server/gameserver/creature.h b/server/gameserver/creature.h
index 6fc8237..ac32d10 100644
--- a/server/gameserver/creature.h
+++ b/server/gameserver/creature.h
@@ -46,7 +46,6 @@ class Creature : public MoveableEntity
     virtual void SelectSkillTargets(const a8::Vec2& target_pos, std::set<Entity*>& target_list);
 
 protected:
-    bool use_skill = false;
     size_t curr_skill_phase = 0;
     a8::Vec2 skill_dir;
     float skill_param1 = 0;
diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 598c689..17317d3 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -1369,16 +1369,11 @@ void Human::DoSkill(int skill_id, int target_id, const a8::Vec2& target_pos)
         }
         ++stats.use_skill_times;
         OnAttack();
-#if 1
         room->frame_event.AddSkillCdChg(this);
-#else
-        need_sync_active_player = true;
-#endif
         if (HasBuffEffect(kBET_Camouflage)) {
             RemoveBuffByEffectId(kBET_Camouflage);
         }
     }
-    use_skill = false;
 }
 
 int Human::SelectSkillId()
diff --git a/server/gameserver/human.h b/server/gameserver/human.h
index 0663af2..055a8da 100644
--- a/server/gameserver/human.h
+++ b/server/gameserver/human.h
@@ -386,6 +386,8 @@ private:
     Entity* last_collision_door_ = nullptr;
     long long jump_frameno_ = 0;
 
+    bool use_skill = false;
+
     friend class FrameMaker;
     friend class FrameEvent;
 };
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 8af3911..de331f5 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -394,6 +394,7 @@ void Player::UpdateUseSkill()
         return;
     }
     DoSkill(use_skill_id, skill_target_id, a8::Vec2());
+    use_skill = false;
 }
 
 void Player::Shot()