Paper/nms-patches/EntitySmallFireball.patch

54 lines
2.6 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntitySmallFireball.java
+++ b/net/minecraft/server/EntitySmallFireball.java
@@ -1,5 +1,7 @@
package net.minecraft.server;
+import org.bukkit.event.entity.EntityCombustByEntityEvent; // CraftBukkit
+
2019-04-23 04:00:00 +02:00
public class EntitySmallFireball extends EntityFireballFireball {
2019-04-23 04:00:00 +02:00
public EntitySmallFireball(EntityTypes<? extends EntitySmallFireball> entitytypes, World world) {
2018-07-15 02:00:00 +02:00
@@ -8,6 +10,11 @@
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);
+ // CraftBukkit start
2020-06-25 02:00:00 +02:00
+ if (this.getShooter() != null && this.getShooter() instanceof EntityInsentient) {
2019-06-21 12:00:00 +02:00
+ isIncendiary = this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING);
+ }
+ // CraftBukkit end
}
public EntitySmallFireball(World world, double d0, double d1, double d2, double d3, double d4, double d5) {
2019-12-10 23:00:00 +01:00
@@ -24,7 +31,16 @@
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
+ if (isIncendiary) {
+ EntityCombustByEntityEvent event = new EntityCombustByEntityEvent((org.bukkit.entity.Projectile) this.getBukkitEntity(), entity.getBukkitEntity(), 5);
+ entity.world.getServer().getPluginManager().callEvent(event);
+
2020-06-25 02:00:00 +02:00
+ if (!event.isCancelled()) {
+ entity.setOnFire(event.getDuration(), false);
2018-08-26 04:00:00 +02:00
+ }
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) {
@@ -43,10 +59,10 @@
if (!this.world.isClientSide) {
Entity entity = this.getShooter();
- if (entity == null || !(entity instanceof EntityInsentient) || this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING)) {
+ if (isIncendiary) { // CraftBukkit
2019-04-23 04:00:00 +02:00
BlockPosition blockposition = movingobjectpositionblock.getBlockPosition().shift(movingobjectpositionblock.getDirection());
2019-04-23 04:00:00 +02:00
- if (this.world.isEmpty(blockposition)) {
+ if (this.world.isEmpty(blockposition) && !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition, this).isCancelled()) { // CraftBukkit
2020-06-25 02:00:00 +02:00
this.world.setTypeUpdate(blockposition, BlockFireAbstract.a((IBlockAccess) this.world, blockposition));
}
}