diff options
| author | md_5 <git@md-5.net> | 2017-05-30 21:25:59 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-05-30 21:55:13 +1000 |
| commit | e13d1196863d5dcfea3d17b79238427dfb2c61b2 (patch) | |
| tree | 56220ee8c2b98066fddfce1f7239a6f3e6261187 /nms-patches/EntityEnderCrystal.patch | |
| parent | c155d8dd32556a197ab73c437760e6194ae4e04a (diff) | |
| download | craftbukkit-e13d1196863d5dcfea3d17b79238427dfb2c61b2.tar craftbukkit-e13d1196863d5dcfea3d17b79238427dfb2c61b2.tar.gz craftbukkit-e13d1196863d5dcfea3d17b79238427dfb2c61b2.tar.lz craftbukkit-e13d1196863d5dcfea3d17b79238427dfb2c61b2.tar.xz craftbukkit-e13d1196863d5dcfea3d17b79238427dfb2c61b2.zip | |
Update to Minecraft 1.12-pre6
Diffstat (limited to 'nms-patches/EntityEnderCrystal.patch')
| -rw-r--r-- | nms-patches/EntityEnderCrystal.patch | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/nms-patches/EntityEnderCrystal.patch b/nms-patches/EntityEnderCrystal.patch index df8d9a5f..e8fe828c 100644 --- a/nms-patches/EntityEnderCrystal.patch +++ b/nms-patches/EntityEnderCrystal.patch @@ -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); - } - } |