From 9455d03948a205a4e6d25e1f1aca8cba98479b46 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Wed, 22 Jul 2020 11:59:30 +0800 Subject: [PATCH] Fix crash on setInLove. (#26) --- .../common/mixin/core/entity/passive/AnimalEntityMixin.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/AnimalEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/AnimalEntityMixin.java index 1a0393ea..2623272f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/AnimalEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/passive/AnimalEntityMixin.java @@ -1,6 +1,7 @@ package io.izzel.arclight.common.mixin.core.entity.passive; import io.izzel.arclight.common.bridge.entity.passive.AnimalEntityBridge; +import io.izzel.arclight.common.mixin.core.entity.AgeableEntityMixin; import net.minecraft.entity.passive.AnimalEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -12,7 +13,6 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import io.izzel.arclight.common.mixin.core.entity.AgeableEntityMixin; @Mixin(AnimalEntity.class) public abstract class AnimalEntityMixin extends AgeableEntityMixin implements AnimalEntityBridge { @@ -34,7 +34,9 @@ public abstract class AnimalEntityMixin extends AgeableEntityMixin implements An @Inject(method = "setInLove(Lnet/minecraft/entity/player/PlayerEntity;)V", at = @At("HEAD")) private void arclight$setBreedItem(PlayerEntity player, CallbackInfo ci) { - this.breedItem = player.inventory.getCurrentItem(); + if (player != null) { + this.breedItem = player.inventory.getCurrentItem(); + } } @Override