Developers!: You will need to clean up your work/Minecraft/1.13.2 folder for this Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b850a822 SPIGOT-4526: Add conversion time API for Zombie & subclasses CraftBukkit Changes: 38cf676e SPIGOT-4534: CreatureSpawnEvent not being called for CHUNK_GEN b446cb5d SPIGOT-4527: Fix sponges with waterlogged blocks 6ec8ea5c SPIGOT-4526: Add conversion time API for Zombie & subclasses c64fe508 Mappings Update a3c2ec03 Fix missing ServerListPingEvent call for legacy pings Spigot Changes: 1dc156ce Rebuild patches 140f654d Mappings Update
28 lines
1 KiB
Diff
28 lines
1 KiB
Diff
From b1d82c1797ab63209d5a318cc9deec15a64cf048 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 7a48719c9..d7be396ee 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
|
|
@@ -106,7 +106,12 @@ public class EntityPhantom extends EntityFlying implements IMonster {
|
|
|
|
public void movementTick() {
|
|
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.movementTick();
|
|
--
|
|
2.20.0
|
|
|