OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-20 14:08:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Handle null damage events for item frames. Fixes BUKKIT-5114

Browse source 
Some types of damage are handled specially so do not end up returning an
event in handleEntityDamageEvent. To ensure we don't have problems with
these we need to check for them and simply ignore them, as they've been
handled already.
This commit is contained in:
Travis Watkins 2013-12-09 13:40:52 -06:00
parent 80935e5c2b
commit 305e5f4f08
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/net/minecraft/server/EntityItemFrame.java
View file

@ -24,10 +24,12 @@ public class EntityItemFrame extends EntityHanging {
} else if (this.getItem() != null) { } else if (this.getItem() != null) {
if (!this.world.isStatic) { if (!this.world.isStatic) {
// CraftBukkit start // CraftBukkit start
if (org.bukkit.craftbukkit.event.CraftEventFactory.handleEntityDamageEvent(this, damagesource, f).isCancelled() || this.dead) { org.bukkit.event.entity.EntityDamageEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.handleEntityDamageEvent(this, damagesource, f);
return false; if ((event != null && event.isCancelled()) || this.dead) {
return true;
} }
// CraftBukkit end // CraftBukkit end
this.b(damagesource.getEntity(), false); this.b(damagesource.getEntity(), false);
this.setItem((ItemStack) null); this.setItem((ItemStack) null);
} }