summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorh31ix <effectsdude@gmail.com>2012-10-31 00:44:32 -0400
committerEvilSeph <evilseph@gmail.com>2012-10-31 00:45:47 -0400
commit02ca9be079c3bc2f391cf4fc0c71031b92cd4b0d (patch)
treeee03a06412a81c7657e93fa1fe0bd53be83a7a22 /src
parent54cce5bf9210362b9dda0148b65267327a1c8b17 (diff)
downloadcraftbukkit-02ca9be079c3bc2f391cf4fc0c71031b92cd4b0d.tar
craftbukkit-02ca9be079c3bc2f391cf4fc0c71031b92cd4b0d.tar.gz
craftbukkit-02ca9be079c3bc2f391cf4fc0c71031b92cd4b0d.tar.lz
craftbukkit-02ca9be079c3bc2f391cf4fc0c71031b92cd4b0d.tar.xz
craftbukkit-02ca9be079c3bc2f391cf4fc0c71031b92cd4b0d.zip
[Bleeding] Fire damage is no longer a valid reason for hanging entity removal
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/EntityHanging.java15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java
index 0427997e..fcdbefc5 100644
--- a/src/main/java/net/minecraft/server/EntityHanging.java
+++ b/src/main/java/net/minecraft/server/EntityHanging.java
@@ -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()));
- }
}
}