mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update to Minecraft 1.12-pre6

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2017-05-30 21:25:59 +10:00
commit ea6ca4328a
35 changed files with 297 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

27
paper-server/nms-patches/EntityEnderCrystal.patch
View file

@ -25,7 +25,7 @@
}
}
@@ -75,9 +84,22 @@
@@ -75,10 +84,23 @@
return false;
} else {
if (!this.dead && !this.world.isClientSide) {
@ -36,16 +36,17 @@
+ // 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
if (!damagesource.isExplosion()) {
- 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);
}
}