testserver/patches/server/0233-Add-TNTPrimeEvent.patch

114 lines
7.1 KiB
Diff
Raw Normal View History

2021-06-11 12:02:28 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
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/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
2022-06-07 21:45:11 +00:00
index dc2e57bfc5e85c9ef548cb895b3fcd1c09c4dacb..21d26be5edbc05ac78c2f4a092594d772d98c982 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
2022-06-07 21:45:11 +00:00
@@ -532,6 +532,11 @@ public class EnderDragon extends Mob implements Enemy {
2021-06-11 12:02:28 +00:00
});
2022-06-07 21:45:11 +00:00
craftBlock.getNMS().spawnAfterBreak((ServerLevel) level, blockposition, ItemStack.EMPTY, false);
2021-06-11 12:02:28 +00:00
}
+ // Paper start - TNTPrimeEvent
+ org.bukkit.block.Block tntBlock = level.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
2021-06-12 23:45:00 +00:00
+ if(!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.EXPLOSION, explosionSource.getSourceMob().getBukkitEntity()).callEvent())
2021-06-11 12:02:28 +00:00
+ continue;
+ // Paper end
nmsBlock.wasExploded(level, blockposition, explosionSource);
this.level.removeBlock(blockposition, false);
diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java
2022-06-07 21:45:11 +00:00
index 037902b3addd34dfc6b751ca225373a06c2d6a89..2188cfc34ab4bd67fac9aedd861a597c137a5c40 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/level/block/FireBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java
2022-06-07 21:45:11 +00:00
@@ -290,12 +290,19 @@ public class FireBlock extends BaseFireBlock {
2021-06-11 12:02:28 +00:00
world.setBlock(blockposition, this.getStateWithAge(world, blockposition, l), 3);
} else {
- world.removeBlock(blockposition, false);
+ if(iblockdata.getBlock() != Blocks.TNT) world.removeBlock(blockposition, false); // Paper - TNTPrimeEvent - We might be cancelling it below, move the setAir down
}
Block block = iblockdata.getBlock();
2022-06-07 21:45:11 +00:00
if (block instanceof TntBlock) {
2021-06-11 12:02:28 +00:00
+ // Paper start - TNTPrimeEvent
2021-06-12 23:45:00 +00:00
+ org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, blockposition);
+ if (!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.FIRE, null).callEvent()) {
2021-06-11 12:02:28 +00:00
+ return;
+ }
2021-06-17 21:39:36 +00:00
+ world.removeBlock(blockposition, false);
2021-06-11 12:02:28 +00:00
+ // Paper end
TntBlock.explode(world, blockposition);
}
}
diff --git a/src/main/java/net/minecraft/world/level/block/TntBlock.java b/src/main/java/net/minecraft/world/level/block/TntBlock.java
2022-06-07 21:45:11 +00:00
index 9fcad0eb55a4a91a89ab8bce1f22d91127a94fb2..355448a08cca780f4f0b95e2abcdc87eb61de6dc 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/level/block/TntBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/TntBlock.java
2021-06-12 23:45:00 +00:00
@@ -38,6 +38,11 @@ public class TntBlock extends Block {
2021-06-11 12:02:28 +00:00
public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify) {
if (!oldState.is(state.getBlock())) {
if (world.hasNeighborSignal(pos)) {
+ // Paper start - TNTPrimeEvent
+ org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, pos);;
2021-06-12 23:45:00 +00:00
+ if(!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent())
2021-06-11 12:02:28 +00:00
+ return;
+ // Paper end
2021-06-12 23:45:00 +00:00
TntBlock.explode(world, pos);
2021-06-11 12:02:28 +00:00
world.removeBlock(pos, false);
}
2021-06-12 23:45:00 +00:00
@@ -48,6 +53,11 @@ public class TntBlock extends Block {
2021-06-11 12:02:28 +00:00
@Override
2022-06-07 21:45:11 +00:00
public void neighborChanged(BlockState state, Level world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) {
2021-06-11 12:02:28 +00:00
if (world.hasNeighborSignal(pos)) {
+ // Paper start - TNTPrimeEvent
+ org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, pos);;
2021-06-12 23:45:00 +00:00
+ if(!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent())
2021-06-11 12:02:28 +00:00
+ return;
+ // Paper end
2021-06-12 23:45:00 +00:00
TntBlock.explode(world, pos);
2021-06-11 12:02:28 +00:00
world.removeBlock(pos, false);
}
2021-06-12 23:45:00 +00:00
@@ -66,6 +76,12 @@ public class TntBlock extends Block {
2021-06-11 12:02:28 +00:00
@Override
public void wasExploded(Level world, BlockPos pos, Explosion explosion) {
if (!world.isClientSide) {
+ // Paper start - TNTPrimeEvent
+ org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, pos);
+ org.bukkit.entity.Entity source = explosion.source != null ? explosion.source.getBukkitEntity() : null;
2021-06-12 23:45:00 +00:00
+ if(!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.EXPLOSION, source).callEvent())
2021-06-11 12:02:28 +00:00
+ return;
+ // Paper end
PrimedTnt entitytntprimed = new PrimedTnt(world, (double) pos.getX() + 0.5D, (double) pos.getY(), (double) pos.getZ() + 0.5D, explosion.getSourceMob());
2021-06-12 23:45:00 +00:00
int i = entitytntprimed.getFuse();
2021-06-11 12:02:28 +00:00
2021-06-12 23:45:00 +00:00
@@ -95,6 +111,11 @@ public class TntBlock extends Block {
if (!itemstack.is(Items.FLINT_AND_STEEL) && !itemstack.is(Items.FIRE_CHARGE)) {
2021-06-11 12:02:28 +00:00
return super.use(state, world, pos, player, hand, hit);
} else {
+ // Paper start - TNTPrimeEvent
+ org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, pos);
2021-06-12 23:45:00 +00:00
+ if(!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.ITEM, player.getBukkitEntity()).callEvent())
2021-06-11 12:02:28 +00:00
+ return InteractionResult.FAIL;
+ // Paper end
2021-11-23 15:04:41 +00:00
TntBlock.explode(world, pos, player);
2021-06-11 12:02:28 +00:00
world.setBlock(pos, Blocks.AIR.defaultBlockState(), 11);
2021-06-12 23:45:00 +00:00
Item item = itemstack.getItem();
@@ -126,6 +147,12 @@ public class TntBlock extends Block {
return;
2021-06-11 12:02:28 +00:00
}
// CraftBukkit end
+ // Paper start - TNTPrimeEvent
+ org.bukkit.block.Block tntBlock = net.minecraft.server.MCUtil.toBukkitBlock(world, blockposition);
2021-06-12 23:45:00 +00:00
+ if (!new com.destroystokyo.paper.event.block.TNTPrimeEvent(tntBlock, com.destroystokyo.paper.event.block.TNTPrimeEvent.PrimeReason.PROJECTILE, projectile.getBukkitEntity()).callEvent()) {
2021-06-11 12:02:28 +00:00
+ return;
+ }
+ // Paper end
2021-06-12 23:45:00 +00:00
TntBlock.explode(world, blockposition, entity instanceof LivingEntity ? (LivingEntity) entity : null);
2021-06-11 12:02:28 +00:00
world.removeBlock(blockposition, false);
}