From fb7b2e64b2bf07884d8bc15eda59378bf4577da7 Mon Sep 17 00:00:00 2001 From: grimmauld Date: Sun, 6 Sep 2020 12:07:33 +0200 Subject: [PATCH] Fix extendo grip breaking item frames instead of making the item pop off --- .../create/content/curiosities/tools/ExtendoGripItem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java index 324390eba..727e78ef0 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/ExtendoGripItem.java @@ -157,7 +157,7 @@ public class ExtendoGripItem extends Item { if (!isHoldingExtendoGrip(player)) return; Entity target = event.getTarget(); - if (!target.attackEntityFrom(DamageSource.causePlayerDamage(player), 0)) + if (target instanceof ItemFrameEntity || !target.attackEntityFrom(DamageSource.causePlayerDamage(player), 0)) return; int strength = 2; float yaw = entity.rotationYaw * ((float) Math.PI / 180F);