Fire EntityCombustEvent for phantoms (#1573)

PaperMC · Oct 18, 2018 · 4168fa1 · 4168fa1
1 parent 00f0a30
commit 4168fa1
Showing 1 changed file with 27 additions and 0 deletions.
diff --git a/Spigot-Server-Patches/0393-Fire-EntityCombustEvent-for-phantoms.patch b/Spigot-Server-Patches/0393-Fire-EntityCombustEvent-for-phantoms.patch
@@ -0,0 +1,27 @@
+From 980e9589410d0a4d9d86816a663000875609d05c Mon Sep 17 00:00:00 2001
+From: Brokkonaut <hannos17@gmx.de>
+Date: Sat, 13 Oct 2018 22:29:17 +0200
+Subject: [PATCH] Fire EntityCombustEvent for phantoms
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
+index e27600109..098662193 100644
+--- a/src/main/java/net/minecraft/server/EntityPhantom.java
++++ b/src/main/java/net/minecraft/server/EntityPhantom.java
+@@ -105,7 +105,12 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+
+     public void k() {
+         if (this.dq()) {
+-            this.setOnFire(8);
++            // Paper start - fire EntityCombustEvent
++            org.bukkit.event.entity.EntityCombustEvent event = new org.bukkit.event.entity.EntityCombustEvent(this.getBukkitEntity(), 8);
++            if (event.callEvent()) {
++                this.setOnFire(event.getDuration());
++            }
++            // Paper end
+         }
+
+         super.k();
+-- 
+2.16.1.windows.1
+