mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

SPIGOT-5190: Do not call superfluous EntityCombustEvent

Browse source
This commit is contained in:
Andreas Troelsen 2019-07-20 19:14:06 -05:00 committed by Zach Brown
parent 9fe63a1673
commit ef6823811b
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Spigot-Server-Patches/0405-SPIGOT-5190-Do-not-call-superfluous-EntityCombustEve.patch Normal file
View file

@ -0,0 +1,22 @@
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