diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Living.java b/src/main/java/com/minelittlepony/unicopia/entity/Living.java index 29a5ac3b..f756cd74 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/Living.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/Living.java @@ -165,6 +165,14 @@ public abstract class Living implements Equine, Caste } + if (isBeingCarried()) { + Pony carrier = Pony.of(entity.getVehicle()).orElse(null); + if (!carrier.getCompositeRace().any(Abilities.CARRY::canUse)) { + entity.stopRiding(); + entity.refreshPositionAfterTeleport(carrier.getOriginVector()); + Living.transmitPassengers(carrier.asEntity()); + } + } updateDragonBreath();