PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 19:46:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove previous passengers when picking up an entity. Fixes #25

Browse source
This commit is contained in:
Sollace 2021-01-27 10:15:13 +02:00
parent 1bcba1c08d
commit a544724751
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java
View file

@ -56,10 +56,12 @@ public class CarryAbility implements Ability<Hit> {
PlayerEntity player = iplayer.getMaster(); PlayerEntity player = iplayer.getMaster();
LivingEntity rider = findRider(player, iplayer.getWorld()); LivingEntity rider = findRider(player, iplayer.getWorld());
if (player.hasPassengers()) {
player.removeAllPassengers();
}
if (rider != null) { if (rider != null) {
rider.startRiding(player, true); rider.startRiding(player, true);
} else {
player.removeAllPassengers();
} }
if (player instanceof ServerPlayerEntity) { if (player instanceof ServerPlayerEntity) {