geforkt von Mirrors/Paper
[Bleeding] Fix checks for non-living entities. Fixes BUKKIT-5667
Dieser Commit ist enthalten in:
Ursprung
9099e48e74
Commit
83e934b3bd
@ -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
|
||||
|
@ -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
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren