2021-03-15 23:00:00 +01:00
|
|
|
--- a/net/minecraft/world/entity/projectile/EntitySmallFireball.java
|
|
|
|
+++ b/net/minecraft/world/entity/projectile/EntitySmallFireball.java
|
|
|
|
@@ -14,6 +14,8 @@
|
|
|
|
import net.minecraft.world.phys.MovingObjectPositionBlock;
|
|
|
|
import net.minecraft.world.phys.MovingObjectPositionEntity;
|
2014-11-25 22:32:16 +01:00
|
|
|
|
|
|
|
+import org.bukkit.event.entity.EntityCombustByEntityEvent; // CraftBukkit
|
|
|
|
+
|
2019-04-23 04:00:00 +02:00
|
|
|
public class EntitySmallFireball extends EntityFireballFireball {
|
2014-11-25 22:32:16 +01:00
|
|
|
|
2019-04-23 04:00:00 +02:00
|
|
|
public EntitySmallFireball(EntityTypes<? extends EntitySmallFireball> entitytypes, World world) {
|
2021-03-15 23:00:00 +01:00
|
|
|
@@ -22,6 +24,11 @@
|
2018-07-15 02:00:00 +02:00
|
|
|
|
2017-03-15 05:26:36 +01:00
|
|
|
public EntitySmallFireball(World world, EntityLiving entityliving, double d0, double d1, double d2) {
|
2019-04-23 04:00:00 +02:00
|
|
|
super(EntityTypes.SMALL_FIREBALL, entityliving, d0, d1, d2, world);
|
2017-03-15 05:26:36 +01:00
|
|
|
+ // CraftBukkit start
|
2020-06-25 02:00:00 +02:00
|
|
|
+ if (this.getShooter() != null && this.getShooter() instanceof EntityInsentient) {
|
2021-06-11 07:00:00 +02:00
|
|
|
+ isIncendiary = this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING);
|
2017-03-15 05:26:36 +01:00
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
}
|
|
|
|
|
|
|
|
public EntitySmallFireball(World world, double d0, double d1, double d2, double d3, double d4, double d5) {
|
2021-03-15 23:00:00 +01:00
|
|
|
@@ -38,7 +45,14 @@
|
2020-06-25 02:00:00 +02:00
|
|
|
Entity entity1 = this.getShooter();
|
|
|
|
int i = entity.getFireTicks();
|
|
|
|
|
|
|
|
- entity.setOnFire(5);
|
|
|
|
+ // CraftBukkit start - Entity damage by entity event + combust event
|
2020-10-23 09:29:08 +02:00
|
|
|
+ EntityCombustByEntityEvent event = new EntityCombustByEntityEvent((org.bukkit.entity.Projectile) this.getBukkitEntity(), entity.getBukkitEntity(), 5);
|
2021-06-11 07:00:00 +02:00
|
|
|
+ entity.level.getServer().getPluginManager().callEvent(event);
|
2014-11-25 22:32:16 +01:00
|
|
|
+
|
2020-10-23 09:29:08 +02:00
|
|
|
+ if (!event.isCancelled()) {
|
|
|
|
+ entity.setOnFire(event.getDuration(), false);
|
2020-06-25 02:00:00 +02:00
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
boolean flag = entity.damageEntity(DamageSource.fireball(this, entity1), 5.0F);
|
2019-04-23 04:00:00 +02:00
|
|
|
|
2020-06-25 02:00:00 +02:00
|
|
|
if (!flag) {
|
2021-03-15 23:00:00 +01:00
|
|
|
@@ -57,10 +71,10 @@
|
2021-06-11 07:00:00 +02:00
|
|
|
if (!this.level.isClientSide) {
|
2020-06-25 02:00:00 +02:00
|
|
|
Entity entity = this.getShooter();
|
|
|
|
|
2021-06-11 07:00:00 +02:00
|
|
|
- if (!(entity instanceof EntityInsentient) || this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) {
|
2020-06-25 02:00:00 +02:00
|
|
|
+ if (isIncendiary) { // CraftBukkit
|
2019-04-23 04:00:00 +02:00
|
|
|
BlockPosition blockposition = movingobjectpositionblock.getBlockPosition().shift(movingobjectpositionblock.getDirection());
|
2017-03-15 05:26:36 +01:00
|
|
|
|
2021-06-11 07:00:00 +02:00
|
|
|
- if (this.level.isEmpty(blockposition)) {
|
|
|
|
+ if (this.level.isEmpty(blockposition) && !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(level, blockposition, this).isCancelled()) { // CraftBukkit
|
|
|
|
this.level.setTypeUpdate(blockposition, BlockFireAbstract.a((IBlockAccess) this.level, blockposition));
|
2014-11-25 22:32:16 +01:00
|
|
|
}
|
|
|
|
}
|