From ebf1e123e980d6911fb00a6c8d377beabada4b9d Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Mon, 10 May 2021 17:22:59 +0800
Subject: [PATCH] 1

---
 server/gameserver/creature.cc | 2 +-
 server/gameserver/player.cc   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/gameserver/creature.cc b/server/gameserver/creature.cc
index 11c5e3e..9942f35 100644
--- a/server/gameserver/creature.cc
+++ b/server/gameserver/creature.cc
@@ -1193,7 +1193,7 @@ void Creature::Shot(a8::Vec2& target_dir, bool& shot_ok, float fly_distance)
                 (weapon_meta->i->id());
             MetaData::Equip* bullet_meta = MetaMgr::Instance()->GetEquip(weapon_meta->i->use_bullet());;
 
-            if (weapon_upgrade_meta && bullet_meta) {
+            if (bullet_meta) {
                 InternalShot(this,
                              weapon_meta,
                              weapon_upgrade_meta,
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index 2213c6b..14cf6e3 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -114,10 +114,10 @@ void Player::InternalUpdate(int delta_time)
         if (get_on) {
             UpdateGetOn();
         }
-        UpdateAiming();
         if (shot_start || shot_hold) {
             UpdateShot();
         }
+        UpdateAiming();
         if (use_skill) {
             UpdateUseSkill();
         }