craftbukkit/nms-patches/net/minecraft/world/entity/projectile/EntityFireball.patch

39 lines
1.7 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/entity/projectile/EntityFireball.java
+++ b/net/minecraft/world/entity/projectile/EntityFireball.java
@@ -18,11 +18,17 @@
2021-03-16 09:00:00 +11:00
import net.minecraft.world.phys.MovingObjectPosition;
import net.minecraft.world.phys.Vec3D;
+// CraftBukkit start
+import org.bukkit.event.entity.EntityRemoveEvent;
+// CraftBukkit end
+
2020-06-25 10:00:00 +10:00
public abstract class EntityFireball extends IProjectile {
2024-06-14 01:05:00 +10:00
public static final double INITAL_ACCELERATION_POWER = 0.1D;
public static final double DEFLECTION_SCALE = 0.5D;
public double accelerationPower;
+ public float bukkitYield = 1; // CraftBukkit
+ public boolean isIncendiary = true; // CraftBukkit
2019-04-23 12:00:00 +10:00
protected EntityFireball(EntityTypes<? extends EntityFireball> entitytypes, World world) {
2018-07-15 10:00:00 +10:00
super(entitytypes, world);
@@ -71,7 +77,7 @@
Entity entity = this.getOwner();
if (!this.level().isClientSide && (entity != null && entity.isRemoved() || !this.level().hasChunkAt(this.blockPosition()))) {
- this.discard();
+ this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
} else {
super.tick();
if (this.shouldBurn()) {
@@ -81,7 +87,7 @@
2023-12-06 03:40:00 +11:00
MovingObjectPosition movingobjectposition = ProjectileHelper.getHitResultOnMoveVector(this, this::canHitEntity, this.getClipType());
2019-04-23 12:00:00 +10:00
if (movingobjectposition.getType() != MovingObjectPosition.EnumMovingObjectType.MISS) {
2024-04-24 01:15:00 +10:00
- this.hitTargetOrDeflectSelf(movingobjectposition);
+ this.preHitTargetOrDeflectSelf(movingobjectposition); // CraftBukkit - projectile hit event
}
2021-11-22 09:00:00 +11:00
this.checkInsideBlocks();