From 6b80069cbe05b88cc27540ee483f34fbe85dafb3 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 | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Spigot-Server-Patches/SPIGOT-5190-Do-not-call-superfluous-EntityCombustEve.patch diff --git a/Spigot-Server-Patches/SPIGOT-5190-Do-not-call-superfluous-EntityCombustEve.patch b/Spigot-Server-Patches/SPIGOT-5190-Do-not-call-superfluous-EntityCombustEve.patch new file mode 100644 index 0000000000..39921e07cc --- /dev/null +++ b/Spigot-Server-Patches/SPIGOT-5190-Do-not-call-superfluous-EntityCombustEve.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 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 +@@ -0,0 +0,0 @@ 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 + } +-- \ No newline at end of file