From ef6823811b486615b67a33702b883823d0e5adb2 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Sat, 20 Jul 2019 19:14:06 -0500 Subject: [PATCH] SPIGOT-5190: Do not call superfluous EntityCombustEvent --- ...ot-call-superfluous-EntityCombustEve.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Spigot-Server-Patches/0405-SPIGOT-5190-Do-not-call-superfluous-EntityCombustEve.patch diff --git a/Spigot-Server-Patches/0405-SPIGOT-5190-Do-not-call-superfluous-EntityCombustEve.patch b/Spigot-Server-Patches/0405-SPIGOT-5190-Do-not-call-superfluous-EntityCombustEve.patch new file mode 100644 index 000000000..33be56033 --- /dev/null +++ b/Spigot-Server-Patches/0405-SPIGOT-5190-Do-not-call-superfluous-EntityCombustEve.patch @@ -0,0 +1,22 @@ +From 9379c4d134fbb6a8f16f093a10afc99cb6609a16 Mon Sep 17 00:00:00 2001 +From: Andreas Troelsen +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 +