1 files changed, 140 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0313-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0313-Add-TNTPrimeEvent.patch
new file mode 100644
index 0000000000..e4f323db8f
--- /dev/null
+++ b/Spigot-Server-Patches/0313-Add-TNTPrimeEvent.patch
@@ -0,0 +1,140 @@
+From 3ef265b92bb3d54b656801642ceeba93feae998c Mon Sep 17 00:00:00 2001
+From: Mark Vainomaa <[email protected]>
+Date: Mon, 16 Jul 2018 00:05:05 +0300
+Subject: [PATCH] Add TNTPrimeEvent
+
+
+diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
+index 3f421d46a0..0fbcd352c8 100644
+--- a/src/main/java/net/minecraft/server/BlockFire.java
++++ b/src/main/java/net/minecraft/server/BlockFire.java
+@@ -2,6 +2,7 @@ package net.minecraft.server;
+ 
+ import it.unimi.dsi.fastutil.objects.Object2IntMap;
+ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
++import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent
+ import java.util.Map;
+ import java.util.Random;
+ import java.util.Map.Entry;
+@@ -233,12 +234,19 @@ public class BlockFire extends Block {
+ 
+                 world.setTypeAndData(blockposition, (IBlockData) this.a((IBlockAccess) world, blockposition).set(BlockFire.AGE, l), 3);
+             } else {
+-                world.setAir(blockposition);
++                if(iblockdata.getBlock() != Blocks.TNT) world.setAir(blockposition); // Paper - TNTPrimeEvent - We might be cancelling it below, move the setAir down
+             }
+ 
+             Block block = iblockdata.getBlock();
+ 
+             if (block instanceof BlockTNT) {
++                // Paper start - TNTPrimeEvent
++                org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);
++                if (!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.FIRE, null).callEvent()) {
++                    return;
++                }
++                world.setAir(blockposition); // setair after non cancelled event, it would usually be air by now
++                // Paper end
+                 ((BlockTNT) block).a(world, blockposition);
+             }
+         }
+diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
+index f97fccf562..c821e6b3b9 100644
+--- a/src/main/java/net/minecraft/server/BlockTNT.java
++++ b/src/main/java/net/minecraft/server/BlockTNT.java
+@@ -1,6 +1,7 @@
+ package net.minecraft.server;
+ 
+ import javax.annotation.Nullable;
++import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent
+ 
+ public class BlockTNT extends Block {
+ 
+@@ -14,6 +15,11 @@ public class BlockTNT extends Block {
+     public void onPlace(IBlockData iblockdata, World world, BlockPosition blockposition, IBlockData iblockdata1) {
+         if (iblockdata1.getBlock() != iblockdata.getBlock()) {
+             if (world.isBlockIndirectlyPowered(blockposition)) {
++                // Paper start - TNTPrimeEvent
++                org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);;
++                if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent())
++                    return;
++                // Paper end
+                 this.a(world, blockposition);
+                 world.setAir(blockposition);
+             }
+@@ -23,6 +29,11 @@ public class BlockTNT extends Block {
+ 
+     public void doPhysics(IBlockData iblockdata, World world, BlockPosition blockposition, Block block, BlockPosition blockposition1) {
+         if (world.isBlockIndirectlyPowered(blockposition)) {
++            // Paper start - TNTPrimeEvent
++            org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);;
++            if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent())
++                return;
++            // Paper end
+             this.a(world, blockposition);
+             world.setAir(blockposition);
+         }
+@@ -45,6 +56,12 @@ public class BlockTNT extends Block {
+ 
+     public void wasExploded(World world, BlockPosition blockposition, Explosion explosion) {
+         if (!world.isClientSide) {
++            // Paper start - TNTPrimeEvent
++            org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);;
++            org.bukkit.entity.Entity source = explosion.source != null ? explosion.source.bukkitEntity : null;
++            if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.EXPLOSION, source).callEvent())
++                return;
++            // Paper end
+             EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) ((float) blockposition.getX() + 0.5F), (double) blockposition.getY(), (double) ((float) blockposition.getZ() + 0.5F), explosion.getSource());
+ 
+             entitytntprimed.setFuseTicks((short) (world.random.nextInt(entitytntprimed.getFuseTicks() / 4) + entitytntprimed.getFuseTicks() / 8));
+@@ -72,6 +89,11 @@ public class BlockTNT extends Block {
+         if (item != Items.FLINT_AND_STEEL && item != Items.FIRE_CHARGE) {
+             return super.interact(iblockdata, world, blockposition, entityhuman, enumhand, enumdirection, f, f1, f2);
+         } else {
++            // Paper start - TNTPrimeEvent
++            org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);
++            if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.ITEM, entityhuman.bukkitEntity).callEvent())
++                return true;
++            // Paper end
+             this.a(world, blockposition, (EntityLiving) entityhuman);
+             world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 11);
+             if (item == Items.FLINT_AND_STEEL) {
+@@ -95,6 +117,12 @@ public class BlockTNT extends Block {
+                     return;
+                 }
+                 // CraftBukkit end
++                // Paper start - TNTPrimeEvent
++                org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);
++                if (!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.PROJECTILE, entityarrow.bukkitEntity).callEvent()) {
++                    return;
++                }
++                // Paper end
+                 this.a(world, blockposition, entity1 instanceof EntityLiving ? (EntityLiving) entity1 : null);
+                 world.setAir(blockposition);
+             }
+diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
+index 79d8be8d46..fcc82d8eb5 100644
+--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
++++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
+@@ -9,6 +9,7 @@ import org.apache.logging.log4j.Logger;
+ import org.bukkit.event.entity.EntityExplodeEvent;
+ import org.bukkit.event.entity.EntityRegainHealthEvent;
+ // CraftBukkit end
++import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent
+ 
+ // PAIL: Fixme
+ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMonster {
+@@ -474,6 +475,11 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
+                     BlockPosition pos = new BlockPosition(blockX, blockY, blockZ);
+                     nmsBlock.dropNaturally(world.getType(pos), world, pos, event.getYield(), 0);
+                 }
++                // Paper start - TNTPrimeEvent
++                org.bukkit.block.Block tntBlock = world.getWorld().getBlockAt(blockX, blockY, blockZ);
++                if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.EXPLOSION, explosionSource.getSource().bukkitEntity).callEvent())
++                    continue;
++                // Paper end
+                 nmsBlock.wasExploded(world, new BlockPosition(blockX, blockY, blockZ), explosionSource);
+ 
+                 this.world.setAir(new BlockPosition(blockX, blockY, blockZ));
+-- 
+2.21.0
+