From 33b3eec4cb4b03802cb3ac0da4a1ec7306c4b404 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 21 Jan 2021 09:40:01 +0200 Subject: [PATCH] Fixed crash when reading a projectile spawn packet from earlier versions --- .../com/minelittlepony/unicopia/network/MsgSpawnProjectile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/minelittlepony/unicopia/network/MsgSpawnProjectile.java b/src/main/java/com/minelittlepony/unicopia/network/MsgSpawnProjectile.java index 0b699479..f6fcb5ba 100644 --- a/src/main/java/com/minelittlepony/unicopia/network/MsgSpawnProjectile.java +++ b/src/main/java/com/minelittlepony/unicopia/network/MsgSpawnProjectile.java @@ -22,7 +22,7 @@ public class MsgSpawnProjectile extends EntitySpawnS2CPacket implements Channel. @SuppressWarnings("unchecked") public MsgSpawnProjectile(Entity e) { - super(e, Optional.of(e instanceof Owned ? ((Owned)e).getMaster() : null).map(Entity::getEntityId).orElse(0)); + super(e, Optional.ofNullable(e instanceof Owned ? ((Owned)e).getMaster() : null).map(Entity::getEntityId).orElse(0)); } @Override