2014-11-30 23:16:48 +01:00
|
|
|
From 17b8ffe2da66b3b20f4f94f1501b9b1fc074fef6 Mon Sep 17 00:00:00 2001
|
2014-11-28 02:17:45 +01:00
|
|
|
From: BlackHole <black-hole@live.com>
|
|
|
|
|
Date: Tue, 16 Jul 2013 22:34:50 +0200
|
|
|
|
|
Subject: [PATCH] Call EntityChangeBlockEvent for Fire Arrows hitting TNT
|
|
|
|
|
|
|
|
|
|
Adds BUKKIT-4355
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
|
|
|
|
|
index cc61759..7443873 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/server/BlockTNT.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/BlockTNT.java
|
|
|
|
|
@@ -77,6 +77,11 @@ public class BlockTNT extends Block {
|
|
|
|
|
EntityArrow entityarrow = (EntityArrow) entity;
|
|
|
|
|
|
|
|
|
|
if (entityarrow.isBurning()) {
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityarrow, blockposition.getX(), blockposition.getY(), blockposition.getZ(), Blocks.AIR, 0).isCancelled()) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
this.a(world, blockposition, world.getType(blockposition).set(BlockTNT.EXPLODE, Boolean.valueOf(true)), entityarrow.shooter instanceof EntityLiving ? (EntityLiving) entityarrow.shooter : null);
|
|
|
|
|
world.setAir(blockposition);
|
|
|
|
|
}
|
|
|
|
|
--
|
|
|
|
|
2.1.0
|
|
|
|
|
|
