From 00dad6c59c6d57a65e47e841bf98ff715c8893a1 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Thu, 29 Dec 2022 01:47:54 +0100 Subject: [PATCH] lwc mods should be able do "custom" damage to itemframes --- src/main/java/com/griefcraft/listeners/LWCPlayerListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/griefcraft/listeners/LWCPlayerListener.java b/src/main/java/com/griefcraft/listeners/LWCPlayerListener.java index 490c83f3..f9357907 100644 --- a/src/main/java/com/griefcraft/listeners/LWCPlayerListener.java +++ b/src/main/java/com/griefcraft/listeners/LWCPlayerListener.java @@ -224,8 +224,8 @@ public void onProtectedEntityDamageByEntity(EntityDamageByEntityEvent e) { } // owner permission is required for damaging entities if (!lwc.canDestoryProtection(p, protection)) { - if (e.getCause() == DamageCause.ENTITY_ATTACK && entity instanceof ItemFrame) { - ItemStack item = ((ItemFrame) entity).getItem(); + if ((e.getCause() == DamageCause.CUSTOM || e.getCause() == DamageCause.ENTITY_ATTACK) && entity instanceof ItemFrame frame) { + ItemStack item = frame.getItem(); if (item != null && item.getType() != Material.AIR) { return; // special case for ItemFrames: they call a damageevent when the contained item is removed. // this is allowed for protection members.