From 784f34beed1ca76f29d2546f1bc6d81d26efe581 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Thu, 29 Feb 2024 20:46:18 -0500
Subject: [PATCH] Core/Creature: corrected swimming toggle behavior for
 amphibious creatures

Port From (https://github.com/TrinityCore/TrinityCore/commit/4e8e3d8fb8694762668c3d5bc064de006aca5a1a)
---
 Source/Game/Entities/Creature/Creature.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs
index f41ad1224..5db895f38 100644
--- a/Source/Game/Entities/Creature/Creature.cs
+++ b/Source/Game/Entities/Creature/Creature.cs
@@ -2689,7 +2689,7 @@ namespace Game.Entities
                 SetFall(false);
 
             // Some Amphibious creatures toggle swimming while engaged
-            if (IsAmphibious() && !HasUnitFlag(UnitFlags.CantSwim) && !HasUnitFlag(UnitFlags.CanSwim))
+            if (IsAmphibious() && !HasUnitFlag(UnitFlags.CantSwim) && !HasUnitFlag(UnitFlags.CanSwim) && IsEngaged())
                 if (!IsSwimPrevented() || (GetVictim() != null && !GetVictim().IsOnOceanFloor()))
                     SetUnitFlag(UnitFlags.CanSwim);