2015-05-25 12:37:24 +02:00
|
|
|
--- a/net/minecraft/server/EntitySmallFireball.java
|
|
|
|
|
+++ b/net/minecraft/server/EntitySmallFireball.java
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -1,5 +1,7 @@
|
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
|
|
+import org.bukkit.event.entity.EntityCombustByEntityEvent; // CraftBukkit
|
|
|
|
|
+
|
|
|
|
|
public class EntitySmallFireball extends EntityFireball {
|
|
|
|
|
|
|
|
|
|
public EntitySmallFireball(World world) {
|
|
|
|
|
@@ -26,7 +28,14 @@
|
|
|
|
|
if (flag) {
|
|
|
|
|
this.a(this.shooter, movingobjectposition.entity);
|
|
|
|
|
if (!movingobjectposition.entity.isFireProof()) {
|
|
|
|
|
- movingobjectposition.entity.setOnFire(5);
|
|
|
|
|
+ // CraftBukkit start - Entity damage by entity event + combust event
|
|
|
|
|
+ EntityCombustByEntityEvent event = new EntityCombustByEntityEvent((org.bukkit.entity.Projectile) this.getBukkitEntity(), movingobjectposition.entity.getBukkitEntity(), 5);
|
|
|
|
|
+ movingobjectposition.entity.world.getServer().getPluginManager().callEvent(event);
|
|
|
|
|
+
|
|
|
|
|
+ if (!event.isCancelled()) {
|
|
|
|
|
+ movingobjectposition.entity.setOnFire(event.getDuration());
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
@@ -39,7 +48,11 @@
|
|
|
|
|
BlockPosition blockposition = movingobjectposition.a().shift(movingobjectposition.direction);
|
|
|
|
|
|
|
|
|
|
if (this.world.isEmpty(blockposition)) {
|
|
|
|
|
- this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
|
|
|
|
|
+ // CraftBukkit start
|
2015-02-02 23:01:05 +01:00
|
|
|
+ if (isIncendiary && !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this).isCancelled()) {
|
2014-11-25 22:32:16 +01:00
|
|
|
+ this.world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
