1

server/gameserver/creature.cc

@@ -3147,6 +3147,7 @@ void Creature::ShortFindPath()
                 finaly_pos = left_pos;
             }
             glm::vec3 move_dir = finaly_pos - GetPos().ToGlmVec3();
+            if (!GlmHelper::IsZero(move_dir)) {
                 GlmHelper::Normalize(move_dir);
                 glm::vec3 end_pos = start_pos + move_dir * GetSpeed() / 1.0f;
 
@@ -3159,6 +3160,7 @@ void Creature::ShortFindPath()
                 }
             }
         }
+    }
 }
 
 float Creature::GetSkillRaycastDistance()

server/gameserver/hero_agent.cc

@@ -1695,3 +1695,9 @@ int HeroAgent::GetTodayBattleTimes()
 {
     return 0;
 }
+
+bool HeroAgent::CanAttack()
+{
+    return !(owner_->HasBuffEffect(kBET_Vertigo) ||
+             owner_->HasBuffEffect(kBET_InWater));
+}

server/gameserver/hero_agent.h

@@ -103,6 +103,7 @@ public:
     float GetCarMaxOil();
     bool IsSingleCar();
     bool CarHasBuffEffect(int effect_id);
+    bool CanAttack();
 
     behaviac::EBTStatus RegisterEvents(behaviac::vector<BtEvent_e> events);
     behaviac::EBTStatus ClearEvents();