diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 87c5450087..6e08eb8525 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -467,11 +467,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void untransform()
 	{
-		if (isPlayer() && getActingPlayer().isFlyingMounted() && !getActingPlayer().canDismount())
-		{
-			return;
-		}
-		
 		_transform.ifPresent(t -> t.onUntransform(this));
 		_transform = Optional.empty();
 		
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 8484b6dbf0..b362b86428 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -6138,31 +6138,6 @@ public final class L2PcInstance extends L2Playable
 	}
 	
 	public boolean dismount()
-	{
-		if (!canDismount())
-		{
-			return false;
-		}
-		
-		final boolean wasFlying = isFlying();
-		sendPacket(new SetupGauge(3, 0, 0));
-		final int petId = _mountNpcId;
-		setMount(0, 0);
-		stopFeed();
-		clearPetData();
-		if (wasFlying)
-		{
-			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
-		}
-		broadcastPacket(new Ride(this));
-		setMountObjectID(0);
-		storePetFood(petId);
-		// Notify self and others about speed change
-		broadcastUserInfo();
-		return true;
-	}
-	
-	public boolean canDismount()
 	{
 		L2WaterZone water = null;
 		for (L2ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
@@ -6197,6 +6172,22 @@ public final class L2PcInstance extends L2Playable
 				}
 			}, 1500);
 		}
+		
+		final boolean wasFlying = isFlying();
+		sendPacket(new SetupGauge(3, 0, 0));
+		final int petId = _mountNpcId;
+		setMount(0, 0);
+		stopFeed();
+		clearPetData();
+		if (wasFlying)
+		{
+			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
+		}
+		broadcastPacket(new Ride(this));
+		setMountObjectID(0);
+		storePetFood(petId);
+		// Notify self and others about speed change
+		broadcastUserInfo();
 		return true;
 	}
 	
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 87c5450087..6e08eb8525 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -467,11 +467,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void untransform()
 	{
-		if (isPlayer() && getActingPlayer().isFlyingMounted() && !getActingPlayer().canDismount())
-		{
-			return;
-		}
-		
 		_transform.ifPresent(t -> t.onUntransform(this));
 		_transform = Optional.empty();
 		
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 515d2c6337..f0a42ed2c0 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -6144,31 +6144,6 @@ public final class L2PcInstance extends L2Playable
 	}
 	
 	public boolean dismount()
-	{
-		if (!canDismount())
-		{
-			return false;
-		}
-		
-		final boolean wasFlying = isFlying();
-		sendPacket(new SetupGauge(3, 0, 0));
-		final int petId = _mountNpcId;
-		setMount(0, 0);
-		stopFeed();
-		clearPetData();
-		if (wasFlying)
-		{
-			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
-		}
-		broadcastPacket(new Ride(this));
-		setMountObjectID(0);
-		storePetFood(petId);
-		// Notify self and others about speed change
-		broadcastUserInfo();
-		return true;
-	}
-	
-	public boolean canDismount()
 	{
 		L2WaterZone water = null;
 		for (L2ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
@@ -6203,6 +6178,22 @@ public final class L2PcInstance extends L2Playable
 				}
 			}, 1500);
 		}
+		
+		final boolean wasFlying = isFlying();
+		sendPacket(new SetupGauge(3, 0, 0));
+		final int petId = _mountNpcId;
+		setMount(0, 0);
+		stopFeed();
+		clearPetData();
+		if (wasFlying)
+		{
+			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
+		}
+		broadcastPacket(new Ride(this));
+		setMountObjectID(0);
+		storePetFood(petId);
+		// Notify self and others about speed change
+		broadcastUserInfo();
 		return true;
 	}
 	
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 87c5450087..6e08eb8525 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -467,11 +467,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void untransform()
 	{
-		if (isPlayer() && getActingPlayer().isFlyingMounted() && !getActingPlayer().canDismount())
-		{
-			return;
-		}
-		
 		_transform.ifPresent(t -> t.onUntransform(this));
 		_transform = Optional.empty();
 		
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 7ce7eaf193..795b01feba 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -6146,31 +6146,6 @@ public final class L2PcInstance extends L2Playable
 	}
 	
 	public boolean dismount()
-	{
-		if (!canDismount())
-		{
-			return false;
-		}
-		
-		final boolean wasFlying = isFlying();
-		sendPacket(new SetupGauge(3, 0, 0));
-		final int petId = _mountNpcId;
-		setMount(0, 0);
-		stopFeed();
-		clearPetData();
-		if (wasFlying)
-		{
-			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
-		}
-		broadcastPacket(new Ride(this));
-		setMountObjectID(0);
-		storePetFood(petId);
-		// Notify self and others about speed change
-		broadcastUserInfo();
-		return true;
-	}
-	
-	public boolean canDismount()
 	{
 		L2WaterZone water = null;
 		for (L2ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
@@ -6205,6 +6180,22 @@ public final class L2PcInstance extends L2Playable
 				}
 			}, 1500);
 		}
+		
+		final boolean wasFlying = isFlying();
+		sendPacket(new SetupGauge(3, 0, 0));
+		final int petId = _mountNpcId;
+		setMount(0, 0);
+		stopFeed();
+		clearPetData();
+		if (wasFlying)
+		{
+			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
+		}
+		broadcastPacket(new Ride(this));
+		setMountObjectID(0);
+		storePetFood(petId);
+		// Notify self and others about speed change
+		broadcastUserInfo();
 		return true;
 	}
 	
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 87c5450087..6e08eb8525 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -467,11 +467,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void untransform()
 	{
-		if (isPlayer() && getActingPlayer().isFlyingMounted() && !getActingPlayer().canDismount())
-		{
-			return;
-		}
-		
 		_transform.ifPresent(t -> t.onUntransform(this));
 		_transform = Optional.empty();
 		
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 445201e6ca..a58e00b121 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -6143,31 +6143,6 @@ public final class L2PcInstance extends L2Playable
 	}
 	
 	public boolean dismount()
-	{
-		if (!canDismount())
-		{
-			return false;
-		}
-		
-		final boolean wasFlying = isFlying();
-		sendPacket(new SetupGauge(3, 0, 0));
-		final int petId = _mountNpcId;
-		setMount(0, 0);
-		stopFeed();
-		clearPetData();
-		if (wasFlying)
-		{
-			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
-		}
-		broadcastPacket(new Ride(this));
-		setMountObjectID(0);
-		storePetFood(petId);
-		// Notify self and others about speed change
-		broadcastUserInfo();
-		return true;
-	}
-	
-	public boolean canDismount()
 	{
 		L2WaterZone water = null;
 		for (L2ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
@@ -6202,6 +6177,22 @@ public final class L2PcInstance extends L2Playable
 				}
 			}, 1500);
 		}
+		
+		final boolean wasFlying = isFlying();
+		sendPacket(new SetupGauge(3, 0, 0));
+		final int petId = _mountNpcId;
+		setMount(0, 0);
+		stopFeed();
+		clearPetData();
+		if (wasFlying)
+		{
+			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
+		}
+		broadcastPacket(new Ride(this));
+		setMountObjectID(0);
+		storePetFood(petId);
+		// Notify self and others about speed change
+		broadcastUserInfo();
 		return true;
 	}
 	
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 1055268981..3ac26b593b 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -17728,26 +17728,6 @@ public final class L2PcInstance extends L2Playable
 	 * @return true, if successful
 	 */
 	public boolean dismount()
-	{
-		if (!canDismount())
-		{
-			return false;
-		}
-		
-		final boolean wasFlying = isFlying();
-		setMountType(0);
-		if (wasFlying)
-		{
-			removeSkill(SkillTable.getInstance().getInfo(4289, 1));
-		}
-		Ride dismount = new Ride(getObjectId(), Ride.ACTION_DISMOUNT, 0);
-		broadcastPacket(dismount);
-		setMountObjectID(0);
-		broadcastUserInfo();
-		return true;
-	}
-	
-	private boolean canDismount()
 	{
 		if (FishingZoneManager.getInstance().isInsideWaterZone(getX(), getY(), getZ() - 300) == null)
 		{
@@ -17774,6 +17754,17 @@ public final class L2PcInstance extends L2Playable
 				}
 			}, 1500);
 		}
+		
+		final boolean wasFlying = isFlying();
+		setMountType(0);
+		if (wasFlying)
+		{
+			removeSkill(SkillTable.getInstance().getInfo(4289, 1));
+		}
+		Ride dismount = new Ride(getObjectId(), Ride.ACTION_DISMOUNT, 0);
+		broadcastPacket(dismount);
+		setMountObjectID(0);
+		broadcastUserInfo();
 		return true;
 	}
 	
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index f16cc9b7cd..f399b622d5 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -4664,7 +4664,7 @@ public final class L2PcInstance extends L2Playable
 	@Override
 	public void untransform()
 	{
-		if ((_transformation == null) || (isFlyingMounted() && !canDismount()))
+		if (_transformation == null)
 		{
 			return;
 		}
@@ -6372,30 +6372,6 @@ public final class L2PcInstance extends L2Playable
 	}
 	
 	public boolean dismount()
-	{
-		if (!canDismount())
-		{
-			return false;
-		}
-		
-		final boolean wasFlying = isFlying();
-		sendPacket(new SetupGauge(3, 0, 0));
-		final int petId = _mountNpcId;
-		setMount(0, 0);
-		stopFeed();
-		if (wasFlying)
-		{
-			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
-		}
-		broadcastPacket(new Ride(this));
-		setMountObjectID(0);
-		storePetFood(petId);
-		// Notify self and others about speed change
-		broadcastUserInfo();
-		return true;
-	}
-	
-	private boolean canDismount()
 	{
 		L2WaterZone water = null;
 		for (L2ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
@@ -6430,6 +6406,21 @@ public final class L2PcInstance extends L2Playable
 				}
 			}, 1500);
 		}
+		
+		final boolean wasFlying = isFlying();
+		sendPacket(new SetupGauge(3, 0, 0));
+		final int petId = _mountNpcId;
+		setMount(0, 0);
+		stopFeed();
+		if (wasFlying)
+		{
+			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
+		}
+		broadcastPacket(new Ride(this));
+		setMountObjectID(0);
+		storePetFood(petId);
+		// Notify self and others about speed change
+		broadcastUserInfo();
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 87c5450087..6e08eb8525 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -467,11 +467,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void untransform()
 	{
-		if (isPlayer() && getActingPlayer().isFlyingMounted() && !getActingPlayer().canDismount())
-		{
-			return;
-		}
-		
 		_transform.ifPresent(t -> t.onUntransform(this));
 		_transform = Optional.empty();
 		
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index f175fe80dd..a4c48db5ab 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -6110,31 +6110,6 @@ public final class L2PcInstance extends L2Playable
 	}
 	
 	public boolean dismount()
-	{
-		if (!canDismount())
-		{
-			return false;
-		}
-		
-		final boolean wasFlying = isFlying();
-		sendPacket(new SetupGauge(3, 0, 0));
-		final int petId = _mountNpcId;
-		setMount(0, 0);
-		stopFeed();
-		clearPetData();
-		if (wasFlying)
-		{
-			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
-		}
-		broadcastPacket(new Ride(this));
-		setMountObjectID(0);
-		storePetFood(petId);
-		// Notify self and others about speed change
-		broadcastUserInfo();
-		return true;
-	}
-	
-	public boolean canDismount()
 	{
 		L2WaterZone water = null;
 		for (L2ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
@@ -6169,6 +6144,22 @@ public final class L2PcInstance extends L2Playable
 				}
 			}, 1500);
 		}
+		
+		final boolean wasFlying = isFlying();
+		sendPacket(new SetupGauge(3, 0, 0));
+		final int petId = _mountNpcId;
+		setMount(0, 0);
+		stopFeed();
+		clearPetData();
+		if (wasFlying)
+		{
+			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
+		}
+		broadcastPacket(new Ride(this));
+		setMountObjectID(0);
+		storePetFood(petId);
+		// Notify self and others about speed change
+		broadcastUserInfo();
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 87c5450087..6e08eb8525 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -467,11 +467,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void untransform()
 	{
-		if (isPlayer() && getActingPlayer().isFlyingMounted() && !getActingPlayer().canDismount())
-		{
-			return;
-		}
-		
 		_transform.ifPresent(t -> t.onUntransform(this));
 		_transform = Optional.empty();
 		
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 6030e4e22a..12accea41a 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -6110,31 +6110,6 @@ public final class L2PcInstance extends L2Playable
 	}
 	
 	public boolean dismount()
-	{
-		if (!canDismount())
-		{
-			return false;
-		}
-		
-		final boolean wasFlying = isFlying();
-		sendPacket(new SetupGauge(3, 0, 0));
-		final int petId = _mountNpcId;
-		setMount(0, 0);
-		stopFeed();
-		clearPetData();
-		if (wasFlying)
-		{
-			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
-		}
-		broadcastPacket(new Ride(this));
-		setMountObjectID(0);
-		storePetFood(petId);
-		// Notify self and others about speed change
-		broadcastUserInfo();
-		return true;
-	}
-	
-	public boolean canDismount()
 	{
 		L2WaterZone water = null;
 		for (L2ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
@@ -6169,6 +6144,22 @@ public final class L2PcInstance extends L2Playable
 				}
 			}, 1500);
 		}
+		
+		final boolean wasFlying = isFlying();
+		sendPacket(new SetupGauge(3, 0, 0));
+		final int petId = _mountNpcId;
+		setMount(0, 0);
+		stopFeed();
+		clearPetData();
+		if (wasFlying)
+		{
+			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
+		}
+		broadcastPacket(new Ride(this));
+		setMountObjectID(0);
+		storePetFood(petId);
+		// Notify self and others about speed change
+		broadcastUserInfo();
 		return true;
 	}
 	
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
index 87c5450087..6e08eb8525 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -467,11 +467,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 	
 	public void untransform()
 	{
-		if (isPlayer() && getActingPlayer().isFlyingMounted() && !getActingPlayer().canDismount())
-		{
-			return;
-		}
-		
 		_transform.ifPresent(t -> t.onUntransform(this));
 		_transform = Optional.empty();
 		
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
index 04f39c7d6e..393497b6df 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
@@ -6112,31 +6112,6 @@ public final class L2PcInstance extends L2Playable
 	}
 	
 	public boolean dismount()
-	{
-		if (!canDismount())
-		{
-			return false;
-		}
-		
-		final boolean wasFlying = isFlying();
-		sendPacket(new SetupGauge(3, 0, 0));
-		final int petId = _mountNpcId;
-		setMount(0, 0);
-		stopFeed();
-		clearPetData();
-		if (wasFlying)
-		{
-			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
-		}
-		broadcastPacket(new Ride(this));
-		setMountObjectID(0);
-		storePetFood(petId);
-		// Notify self and others about speed change
-		broadcastUserInfo();
-		return true;
-	}
-	
-	public boolean canDismount()
 	{
 		L2WaterZone water = null;
 		for (L2ZoneType zone : ZoneManager.getInstance().getZones(getX(), getY(), getZ() - 300))
@@ -6171,6 +6146,22 @@ public final class L2PcInstance extends L2Playable
 				}
 			}, 1500);
 		}
+		
+		final boolean wasFlying = isFlying();
+		sendPacket(new SetupGauge(3, 0, 0));
+		final int petId = _mountNpcId;
+		setMount(0, 0);
+		stopFeed();
+		clearPetData();
+		if (wasFlying)
+		{
+			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
+		}
+		broadcastPacket(new Ride(this));
+		setMountObjectID(0);
+		storePetFood(petId);
+		// Notify self and others about speed change
+		broadcastUserInfo();
 		return true;
 	}