From 02ca9be079c3bc2f391cf4fc0c71031b92cd4b0d Mon Sep 17 00:00:00 2001
From: h31ix <effectsdude@gmail.com>
Date: Wed, 31 Oct 2012 00:44:32 -0400
Subject: [Bleeding] Fire damage is no longer a valid reason for hanging entity
removal
---
src/main/java/net/minecraft/server/EntityHanging.java | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
(limited to 'src/main/java')
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()));
- }
}
}
--
cgit v1.2.3