2019-07-20 06:01:24 +02:00
From e866f25ed159540cac7277d5ccd1a3785f7263a0 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
2019-07-20 06:01:24 +02:00
index 37e6a91520..135c6ae47e 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
2018-07-31 07:49:40 +02:00
@@ -2,6 +2,7 @@ package net.minecraft.server;
2018-07-15 23:06:26 +02:00
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;
2018-07-31 07:49:40 +02:00
import java.util.Map.Entry;
2019-05-05 04:23:25 +02:00
@@ -237,7 +238,7 @@ public class BlockFire extends Block {
2018-07-15 23:06:26 +02:00
2018-12-08 11:09:55 +01:00
world.setTypeAndData(blockposition, (IBlockData) this.a((IBlockAccess) world, blockposition).set(BlockFire.AGE, 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();
2019-05-07 14:16:22 +02:00
@@ -245,6 +246,12 @@ public class BlockFire extends Block {
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
+ }
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
2019-07-20 06:01:24 +02:00
index 462c77a000..b2689ee8bf 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) {
2018-07-31 07:49:40 +02:00
if (iblockdata1.getBlock() != iblockdata.getBlock()) {
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
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
+ 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
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));
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())
2018-07-15 23:06:26 +02:00
+ return true;
+ // 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);
2018-07-31 07:49:40 +02:00
if (item == Items.FLINT_AND_STEEL) {
2019-05-14 04:20:58 +02:00
@@ -99,6 +121,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);
2019-06-03 05:26:25 +02:00
+ if (!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.PROJECTILE, entityarrow.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
+
2019-05-05 04:23:25 +02:00
a(world, blockposition, entity1 instanceof EntityLiving ? (EntityLiving) entity1 : null);
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
2019-07-20 06:01:24 +02:00
index 5fae347db2..c2f35f89d3 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 {
2019-05-07 02:33:26 +02:00
@@ -463,6 +464,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
2019-05-05 04:23:25 +02:00
Block.b(craftBlock.getNMS(), loottableinfo_builder);
2018-07-15 23:06:26 +02:00
}
+ // Paper start - TNTPrimeEvent
2019-05-05 04:23:25 +02:00
+ org.bukkit.block.Block tntBlock = world.getWorld().getBlockAt(blockposition.x, blockposition.y, blockposition.z);
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);
2018-07-15 23:06:26 +02:00
--
2019-06-25 21:18:50 +02:00
2.22.0
2018-07-15 23:06:26 +02:00