Minor bug fixes and changes

src/client/ChatModifiersHandler.lua

@@ -7,12 +7,12 @@ local Remotes = require(ReplicatedStorage.Common.Remotes)
 local selectors = require(ReplicatedStorage.Common.State.selectors)
 local store = require(StarterPlayer.StarterPlayerScripts.Client.State.Store)
 
+local random = Random.new()
 local player = Players.LocalPlayer
 local tips = {
 	"Don't forget to open and evolve pets for more fear!",
 	"Fight weaker enemies for easy gems!",
 	"Missions and bosses are the best way to get gems!",
-	"Remember to buy weapons to do more damage!",
 	"Stronger areas give more strength when you workout!",
 	"You can wait 2 minutes to reset your fear meter while scared!",
 	"Deal more damage by buying stronger weapons!",
@@ -42,8 +42,9 @@ Remotes.Client:Get("LegendaryUnboxed"):Connect(function(playerName, petName)
 end)
 
 task.delay(120, function()
-	for _, tip in tips do
+	while #tips > 0 do
 		if selectors.getSetting(store:getState(), player.Name, "Tips") then
+			local tip = table.remove(tips, random:NextInteger(1, #tips))
 			TextChatService.TextChannels.RBXGeneral:DisplaySystemMessage(
 				`<font color= 'rgb(255, 255, 255)'>Tip: {tip}</font>`
 			)

src/client/Jumpscare.lua

@@ -48,6 +48,9 @@ local function jumpscarePlayer(enemyName)
 				task.wait(sound.Duration.Value)
 				sound:Stop()
 			end
+			if sound.IsPlaying then
+				sound.Ended:Wait()
+			end
 			sound.TimePosition = timePosition
 		end)
 	end

src/server/Combat/Enemies/ApplyDamageToEnemy.lua

@@ -62,11 +62,6 @@ return function(player, enemy, info, janitor)
 		oldEquippedWeaponAccessory:Destroy()
 	end
 
-	local oldEquippedWeaponModel = findFirstChildWithTag(player.Character, "WeaponModel")
-	if oldEquippedWeaponModel then
-		oldEquippedWeaponModel:Destroy()
-	end
-
 	if weaponName ~= "Fists" then
 		local weaponAccessory = weapons[weaponName]:Clone()
 		player.Character.Humanoid:AddAccessory(weaponAccessory)
@@ -80,9 +75,6 @@ return function(player, enemy, info, janitor)
 				return
 			end
 			task.delay(1, function()
-				if selectors.getCurrentTarget(store:getState(), player.Name) then
-					return
-				end
 				weaponAccessory:Destroy()
 				if not findFirstChildWithTag(player.Character, "WeaponAccessory") then
 					player.Character.Humanoid:AddAccessory(equippedWeaponAccessory:Clone())
@@ -105,6 +97,11 @@ return function(player, enemy, info, janitor)
 				break
 			end
 
+			oldEquippedWeaponAccessory = findFirstChildWithTag(player.Character, "WeaponAccessory")
+			if oldEquippedWeaponAccessory then
+				oldEquippedWeaponAccessory:Destroy()
+			end
+
 			task.spawn(function()
 				local damageIndicator = damageIndicatorTemplate:Clone()
 				local tween = TweenService:Create(damageIndicator.Amount, TweenInfo.new(0.5), { TextTransparency = 1 })

src/server/Combat/Enemies/init.lua

@@ -48,24 +48,6 @@ local function orientEnemy(rootPart, playerPosition)
 	)
 end
 
-local function findFirstChildWithTag(parent: Instance?, tag: string, recursive: boolean?): Instance?
-	if not parent then
-		return nil
-	end
-	for _, child in parent:GetChildren() do
-		if CollectionService:HasTag(child, tag) then
-			return child
-		end
-		if recursive then
-			local result = findFirstChildWithTag(child, tag, recursive)
-			if result then
-				return result
-			end
-		end
-	end
-	return nil
-end
-
 local function handleEnemy(enemy)
 	local info = {
 		HealthValue = enemy.Configuration.FearHealth,
@@ -215,11 +197,6 @@ local function handleEnemy(enemy)
 
 		humanoid:MoveTo(enemy.Hitbox.Position + (humanoid.RootPart.Position - enemy.Hitbox.Position).Unit * fightRange)
 
-		local oldEquippedWeaponModel = findFirstChildWithTag(player.Character, "WeaponModel")
-		if oldEquippedWeaponModel then
-			oldEquippedWeaponModel:Destroy()
-		end
-
 		playerJanitor:Add(
 			store.changed:connect(function(newState)
 				if