mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-02 16:37:56 +02:00
684bd2adbc
--- work/Bukkit Submodule work/Bukkit 9a793cce8..0c1d258bb: > Make PigZapEvent extend EntityTransformEvent --- work/CraftBukkit Submodule work/CraftBukkit ee6684bba..6a398ac44: > SPIGOT-4511: Trident doesn't lose durability > Tweak outdated windows
28 lines
1022 B
Diff
28 lines
1022 B
Diff
From 67768c485ef423216d91265e34352f93c6e185d8 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.19.1
|
|
|