mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 06:24:06 +01:00
15 lines
720 B
Diff
15 lines
720 B
Diff
--- a/net/minecraft/server/EntityItemFrame.java
|
|
+++ b/net/minecraft/server/EntityItemFrame.java
|
|
@@ -97,6 +97,11 @@
|
|
return false;
|
|
} else if (!damagesource.isExplosion() && !this.getItem().isEmpty()) {
|
|
if (!this.world.isClientSide) {
|
|
+ // CraftBukkit start - fire EntityDamageEvent
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f, false) || this.dead) {
|
|
+ return true;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.b(damagesource.getEntity(), false);
|
|
this.a(SoundEffects.ENTITY_ITEM_FRAME_REMOVE_ITEM, 1.0F, 1.0F);
|
|
}
|