23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
|
From 9379c4d134fbb6a8f16f093a10afc99cb6609a16 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andreas Troelsen <garbagemule@gmail.com>
|
||
|
|
Date: Sat, 20 Jul 2019 19:08:30 -0500
|
||
|
|
Subject: [PATCH] SPIGOT-5190: Do not call superfluous EntityCombustEvent
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||
|
|
index d81d11d570..8771fb37da 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||
|
|
@@ -1152,7 +1152,7 @@ public abstract class EntityHuman extends EntityLiving {
|
||
|
|
org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent);
|
||
|
|
|
||
|
|
if (!combustEvent.isCancelled()) {
|
||
|
|
- entity.setOnFire(combustEvent.getDuration());
|
||
|
|
+ entity.setOnFire(combustEvent.getDuration(), false); // Paper - SPIGOT-5190 - do not trigger event
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.22.0
|
||
|
|
|