From 843cee65f38547eed09067d7537c7441fc5647da Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 11 Jan 2019 11:41:32 +1100
Subject: [PATCH] Fix a bunch of duplicate EntityCombustEvent calls

---
 nms-patches/Entity.patch              | 4 ++--
 nms-patches/EntityArrow.patch         | 2 +-
 nms-patches/EntityHuman.patch         | 2 +-
 nms-patches/EntityInsentient.patch    | 2 +-
 nms-patches/EntitySmallFireball.patch | 2 +-
 nms-patches/EntityZombie.patch        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nms-patches/Entity.patch b/nms-patches/Entity.patch
index 1d9d6b9ee8..187d89b50e 100644
--- a/nms-patches/Entity.patch
+++ b/nms-patches/Entity.patch
@@ -287,7 +287,7 @@
 +                        world.getServer().getPluginManager().callEvent(event);
 +
 +                        if (!event.isCancelled()) {
-+                            this.setOnFire(event.getDuration());
++                            this.setOnFire(event.getDuration(), false);
 +                        }
 +                        // CraftBukkit end
                      }
@@ -593,7 +593,7 @@
 +            EntityCombustByEntityEvent entityCombustEvent = new EntityCombustByEntityEvent(stormBukkitEntity, thisBukkitEntity, 8);
 +            pluginManager.callEvent(entityCombustEvent);
 +            if (!entityCombustEvent.isCancelled()) {
-+                this.setOnFire(entityCombustEvent.getDuration());
++                this.setOnFire(entityCombustEvent.getDuration(), false);
 +            }
 +            // CraftBukkit end
          }
diff --git a/nms-patches/EntityArrow.patch b/nms-patches/EntityArrow.patch
index 31956676e3..4e086ab3e8 100644
--- a/nms-patches/EntityArrow.patch
+++ b/nms-patches/EntityArrow.patch
@@ -39,7 +39,7 @@
 +            EntityCombustByEntityEvent combustEvent = new EntityCombustByEntityEvent(this.getBukkitEntity(), entity.getBukkitEntity(), 5);
 +            org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent);
 +            if (!combustEvent.isCancelled()) {
-+                entity.setOnFire(combustEvent.getDuration());
++                entity.setOnFire(combustEvent.getDuration(), false);
 +            }
 +            // CraftBukkit end
          }
diff --git a/nms-patches/EntityHuman.patch b/nms-patches/EntityHuman.patch
index 8ddfc54e2b..79b686e635 100644
--- a/nms-patches/EntityHuman.patch
+++ b/nms-patches/EntityHuman.patch
@@ -234,7 +234,7 @@
 +
 +                            if (!combustEvent.isCancelled()) {
 +                                flag4 = true;
-+                                entity.setOnFire(combustEvent.getDuration());
++                                entity.setOnFire(combustEvent.getDuration(), false);
 +                            }
 +                            // CraftBukkit end
                          }
diff --git a/nms-patches/EntityInsentient.patch b/nms-patches/EntityInsentient.patch
index aec93ef3b3..c9a3049485 100644
--- a/nms-patches/EntityInsentient.patch
+++ b/nms-patches/EntityInsentient.patch
@@ -215,7 +215,7 @@
 +                org.bukkit.Bukkit.getPluginManager().callEvent(combustEvent);
 +
 +                if (!combustEvent.isCancelled()) {
-+                    entity.setOnFire(combustEvent.getDuration());
++                    entity.setOnFire(combustEvent.getDuration(), false);
 +                }
 +                // CraftBukkit end
              }
diff --git a/nms-patches/EntitySmallFireball.patch b/nms-patches/EntitySmallFireball.patch
index 61eae8baeb..0a8bf08b13 100644
--- a/nms-patches/EntitySmallFireball.patch
+++ b/nms-patches/EntitySmallFireball.patch
@@ -31,7 +31,7 @@
 +                        movingobjectposition.entity.world.getServer().getPluginManager().callEvent(event);
 +
 +                        if (!event.isCancelled()) {
-+                            movingobjectposition.entity.setOnFire(event.getDuration());
++                            movingobjectposition.entity.setOnFire(event.getDuration(), false);
 +                        }
 +                    }
 +                    // CraftBukkit end
diff --git a/nms-patches/EntityZombie.patch b/nms-patches/EntityZombie.patch
index 342f35b719..ee2790dbad 100644
--- a/nms-patches/EntityZombie.patch
+++ b/nms-patches/EntityZombie.patch
@@ -73,7 +73,7 @@
 +                this.world.getServer().getPluginManager().callEvent(event);
 +
 +                if (!event.isCancelled()) {
-+                    entity.setOnFire(event.getDuration());
++                    entity.setOnFire(event.getDuration(), false);
 +                }
 +                // CraftBukkit end
              }