OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 19:52:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

[Bleeding] Fire damage is no longer a valid reason for hanging entity removal

Browse source
This commit is contained in:
h31ix 2012-10-31 00:44:32 -04:00 committed by EvilSeph
parent 54cce5bf92
commit 02ca9be079
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -210,21 +210,10 @@ public abstract class EntityHanging extends Entity {
PaintingBreakEvent paintingEvent = null;
if (damagesource.getEntity() != null) {
event = new HangingBreakByEntityEvent((Hanging) this.getBukkitEntity(), damagesource.getEntity() == null ? null : damagesource.getEntity().getBukkitEntity());
} else {
if (damagesource == DamageSource.FIRE) {
event = new HangingBreakEvent((Hanging) this.getBukkitEntity(), HangingBreakEvent.RemoveCause.FIRE);
}
// TODO: Could put other stuff here?
}
if (this instanceof EntityPainting) {
// Fire old painting event until it can be removed
if (damagesource.getEntity() != null) {
if (this instanceof EntityPainting) {
// Fire old painting event until it can be removed
paintingEvent = new org.bukkit.event.painting.PaintingBreakByEntityEvent((Painting) this.getBukkitEntity(), damagesource.getEntity() == null ? null : damagesource.getEntity().getBukkitEntity());
} else {
if (damagesource == DamageSource.FIRE) {
paintingEvent = new PaintingBreakEvent((Painting) this.getBukkitEntity(), PaintingBreakEvent.RemoveCause.valueOf(HangingBreakEvent.RemoveCause.FIRE.name()));
}
}
}