diff options
| author | md_5 <git@md-5.net> | 2018-07-15 10:00:00 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-07-15 10:00:00 +1000 |
| commit | 421c1728c81e2f729dff88da2ac96535d2b8e5e8 (patch) | |
| tree | 6c51d93e811d1eb86b68461a42fc5cf03b168b0c /nms-patches/BlockTNT.patch | |
| parent | 57ab4cfc6f4ff526d44319d9b8c79f6848db2de7 (diff) | |
| download | craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.gz craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.lz craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.xz craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.zip | |
Update to Minecraft 1.13-pre7
Diffstat (limited to 'nms-patches/BlockTNT.patch')
| -rw-r--r-- | nms-patches/BlockTNT.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/BlockTNT.patch b/nms-patches/BlockTNT.patch index ef5838b9..1af71a5f 100644 --- a/nms-patches/BlockTNT.patch +++ b/nms-patches/BlockTNT.patch @@ -1,14 +1,14 @@ --- a/net/minecraft/server/BlockTNT.java +++ b/net/minecraft/server/BlockTNT.java -@@ -75,6 +75,11 @@ +@@ -72,6 +72,11 @@ EntityArrow entityarrow = (EntityArrow) entity; if (entityarrow.isBurning()) { + // CraftBukkit start -+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityarrow, blockposition, Blocks.AIR, 0).isCancelled()) { ++ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(entityarrow, blockposition, Blocks.AIR.getBlockData()).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); + this.a(world, blockposition, entityarrow.shooter instanceof EntityLiving ? (EntityLiving) entityarrow.shooter : null); world.setAir(blockposition); } |