Fix remaining WalkSpeed bugs

Pluviolithic · Nov 14, 2023 · e7fdba0 · e7fdba0
1 parent 29efba6
commit e7fdba0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/server/Combat/Enemy.lua b/src/server/Combat/Enemy.lua
@@ -196,6 +196,10 @@ local function handleEnemy(enemy)
 				end
 			end
 
+			if not selectors.isPlayerLoaded(store:getState(), player.Name) then
+				return
+			end
+
 			local weaponName: string = selectors.getEquippedWeapon(store:getState(), player.Name)
 			local wepaon: Accessory? = if player.Character
 				then player.Character:FindFirstChild(weaponName) :: Accessory
@@ -232,7 +236,13 @@ local function handleEnemy(enemy)
 			end)
 		)
 
-		humanoid.MoveToFinished:Wait()
+		--humanoid.MoveToFinished:Wait()
+		--task.wait(player:DistanceFromCharacter(rootPart.Position) / humanoid.WalkSpeed)
+		repeat
+			task.wait(0.1)
+		until player:DistanceFromCharacter(rootPart.Position) <= fightRange + 5
+			or cleanedUp
+			or not selectors.isPlayerLoaded(store:getState(), player.Name)
 
 		if cleanedUp or (player:DistanceFromCharacter(rootPart.Position) > fightRange + 5) then
 			return

diff --git a/src/server/Combat/FearEffects.lua b/src/server/Combat/FearEffects.lua
@@ -50,7 +50,6 @@ store.changed:connect(function(newState, oldState)
 			task.spawn(trackPlayerScaredStatus, player)
 			newWalkSpeed += modifiedDebuff
 		elseif isScared(player.Name, oldState) then
-			store:dispatch(actions.incrementPlayerStat(player.Name, "WalkSpeed", 4))
 			newWalkSpeed -= modifiedDebuff
 		end
 		local humanoid = if player.Character then player.Character:FindFirstChild "Humanoid" else nil