PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 15:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed crash when a player rejoins a world with an entity in their arms

Browse source
This commit is contained in:
Sollace 2023-02-26 00:37:56 +00:00
parent 65201baa62
commit 1ef29e4eb5
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/minelittlepony/unicopia/entity/Living.java
View file

@ -154,8 +154,12 @@ public abstract class Living<T extends LivingEntity> implements Equine<T>, Caste
if (!entity.hasVehicle() && getCarrierId().isPresent() && !asWorld().isClient && entity.age % 10 == 0) {
UUID carrierId = getCarrierId().get();
Entity carrier = ((ServerWorld)asWorld()).getEntity(carrierId);
asEntity().startRiding(carrier, true);
Living.transmitPassengers(carrier);
if (carrier != null) {
asEntity().startRiding(carrier, true);
Living.transmitPassengers(carrier);
} else {
Unicopia.LOGGER.warn("No passenger with id {]", carrierId);
}
}
}