From e13d1196863d5dcfea3d17b79238427dfb2c61b2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 30 May 2017 21:25:59 +1000
Subject: Update to Minecraft 1.12-pre6

---
 nms-patches/EntityEnderCrystal.patch | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'nms-patches/EntityEnderCrystal.patch')

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);
-                 }
-             }
-- 
cgit v1.2.3