mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-17 09:25:40 +02:00
eb38e51ee0
it used public method instead of private, and moved to world config also improved the implementation to not use obfuscated stuff Also removed the Fix Double chest conversion patch since its fixed in other ways in vanilla
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 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 7ac07ac07ac0..7ac07ac07ac0 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
|
|
|