From 24557bc2b37deb6a0edf497d547471832457b1dd Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Wed, 26 Nov 2014 08:32:16 +1100
Subject: Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/
---
 nms-patches/EntityMonster.patch | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 nms-patches/EntityMonster.patch

(limited to 'nms-patches/EntityMonster.patch')

diff --git a/nms-patches/EntityMonster.patch b/nms-patches/EntityMonster.patch
new file mode 100644
index 00000000..f5500fac
--- /dev/null
+++ b/nms-patches/EntityMonster.patch
@@ -0,0 +1,26 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/EntityMonster.java	2014-11-27 08:59:46.709421812 +1100
++++ src/main/java/net/minecraft/server/EntityMonster.java	2014-11-27 08:42:10.164850887 +1100
+@@ -1,5 +1,7 @@
+ package net.minecraft.server;
+ 
++import org.bukkit.event.entity.EntityCombustByEntityEvent; // CraftBukkit
++
+ public abstract class EntityMonster extends EntityCreature implements IMonster {
+ 
+     protected final PathfinderGoal a = new PathfinderGoalAvoidTarget(this, new EntitySelectorExplodingCreeper(this), 4.0F, 1.0D, 2.0D);
+@@ -81,7 +83,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);
-- 
cgit v1.2.3