Cynthia Yantis / CraftBukkit / 1ffaef14e3e

Commits

md_5 authored 1ffaef14e3e 1 week ago

SPIGOT-8028: Fix error with plugins setting tameable entity owners to null

Modified


18 18	public EntityTameableAnimal getHandle() {
19 19	return (EntityTameableAnimal) super.getHandle();
20 20	}
21 21
22 22	public UUID getOwnerUUID() {
23 23	EntityReference<EntityLiving> owner = getHandle().getOwnerReference();
24 24	return (owner != null) ? owner.getUUID() : null;
25 25	}
26 26
27 27	public void setOwnerUUID(UUID uuid) {
28 -	getHandle().setOwnerReference(new EntityReference<>(uuid));
28 +	getHandle().setOwnerReference((uuid) != null ? new EntityReference<>(uuid) : null);
29 29	}
30 30
31 31	@Override
32 32	public AnimalTamer getOwner() {
33 33	if (getOwnerUUID() == null) {
34 34	return null;
35 35	}
36 36
37 37	AnimalTamer owner = getServer().getPlayer(getOwnerUUID());
38 38	if (owner == null) {