blob: 940ded50a67c7fae1690b079fd48b715dfb7c3e7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
--- /home/matt/mc-dev-private//net/minecraft/server/EntityMonster.java 2015-02-26 22:40:22.635608139 +0000
+++ src/main/java/net/minecraft/server/EntityMonster.java 2015-02-26 22:40:22.635608139 +0000
@@ -1,5 +1,7 @@
package net.minecraft.server;
+import org.bukkit.event.entity.EntityCombustByEntityEvent; // CraftBukkit
+
public abstract class EntityMonster extends EntityCreature implements IMonster {
public EntityMonster(World world) {
@@ -79,7 +81,14 @@
int j = EnchantmentManager.getFireAspectEnchantmentLevel(this);
if (j > 0) {
- entity.setOnFire(j * 4);
+ // CraftBukkit start - Call a combust event when somebody hits with a fire enchanted item
+ EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), j * 4);
+ org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent);
+
+ if (!combustEvent.isCancelled()) {
+ entity.setOnFire(combustEvent.getDuration());
+ }
+ // CraftBukkit end
}
this.a((EntityLiving) this, entity);
|
