From 5ae53e0d5c8eca530137364681ee37825f8a3f25 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 31 May 2016 20:53:37 +1000 Subject: SPIGOT-2335: EntityCreeper.setPowered --- nms-patches/EntityCreeper.patch | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'nms-patches/EntityCreeper.patch') diff --git a/nms-patches/EntityCreeper.patch b/nms-patches/EntityCreeper.patch index 72fa1d23..2de4eedc 100644 --- a/nms-patches/EntityCreeper.patch +++ b/nms-patches/EntityCreeper.patch @@ -28,25 +28,27 @@ } -@@ -158,8 +163,18 @@ +@@ -158,9 +163,19 @@ public void onLightningStrike(EntityLightning entitylightning) { super.onLightningStrike(entitylightning); +- this.datawatcher.set(EntityCreeper.b, Boolean.valueOf(true)); + // CraftBukkit start + if (CraftEventFactory.callCreeperPowerEvent(this, entitylightning, org.bukkit.event.entity.CreeperPowerEvent.PowerCause.LIGHTNING).isCancelled()) { + return; + } + + this.setPowered(true); -+ } -+ -+ public void setPowered(boolean powered) { - this.datawatcher.set(EntityCreeper.b, Boolean.valueOf(true)); } -+ // CraftBukkit end ++ public void setPowered(boolean powered) { ++ this.datawatcher.set(EntityCreeper.b, powered); ++ } ++ // CraftBukkit end ++ protected boolean a(EntityHuman entityhuman, EnumHand enumhand, @Nullable ItemStack itemstack) { if (itemstack != null && itemstack.getItem() == Items.FLINT_AND_STEEL) { + this.world.a(entityhuman, this.locX, this.locY, this.locZ, SoundEffects.bx, this.bA(), 1.0F, this.random.nextFloat() * 0.4F + 0.8F); @@ -180,9 +195,17 @@ boolean flag = this.world.getGameRules().getBoolean("mobGriefing"); float f = this.isPowered() ? 2.0F : 1.0F; -- cgit v1.2.3