From 02576c0b020dd23aeaa05f4ce6709273f630d897 Mon Sep 17 00:00:00 2001 From: Yanang Pearce Date: Thu, 4 Aug 2022 22:22:04 +0800 Subject: [PATCH] Fix PartEntity not recognized by updating PlayerMixin#attack (#662) (#678) --- .../common/mixin/core/world/entity/player/PlayerMixin.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/PlayerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/PlayerMixin.java index fddfcce5..1b6f1401 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/PlayerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/player/PlayerMixin.java @@ -54,6 +54,7 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.scores.Scoreboard; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.extensions.IForgePlayer; +import net.minecraftforge.entity.PartEntity; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.block.Block; @@ -372,9 +373,9 @@ public abstract class PlayerMixin extends LivingEntityMixin implements PlayerEnt } EnchantmentHelper.doPostDamageEffects((net.minecraft.world.entity.player.Player) (Object) this, entity); final ItemStack itemstack2 = this.getMainHandItem(); - Object object = entity; - if (entity instanceof EnderDragonPart) { - object = ((EnderDragonPart) entity).parentMob; + Entity object = entity; + if (entity instanceof PartEntity) { + object = ((PartEntity) entity).getParent(); } if (!this.level.isClientSide && !itemstack2.isEmpty() && object instanceof LivingEntity) { ItemStack copy = itemstack2.copy();