mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 02:10:30 +01:00
Merge pull request #1214
b854308c Add TNTPrimeEvent (Mark Vainomaa)
* pull/1214/head:
Add TNTPrimeEventThis commit is contained in:
Aikar
commit
4be4037e3d
123
Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch
Normal file
123
Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
From c816abc8a84fbbd722a1149988a426854c2daaaa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
|
||||||
|
Date: Sun, 15 Jul 2018 22:17:55 +0300
|
||||||
|
Subject: [PATCH] Add TNTPrimeEvent
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
|
||||||
|
new file mode 100644
|
||||||
|
index 000000000..4f8d5d2db
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java
|
||||||
|
@@ -0,0 +1,108 @@
|
||||||
|
+package com.destroystokyo.paper.event.block;
|
||||||
|
+
|
||||||
|
+import org.bukkit.block.Block;
|
||||||
|
+import org.bukkit.entity.Entity;
|
||||||
|
+import org.bukkit.event.Cancellable;
|
||||||
|
+import org.bukkit.event.HandlerList;
|
||||||
|
+import org.bukkit.event.block.BlockEvent;
|
||||||
|
+
|
||||||
|
+/**
|
||||||
|
+ * Called when TNT block is about to turn into {@link org.bukkit.entity.TNTPrimed}
|
||||||
|
+ * <p>
|
||||||
|
+ * Cancelling it won't turn TNT into {@link org.bukkit.entity.TNTPrimed} and leaves
|
||||||
|
+ * the TNT block as-is
|
||||||
|
+ *
|
||||||
|
+ * @author Mark Vainomaa
|
||||||
|
+ */
|
||||||
|
+public class TNTPrimeEvent extends BlockEvent implements Cancellable {
|
||||||
|
+ private static final HandlerList handlers = new HandlerList();
|
||||||
|
+ private boolean cancelled;
|
||||||
|
+ private PrimeReason reason;
|
||||||
|
+ private Entity primerEntity;
|
||||||
|
+
|
||||||
|
+ public TNTPrimeEvent(Block theBlock, PrimeReason reason, Entity primerEntity) {
|
||||||
|
+ super(theBlock);
|
||||||
|
+ this.reason = reason;
|
||||||
|
+ this.primerEntity = primerEntity;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the TNT prime reason
|
||||||
|
+ *
|
||||||
|
+ * @return Prime reason
|
||||||
|
+ */
|
||||||
|
+ public PrimeReason getReason() {
|
||||||
|
+ return this.reason;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets the TNT primer {@link Entity}.
|
||||||
|
+ *
|
||||||
|
+ * It's null if {@link #getReason()} is {@link PrimeReason#REDSTONE} or {@link PrimeReason#FIRE}.
|
||||||
|
+ * It's not null if {@link #getReason()} is {@link PrimeReason#ITEM} or {@link PrimeReason#PROJECTILE}
|
||||||
|
+ * It might be null if {@link #getReason()} is {@link PrimeReason#EXPLOSION}
|
||||||
|
+ *
|
||||||
|
+ * @return The {@link Entity} who primed the TNT
|
||||||
|
+ */
|
||||||
|
+ public Entity getPrimerEntity() {
|
||||||
|
+ return this.primerEntity;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Gets whether spawning {@link org.bukkit.entity.TNTPrimed} should be cancelled or not
|
||||||
|
+ *
|
||||||
|
+ * @return Whether spawning {@link org.bukkit.entity.TNTPrimed} should be cancelled or not
|
||||||
|
+ */
|
||||||
|
+ @Override
|
||||||
|
+ public boolean isCancelled() {
|
||||||
|
+ return this.cancelled;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * Sets whether to cancel spawning {@link org.bukkit.entity.TNTPrimed} or not
|
||||||
|
+ *
|
||||||
|
+ * @param cancel whether spawning {@link org.bukkit.entity.TNTPrimed} should be cancelled or not
|
||||||
|
+ */
|
||||||
|
+ @Override
|
||||||
|
+ public void setCancelled(boolean cancel) {
|
||||||
|
+ this.cancelled = cancel;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ @Override
|
||||||
|
+ public HandlerList getHandlers() {
|
||||||
|
+ return handlers;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public static HandlerList getHandlerList() {
|
||||||
|
+ return handlers;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public enum PrimeReason {
|
||||||
|
+ /**
|
||||||
|
+ * When TNT prime was caused by other explosion (chain reaction)
|
||||||
|
+ */
|
||||||
|
+ EXPLOSION,
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * When TNT prime was caused by fire
|
||||||
|
+ */
|
||||||
|
+ FIRE,
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * When {@link org.bukkit.entity.Player} used {@link org.bukkit.Material#FLINT_AND_STEEL} or
|
||||||
|
+ * {@link org.bukkit.Material#FIREBALL} on given TNT block
|
||||||
|
+ */
|
||||||
|
+ ITEM,
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * When TNT prime was caused by an {@link Entity} shooting TNT
|
||||||
|
+ * using a bow with {@link org.bukkit.enchantments.Enchantment#ARROW_FIRE} enchantment
|
||||||
|
+ */
|
||||||
|
+ PROJECTILE,
|
||||||
|
+
|
||||||
|
+ /**
|
||||||
|
+ * When redstone power triggered the TNT prime
|
||||||
|
+ */
|
||||||
|
+ REDSTONE
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
--
|
||||||
|
2.18.0
|
||||||
|
|
||||||
138
Spigot-Server-Patches/0326-Add-TNTPrimeEvent.patch
Normal file
138
Spigot-Server-Patches/0326-Add-TNTPrimeEvent.patch
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
From ee6a88abd75b0cbca05989c5489a83a55f278774 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/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
|
||||||
|
index 25a8a1afdf..108006d580 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;
|
||||||
|
@@ -234,12 +235,18 @@ public class BlockFire extends Block {
|
||||||
|
|
||||||
|
world.setTypeAndData(blockposition, (IBlockData) this.a((IBlockAccess) world, blockposition).set(BlockFire.AGE, Integer.valueOf(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 = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
||||||
|
+ 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 0c48a0cfe6..c3eeee2634 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 {
|
||||||
|
|
||||||
|
@@ -11,6 +12,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 = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
||||||
|
+ if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent())
|
||||||
|
+ return;
|
||||||
|
+ // Paper end
|
||||||
|
this.a(world, blockposition);
|
||||||
|
world.setAir(blockposition);
|
||||||
|
}
|
||||||
|
@@ -20,6 +26,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 = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
||||||
|
+ if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.REDSTONE, null).callEvent())
|
||||||
|
+ return;
|
||||||
|
+ // Paper end
|
||||||
|
this.a(world, blockposition);
|
||||||
|
world.setAir(blockposition);
|
||||||
|
}
|
||||||
|
@@ -28,6 +39,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 = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
||||||
|
+ 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));
|
||||||
|
@@ -55,6 +72,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 = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
||||||
|
+ 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) {
|
||||||
|
@@ -77,6 +99,11 @@ public class BlockTNT extends Block {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// CraftBukkit end
|
||||||
|
+ // Paper start - TNTPrimeEvent
|
||||||
|
+ org.bukkit.block.Block tntBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
||||||
|
+ if(!new TNTPrimeEvent(tntBlock, TNTPrimeEvent.PrimeReason.PROJECTILE, entityarrow.bukkitEntity).callEvent())
|
||||||
|
+ return;
|
||||||
|
+ // Paper end
|
||||||
|
this.a(world, blockposition, entityarrow.shooter instanceof EntityLiving ? (EntityLiving) entityarrow.shooter : 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 d8ab87e216..d5e2a02516 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.18.0
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user