Paper/Spigot-Server-Patches/0257-Add-TNTPrimeEvent.patch

149 lines
8.5 KiB
Diff
Raw Normal View History

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/world/entity/boss/enderdragon/EntityEnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
index 97ef4c65c8cc569a99d9697f56bd44d32b151328..51993191e01f55e16667c25b8b57d6a6ddaf493b 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
@@ -61,6 +61,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.EntityRegainHealthEvent;
// CraftBukkit end
+import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent
public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -515,6 +516,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
});
craftBlock.getNMS().dropNaturally((WorldServer) world, blockposition, ItemStack.b);
}
+ // Paper start - TNTPrimeEvent
+ org.bukkit.block.Block tntBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
+ if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.EXPLOSION, explosionSource.getSource().getBukkitEntity()).callEvent())
+ continue;
+ // Paper end
nmsBlock.wasExploded(world, blockposition, explosionSource);
this.world.a(blockposition, false);
diff --git a/src/main/java/net/minecraft/world/level/block/BlockFire.java b/src/main/java/net/minecraft/world/level/block/BlockFire.java
2021-03-16 14:04:28 +01:00
index c22fad0038fdb0769e23db782e3341206fbd80f9..5ef38414d87fbce453e3ab11579c89a8ff089ae0 100644
--- a/src/main/java/net/minecraft/world/level/block/BlockFire.java
+++ b/src/main/java/net/minecraft/world/level/block/BlockFire.java
@@ -3,6 +3,7 @@ package net.minecraft.world.level.block;
import com.google.common.collect.ImmutableMap;
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;
import java.util.function.Function;
2021-03-16 14:04:28 +01:00
@@ -11,6 +12,7 @@ import net.minecraft.SystemUtils;
import net.minecraft.core.BaseBlockPosition;
import net.minecraft.core.BlockPosition;
import net.minecraft.core.EnumDirection;
+import net.minecraft.server.MCUtil;
import net.minecraft.server.level.WorldServer;
import net.minecraft.world.item.context.BlockActionContext;
import net.minecraft.world.level.GameRules;
@@ -289,7 +291,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
}
Block block = iblockdata.getBlock();
2021-03-16 14:04:28 +01:00
@@ -297,6 +299,13 @@ public class BlockFire extends BlockFireAbstract {
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
+ 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;
+ }
+ 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/world/level/block/BlockTNT.java b/src/main/java/net/minecraft/world/level/block/BlockTNT.java
index b5d40898bb4a10b3170cd1f42f1a44de539d53c3..71c46d5042f7e4585b364682cd5464edccdf43f6 100644
--- a/src/main/java/net/minecraft/world/level/block/BlockTNT.java
+++ b/src/main/java/net/minecraft/world/level/block/BlockTNT.java
@@ -22,6 +22,7 @@ import net.minecraft.world.level.block.state.IBlockData;
import net.minecraft.world.level.block.state.properties.BlockProperties;
import net.minecraft.world.level.block.state.properties.BlockStateBoolean;
import net.minecraft.world.phys.MovingObjectPositionBlock;
2018-07-15 23:06:26 +02:00
+import com.destroystokyo.paper.event.block.TNTPrimeEvent; // Paper - TNTPrimeEvent
2018-07-15 23:06:26 +02:00
public class BlockTNT extends Block {
@@ -36,6 +37,11 @@ public class BlockTNT extends Block {
2019-05-05 04:23:25 +02:00
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())) {
if (world.isBlockIndirectlyPowered(blockposition)) {
+ // Paper start - TNTPrimeEvent
+ org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, blockposition);;
+ 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);
}
@@ -46,6 +52,11 @@ public class BlockTNT extends Block {
2019-05-05 04:23:25 +02:00
@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
+ org.bukkit.block.Block tntBlock = net.minecraft.server.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
}
@@ -64,6 +75,12 @@ public class BlockTNT extends Block {
2019-05-05 04:23:25 +02:00
@Override
2018-07-15 23:06:26 +02:00
public void wasExploded(World world, BlockPosition blockposition, Explosion explosion) {
if (!world.isClientSide) {
+ // Paper start - TNTPrimeEvent
+ org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, blockposition);
+ 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));
@@ -92,6 +109,11 @@ public class BlockTNT extends Block {
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);
} else {
2018-07-15 23:06:26 +02:00
+ // Paper start - TNTPrimeEvent
+ org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, blockposition);
+ 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);
if (!entityhuman.isCreative()) {
@@ -121,6 +143,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
+ org.bukkit.block.Block tntBlock = net.minecraft.server.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-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
}