Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-10-28 06:20:20 +01:00
Code Issues Projects Releases Wiki Activity

[Bleeding] Fix checks for non-living entities. Fixes BUKKIT-5667

Browse Source
This commit is contained in:
t00thpick1 2014-06-24 12:17:18 -04:00 committed by Travis Watkins
parent 9099e48e74
commit 83e934b3bd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/EntityFireball.java
View File

@ -235,7 +235,7 @@ public abstract class EntityFireball extends Entity {
this.P();
if (damagesource.getEntity() != null) {
// CraftBukkit start
if (!CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
return false;
}
// CraftBukkit end

2
src/main/java/net/minecraft/server/EntityItemFrame.java
View File

@ -24,7 +24,7 @@ public class EntityItemFrame extends EntityHanging {
} else if (this.getItem() != null) {
if (!this.world.isStatic) {
// CraftBukkit start - fire EntityDamageEvent
if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f) || this.dead) {
if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f) || this.dead) {
return true;
}
// CraftBukkit end