mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-10 12:02:36 +01:00
eed041d629
By: md_5 <git@md-5.net>
56 lines
2.5 KiB
Diff
56 lines
2.5 KiB
Diff
--- a/net/minecraft/world/entity/projectile/EntityLargeFireball.java
|
|
+++ b/net/minecraft/world/entity/projectile/EntityLargeFireball.java
|
|
@@ -13,17 +13,24 @@
|
|
import net.minecraft.world.phys.MovingObjectPositionEntity;
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.event.entity.EntityRemoveEvent;
|
|
+import org.bukkit.event.entity.ExplosionPrimeEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntityLargeFireball extends EntityFireballFireball {
|
|
|
|
public int explosionPower = 1;
|
|
|
|
public EntityLargeFireball(EntityTypes<? extends EntityLargeFireball> entitytypes, World world) {
|
|
super(entitytypes, world);
|
|
+ isIncendiary = this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit
|
|
}
|
|
|
|
public EntityLargeFireball(World world, EntityLiving entityliving, Vec3D vec3d, int i) {
|
|
super(EntityTypes.FIREBALL, entityliving, vec3d, world);
|
|
this.explosionPower = i;
|
|
+ isIncendiary = this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING); // CraftBukkit
|
|
}
|
|
|
|
@Override
|
|
@@ -32,8 +39,16 @@
|
|
if (!this.level().isClientSide) {
|
|
boolean flag = this.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
|
|
|
|
- this.level().explode(this, this.getX(), this.getY(), this.getZ(), (float) this.explosionPower, flag, World.a.MOB);
|
|
- this.discard();
|
|
+ // CraftBukkit start - fire ExplosionPrimeEvent
|
|
+ ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
|
|
+ this.level().getCraftServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ if (!event.isCancelled()) {
|
|
+ // give 'this' instead of (Entity) null so we know what causes the damage
|
|
+ this.level().explode(this, this.getX(), this.getY(), this.getZ(), event.getRadius(), event.getFire(), World.a.MOB);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+ this.discard(EntityRemoveEvent.Cause.HIT); // CraftBukkit - add Bukkit remove cause
|
|
}
|
|
|
|
}
|
|
@@ -63,7 +78,8 @@
|
|
public void readAdditionalSaveData(NBTTagCompound nbttagcompound) {
|
|
super.readAdditionalSaveData(nbttagcompound);
|
|
if (nbttagcompound.contains("ExplosionPower", 99)) {
|
|
- this.explosionPower = nbttagcompound.getByte("ExplosionPower");
|
|
+ // CraftBukkit - set bukkitYield when setting explosionpower
|
|
+ bukkitYield = this.explosionPower = nbttagcompound.getByte("ExplosionPower");
|
|
}
|
|
|
|
}
|