39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
--- a/net/minecraft/world/entity/projectile/EntityFireball.java
|
|
+++ b/net/minecraft/world/entity/projectile/EntityFireball.java
|
|
@@ -15,11 +15,17 @@
|
|
import net.minecraft.world.phys.MovingObjectPosition;
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public abstract class EntityFireball extends IProjectile {
|
|
|
|
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
|
|
|
|
protected EntityFireball(EntityTypes<? extends EntityFireball> entitytypes, World world) {
|
|
super(entitytypes, world);
|
|
@@ -69,7 +75,7 @@
|
|
|
|
this.applyInertia();
|
|
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 {
|
|
MovingObjectPosition movingobjectposition = ProjectileHelper.getHitResultOnMoveVector(this, this::canHitEntity, this.getClipType());
|
|
Vec3D vec3d;
|
|
@@ -89,7 +95,7 @@
|
|
}
|
|
|
|
if (movingobjectposition.getType() != MovingObjectPosition.EnumMovingObjectType.MISS && this.isAlive()) {
|
|
- this.hitTargetOrDeflectSelf(movingobjectposition);
|
|
+ this.preHitTargetOrDeflectSelf(movingobjectposition); // CraftBukkit - projectile hit event
|
|
}
|
|
|
|
this.createParticleTrail();
|