From a5447247519b975ea783d8dd6682a3f0b4dcfa29 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 27 Jan 2021 10:15:13 +0200 Subject: [PATCH] Remove previous passengers when picking up an entity. Fixes #25 --- .../com/minelittlepony/unicopia/ability/CarryAbility.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java index 45206bec..96085b24 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java @@ -56,10 +56,12 @@ public class CarryAbility implements Ability { PlayerEntity player = iplayer.getMaster(); LivingEntity rider = findRider(player, iplayer.getWorld()); + if (player.hasPassengers()) { + player.removeAllPassengers(); + } + if (rider != null) { rider.startRiding(player, true); - } else { - player.removeAllPassengers(); } if (player instanceof ServerPlayerEntity) {