OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 04:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix NPE when blowing up an item frame. Fixes BUKKIT-2763

Browse source
This commit is contained in:
Travis Watkins 2012-10-31 11:30:29 -05:00 committed by EvilSeph
parent f479aa84a4
commit 347fd3cb6e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/minecraft/server/EntityHanging.java
View file

@ -226,7 +226,7 @@ public abstract class EntityHanging extends Entity {
this.world.getServer().getPluginManager().callEvent(paintingEvent);
}
if (dead || event.isCancelled() || (paintingEvent != null && paintingEvent.isCancelled())) {
if (dead || (event != null && event.isCancelled()) || (paintingEvent != null && paintingEvent.isCancelled())) {
return true;
}
// CraftBukkit end