2020-05-06 11:48:49 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2018-07-15 23:06:26 +02:00
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
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
2020-09-21 20:40:48 +02:00
index e79f3872de2989d0b9b28a8b49cc399968f5bdbf..4716f366342a3ef70d0ea50e3747786fad1e3573 100644
2018-07-15 23:06:26 +02:00
--- a/src/main/java/net/minecraft/server/BlockFire.java
+++ b/src/main/java/net/minecraft/server/BlockFire.java
2020-08-25 04:22:08 +02:00
@@ -3,6 +3,7 @@ package net.minecraft.server;
import com.google.common.collect.ImmutableMap;
2018-07-31 07:49:40 +02:00
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
2018-07-15 23:06:26 +02:00
+import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent
import java.util.Map;
import java.util.Random;
2020-08-25 04:22:08 +02:00
import java.util.function.Function;
@@ -269,7 +270,7 @@ public class BlockFire extends BlockFireAbstract {
2020-06-25 16:09:55 +02:00
world.setTypeAndData(blockposition, this.a(world, blockposition, l), 3);
2018-07-15 23:06:26 +02:00
} else {
2019-05-05 04:23:25 +02:00
- world.a(blockposition, false);
+ if(iblockdata.getBlock() != Blocks.TNT) world.a(blockposition, false); // Paper - TNTPrimeEvent - We might be cancelling it below, move the setAir down
2018-07-15 23:06:26 +02:00
}
2018-07-31 07:49:40 +02:00
Block block = iblockdata.getBlock();
2020-08-25 04:22:08 +02:00
@@ -277,6 +278,13 @@ public class BlockFire extends BlockFireAbstract {
2018-07-31 07:49:40 +02:00
if (block instanceof BlockTNT) {
2019-05-05 04:23:25 +02:00
BlockTNT blocktnt = (BlockTNT) block;
2018-07-15 23:06:26 +02:00
+ // Paper start - TNTPrimeEvent
2018-08-26 20:11:49 +02:00
+ org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);
+ if (!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.FIRE, null).callEvent()) {
2018-07-15 23:06:26 +02:00
+ return;
2018-08-26 20:11:49 +02:00
+ }
2019-12-30 13:49:48 +01:00
+ world.setAir(blockposition, false);
2018-07-15 23:06:26 +02:00
+ // Paper end
2019-05-05 04:23:25 +02:00
BlockTNT.a(world, blockposition);
2018-07-15 23:06:26 +02:00
}
}
diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
2020-06-25 16:09:55 +02:00
index c6fe9c1f7ef06c4524533130b493ca5e72bd1693..7b601955f3fd36f06c838b896b455a606954d980 100644
2018-07-15 23:06:26 +02:00
--- a/src/main/java/net/minecraft/server/BlockTNT.java
+++ b/src/main/java/net/minecraft/server/BlockTNT.java
2018-07-31 07:49:40 +02:00
@@ -1,6 +1,7 @@
2018-07-15 23:06:26 +02:00
package net.minecraft.server;
2018-07-31 07:49:40 +02:00
import javax.annotation.Nullable;
2018-07-15 23:06:26 +02:00
+import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent
2018-07-31 07:49:40 +02:00
2018-07-15 23:06:26 +02:00
public class BlockTNT extends Block {
2019-05-05 04:23:25 +02:00
@@ -15,6 +16,11 @@ public class BlockTNT extends Block {
public void onPlace(IBlockData iblockdata, World world, BlockPosition blockposition, IBlockData iblockdata1, boolean flag) {
2020-06-25 16:09:55 +02:00
if (!iblockdata1.a(iblockdata.getBlock())) {
2018-07-31 07:49:40 +02:00
if (world.isBlockIndirectlyPowered(blockposition)) {
+ // Paper start - TNTPrimeEvent
2018-08-26 20:11:49 +02:00
+ org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);;
2018-07-31 07:49:40 +02:00
+ if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent())
+ return;
+ // Paper end
2019-05-05 04:23:25 +02:00
a(world, blockposition);
world.a(blockposition, false);
2018-07-31 07:49:40 +02:00
}
2019-05-05 04:23:25 +02:00
@@ -25,6 +31,11 @@ public class BlockTNT extends Block {
@Override
public void doPhysics(IBlockData iblockdata, World world, BlockPosition blockposition, Block block, BlockPosition blockposition1, boolean flag) {
2018-07-15 23:06:26 +02:00
if (world.isBlockIndirectlyPowered(blockposition)) {
+ // Paper start - TNTPrimeEvent
2018-08-26 20:11:49 +02:00
+ org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);;
2018-07-15 23:06:26 +02:00
+ if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent())
+ return;
+ // Paper end
2019-05-05 04:23:25 +02:00
a(world, blockposition);
world.a(blockposition, false);
2018-07-15 23:06:26 +02:00
}
2019-05-05 04:23:25 +02:00
@@ -43,6 +54,12 @@ public class BlockTNT extends Block {
@Override
2018-07-15 23:06:26 +02:00
public void wasExploded(World world, BlockPosition blockposition, Explosion explosion) {
if (!world.isClientSide) {
+ // Paper start - TNTPrimeEvent
2020-06-25 16:09:55 +02:00
+ org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);
2019-06-03 05:26:25 +02:00
+ org.bukkit.entity.Entity source = explosion.source != null ? explosion.source.getBukkitEntity() : null;
2018-07-15 23:06:26 +02:00
+ if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.EXPLOSION, source).callEvent())
+ return;
+ // Paper end
2020-06-25 16:09:55 +02:00
EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, explosion.getSource());
2018-07-15 23:06:26 +02:00
entitytntprimed.setFuseTicks((short) (world.random.nextInt(entitytntprimed.getFuseTicks() / 4) + entitytntprimed.getFuseTicks() / 8));
2019-05-05 04:23:25 +02:00
@@ -71,6 +88,11 @@ public class BlockTNT extends Block {
2018-07-31 07:49:40 +02:00
if (item != Items.FLINT_AND_STEEL && item != Items.FIRE_CHARGE) {
2019-05-05 04:23:25 +02:00
return super.interact(iblockdata, world, blockposition, entityhuman, enumhand, movingobjectpositionblock);
2018-07-31 07:49:40 +02:00
} else {
2018-07-15 23:06:26 +02:00
+ // Paper start - TNTPrimeEvent
2018-08-26 20:11:49 +02:00
+ org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);
2019-06-03 05:26:25 +02:00
+ if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.ITEM, entityhuman.getBukkitEntity()).callEvent())
2019-12-13 02:18:18 +01:00
+ return EnumInteractionResult.FAIL;
2018-07-15 23:06:26 +02:00
+ // Paper end
2019-05-05 04:23:25 +02:00
a(world, blockposition, (EntityLiving) entityhuman);
2018-07-15 23:06:26 +02:00
world.setTypeAndData(blockposition, Blocks.AIR.getBlockData(), 11);
2019-12-12 01:03:31 +01:00
if (!entityhuman.isCreative()) {
2020-06-25 16:09:55 +02:00
@@ -100,6 +122,13 @@ public class BlockTNT extends Block {
2018-07-15 23:06:26 +02:00
}
// CraftBukkit end
2019-05-14 04:20:58 +02:00
2018-07-15 23:06:26 +02:00
+ // Paper start - TNTPrimeEvent
2018-08-26 20:11:49 +02:00
+ org.bukkit.block.Block tntBlock = MCUtil.toBukkitBlock(world, blockposition);
2020-06-25 16:09:55 +02:00
+ if (!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.PROJECTILE, iprojectile.getBukkitEntity()).callEvent()) {
2018-07-15 23:06:26 +02:00
+ return;
2018-08-26 20:11:49 +02:00
+ }
2018-07-15 23:06:26 +02:00
+ // Paper end
2019-05-14 04:20:58 +02:00
+
2020-06-25 16:09:55 +02:00
a(world, blockposition, entity instanceof EntityLiving ? (EntityLiving) entity : null);
2019-05-05 04:23:25 +02:00
world.a(blockposition, false);
2018-07-15 23:06:26 +02:00
}
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
2020-08-25 04:22:08 +02:00
index 6ad63e5bb4b7bec976d1aef74547ff96f64204c6..8da02467dff4b9da644aa12e453d127b7a01e259 100644
2018-07-15 23:06:26 +02:00
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
2019-05-05 04:23:25 +02:00
@@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;
2018-07-15 23:06:26 +02:00
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
2019-05-05 04:23:25 +02:00
public class EntityEnderDragon extends EntityInsentient implements IMonster {
2020-06-25 16:09:55 +02:00
@@ -466,6 +467,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
2019-12-12 01:03:31 +01:00
});
2020-08-25 04:22:08 +02:00
craftBlock.getNMS().dropNaturally((WorldServer) world, blockposition, ItemStack.b);
2018-07-15 23:06:26 +02:00
}
+ // Paper start - TNTPrimeEvent
2020-06-26 14:04:38 +02:00
+ org.bukkit.block.Block tntBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
2019-06-03 05:26:25 +02:00
+ if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.EXPLOSION, explosionSource.getSource().getBukkitEntity()).callEvent())
2018-07-15 23:06:26 +02:00
+ continue;
+ // Paper end
2019-05-05 04:23:25 +02:00
nmsBlock.wasExploded(world, blockposition, explosionSource);
2018-07-15 23:06:26 +02:00
2019-05-05 04:23:25 +02:00
this.world.a(blockposition, false);