Fix ExplosionPrimeEvent#setFire not working with EnderCrystals

By: Phoenix616 <mail@moep.tv>
This commit is contained in:
CraftBukkit/Spigot 2019-03-09 22:29:09 +01:00
parent 6caa3d0de8
commit 6f19c56acd

View File

@ -39,13 +39,13 @@
if (!damagesource.isExplosion()) { if (!damagesource.isExplosion()) {
- this.world.explode((Entity) null, this.locX, this.locY, this.locZ, 6.0F, true); - this.world.explode((Entity) null, this.locX, this.locY, this.locZ, 6.0F, true);
+ // CraftBukkit start + // CraftBukkit start
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 6.0F, true); + ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 6.0F, false);
+ this.world.getServer().getPluginManager().callEvent(event); + this.world.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) { + if (event.isCancelled()) {
+ this.dead = false; + this.dead = false;
+ return false; + return false;
+ } + }
+ this.world.explode(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire()); + this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire(), true);
+ // CraftBukkit end + // CraftBukkit end
} }