54 lines
2.6 KiB
Diff
54 lines
2.6 KiB
Diff
--- a/net/minecraft/world/entity/item/EntityTNTPrimed.java
|
|
+++ b/net/minecraft/world/entity/item/EntityTNTPrimed.java
|
|
@@ -29,6 +29,12 @@
|
|
import net.minecraft.world.level.material.Fluid;
|
|
import net.minecraft.world.level.portal.TeleportTransition;
|
|
|
|
+// CraftBukkit start;
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
|
+import org.bukkit.event.entity.ExplosionPrimeEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntityTNTPrimed extends Entity implements TraceableEntity {
|
|
|
|
private static final DataWatcherObject<Integer> DATA_FUSE_ID = DataWatcher.<Integer>defineId(EntityTNTPrimed.class, DataWatcherRegistry.INT);
|
|
@@ -54,6 +60,7 @@
|
|
public EntityLiving owner;
|
|
private boolean usedPortal;
|
|
public float explosionPower;
|
|
+ public boolean isIncendiary = false; // CraftBukkit - add field
|
|
|
|
public EntityTNTPrimed(EntityTypes<? extends EntityTNTPrimed> entitytypes, World world) {
|
|
super(entitytypes, world);
|
|
@@ -110,10 +117,13 @@
|
|
|
|
this.setFuse(i);
|
|
if (i <= 0) {
|
|
- this.discard();
|
|
+ // CraftBukkit start - Need to reverse the order of the explosion and the entity death so we have a location for the event
|
|
+ // this.discard();
|
|
if (!this.level().isClientSide) {
|
|
this.explode();
|
|
}
|
|
+ this.discard(EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
|
|
+ // CraftBukkit end
|
|
} else {
|
|
this.updateInWaterStateAndDoFluidPushing();
|
|
if (this.level().isClientSide) {
|
|
@@ -128,7 +138,13 @@
|
|
|
|
if (world instanceof WorldServer worldserver) {
|
|
if (worldserver.getGameRules().getBoolean(GameRules.RULE_TNT_EXPLODES)) {
|
|
- this.level().explode(this, Explosion.getDefaultDamageSource(this.level(), this), this.usedPortal ? EntityTNTPrimed.USED_PORTAL_DAMAGE_CALCULATOR : null, this.getX(), this.getY(0.0625D), this.getZ(), this.explosionPower, false, World.a.TNT);
|
|
+ // CraftBukkit start
|
|
+ ExplosionPrimeEvent event = CraftEventFactory.callExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
|
|
+ if (event.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ this.level().explode(this, Explosion.getDefaultDamageSource(this.level(), this), this.usedPortal ? EntityTNTPrimed.USED_PORTAL_DAMAGE_CALCULATOR : null, this.getX(), this.getY(0.0625D), this.getZ(), event.getRadius(), event.getFire(), World.a.TNT);
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|