Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 02:55:47 +01:00
Code Issues Projects Releases Wiki Activity

Fire EntityCombustEvent for phantoms (#1573)

Browse Source
This commit is contained in:
Brokkonaut 2018-10-18 05:04:21 +02:00 committed by Daniel Ennis
parent 00f0a30680
commit 4168fa182e
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Spigot-Server-Patches/0393-Fire-EntityCombustEvent-for-phantoms.patch Normal file
View File

@ -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