From 302a0337104b497ca743e1b9f42dc16599ae0d51 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sun, 23 Jun 2024 15:37:24 +0100
Subject: [PATCH] Don't allow flying whilst in a boat. Fixes #377

---
 .../minelittlepony/unicopia/ability/ToggleFlightAbility.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/ability/ToggleFlightAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/ToggleFlightAbility.java
index 66aa0050..d1a45aa2 100644
--- a/src/main/java/com/minelittlepony/unicopia/ability/ToggleFlightAbility.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/ToggleFlightAbility.java
@@ -27,7 +27,7 @@ public class ToggleFlightAbility implements Ability<Hit> {
     @Nullable
     @Override
     public Optional<Hit> prepare(Pony player) {
-        return Hit.of(!player.asEntity().isCreative() && !player.getPhysics().getFlightType().isGrounded());
+        return Hit.of(!player.asEntity().hasVehicle() && !player.asEntity().isCreative() && !player.getPhysics().getFlightType().isGrounded());
     }
 
     @Override