--- a/net/minecraft/server/EntityEnderCrystal.java
+++ b/net/minecraft/server/EntityEnderCrystal.java
@@ -2,6 +2,11 @@
 
 import com.google.common.base.Optional;
 
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.ExplosionPrimeEvent;
+// CraftBukkit end
+
 public class EntityEnderCrystal extends Entity {
 
     private static final DataWatcherObject<Optional<BlockPosition>> b = DataWatcher.a(EntityEnderCrystal.class, DataWatcherRegistry.k);
@@ -38,7 +43,11 @@
             BlockPosition blockposition = new BlockPosition(this);
 
             if (this.world.worldProvider instanceof WorldProviderTheEnd && this.world.getType(blockposition).getBlock() != Blocks.FIRE) {
-                this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
+                // CraftBukkit start
+                if (!CraftEventFactory.callBlockIgniteEvent(this.world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this).isCancelled()) {
+                    this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
+                }
+                // CraftBukkit end
             }
         }
 
@@ -74,9 +83,22 @@
             return false;
         } else {
             if (!this.dead && !this.world.isClientSide) {
+                // CraftBukkit start - All non-living entities need this
+                if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
+                    return false;
+                }
+                // CraftBukkit end
                 this.die();
                 if (!this.world.isClientSide) {
-                    this.world.explode((Entity) null, this.locX, this.locY, this.locZ, 6.0F, true);
+                    // CraftBukkit start
+                    ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 6.0F, true);
+                    this.world.getServer().getPluginManager().callEvent(event);
+                    if (event.isCancelled()) {
+                        this.dead = false;
+                        return false;
+                    }
+                    this.world.explode(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire());
+                    // CraftBukkit end
                     this.a(damagesource);
                 }
             }