52 lines
2.6 KiB
Diff
52 lines
2.6 KiB
Diff
--- a/net/minecraft/world/entity/boss/enderdragon/EntityEnderCrystal.java
|
|
+++ b/net/minecraft/world/entity/boss/enderdragon/EntityEnderCrystal.java
|
|
@@ -22,6 +22,11 @@
|
|
import net.minecraft.world.level.block.BlockFireAbstract;
|
|
import net.minecraft.world.level.dimension.end.EnderDragonBattle;
|
|
|
|
+// 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>> DATA_BEAM_TARGET = DataWatcher.a(EntityEnderCrystal.class, DataWatcherRegistry.OPTIONAL_BLOCK_POS);
|
|
@@ -57,7 +62,11 @@
|
|
BlockPosition blockposition = this.getChunkCoordinates();
|
|
|
|
if (((WorldServer) this.level).getDragonBattle() != null && this.level.getType(blockposition).isAir()) {
|
|
- this.level.setTypeUpdate(blockposition, BlockFireAbstract.a((IBlockAccess) this.level, blockposition));
|
|
+ // CraftBukkit start
|
|
+ if (!CraftEventFactory.callBlockIgniteEvent(this.level, blockposition, this).isCancelled()) {
|
|
+ this.level.setTypeUpdate(blockposition, BlockFireAbstract.a((IBlockAccess) this.level, blockposition));
|
|
+ }
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|
|
@@ -97,9 +106,22 @@
|
|
return false;
|
|
} else {
|
|
if (!this.isRemoved() && !this.level.isClientSide) {
|
|
+ // CraftBukkit start - All non-living entities need this
|
|
+ if (CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f, false)) {
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
this.a(Entity.RemovalReason.KILLED);
|
|
if (!damagesource.isExplosion()) {
|
|
- this.level.explode((Entity) null, this.locX(), this.locY(), this.locZ(), 6.0F, Explosion.Effect.DESTROY);
|
|
+ // CraftBukkit start
|
|
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 6.0F, false);
|
|
+ this.level.getCraftServer().getPluginManager().callEvent(event);
|
|
+ if (event.isCancelled()) {
|
|
+ this.unsetRemoved();
|
|
+ return false;
|
|
+ }
|
|
+ this.level.createExplosion(this, this.locX(), this.locY(), this.locZ(), event.getRadius(), event.getFire(), Explosion.Effect.DESTROY);
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
this.a(damagesource);
|