craftbukkit/nms-patches/net/minecraft/world/entity/item/EntityTNTPrimed.patch

57 lines
2.2 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/entity/item/EntityTNTPrimed.java
+++ b/net/minecraft/world/entity/item/EntityTNTPrimed.java
2024-04-24 01:15:00 +10:00
@@ -17,6 +17,12 @@
2023-12-06 03:40:00 +11:00
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.IBlockData;
2016-11-17 12:41:03 +11:00
2023-06-24 17:15:05 +10:00
+// CraftBukkit start;
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.event.entity.EntityRemoveEvent;
2023-06-24 17:15:05 +10:00
+import org.bukkit.event.entity.ExplosionPrimeEvent;
+// CraftBukkit end
2021-03-09 08:47:33 +11:00
+
2023-03-15 03:30:00 +11:00
public class EntityTNTPrimed extends Entity implements TraceableEntity {
2021-11-22 09:00:00 +11:00
private static final DataWatcherObject<Integer> DATA_FUSE_ID = DataWatcher.defineId(EntityTNTPrimed.class, DataWatcherRegistry.INT);
2024-04-24 01:15:00 +10:00
@@ -26,6 +32,8 @@
2023-12-06 03:40:00 +11:00
public static final String TAG_FUSE = "fuse";
2016-11-17 12:41:03 +11:00
@Nullable
2021-06-11 15:00:00 +10:00
public EntityLiving owner;
+ public float yield = 4; // CraftBukkit - add field
+ public boolean isIncendiary = false; // CraftBukkit - add field
2019-04-23 12:00:00 +10:00
public EntityTNTPrimed(EntityTypes<? extends EntityTNTPrimed> entitytypes, World world) {
super(entitytypes, world);
@@ -79,10 +87,13 @@
2021-11-22 09:00:00 +11:00
this.setFuse(i);
2021-06-11 15:00:00 +10:00
if (i <= 0) {
2021-11-22 09:00:00 +11:00
- this.discard();
+ // CraftBukkit start - Need to reverse the order of the explosion and the entity death so we have a location for the event
2021-11-22 09:00:00 +11:00
+ // this.discard();
2023-06-08 01:30:00 +10:00
if (!this.level().isClientSide) {
this.explode();
}
+ this.discard(EntityRemoveEvent.Cause.EXPLODE); // CraftBukkit - add Bukkit remove cause
+ // CraftBukkit end
} else {
2021-11-22 09:00:00 +11:00
this.updateInWaterStateAndDoFluidPushing();
2023-06-08 01:30:00 +10:00
if (this.level().isClientSide) {
@@ -93,9 +104,14 @@
}
private void explode() {
- float f = 4.0F;
+ // CraftBukkit start
+ // float f = 4.0F;
2023-06-24 17:15:05 +10:00
+ ExplosionPrimeEvent event = CraftEventFactory.callExplosionPrimeEvent((org.bukkit.entity.Explosive)this.getBukkitEntity());
2015-02-26 22:41:06 +00:00
2023-06-08 01:30:00 +10:00
- this.level().explode(this, this.getX(), this.getY(0.0625D), this.getZ(), 4.0F, World.a.TNT);
+ if (!event.isCancelled()) {
2023-06-08 01:30:00 +10:00
+ this.level().explode(this, this.getX(), this.getY(0.0625D), this.getZ(), event.getRadius(), event.getFire(), World.a.TNT);
+ }
+ // CraftBukkit end
}
2019-04-23 12:00:00 +10:00
@Override