From 1f0d70743ef91389a9972907967444dc3b6106a0 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sun, 31 Jul 2022 10:14:54 -0700
Subject: [PATCH] Fix issues with CreeperIgniteEvent (#7507)

---
 patches/api/0142-Add-More-Creeper-API.patch    | 8 +++++---
 patches/server/0249-Add-More-Creeper-API.patch | 9 +++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/patches/api/0142-Add-More-Creeper-API.patch b/patches/api/0142-Add-More-Creeper-API.patch
index b45e2fbeba..9054588ca5 100644
--- a/patches/api/0142-Add-More-Creeper-API.patch
+++ b/patches/api/0142-Add-More-Creeper-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add More Creeper API
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ff10251b6ded533b08048ec533525176eff03707
+index 0000000000000000000000000000000000000000..e9768c919a1860881802ab68eff559874590ac1c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,56 @@
 +package com.destroystokyo.paper.event.entity;
 +
 +import org.bukkit.entity.Creeper;
@@ -19,7 +19,9 @@ index 0000000000000000000000000000000000000000..ff10251b6ded533b08048ec533525176
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
-+ * Called when a Creeper is ignite flag is changed (armed/disarmed to explode).
++ * Called when a Creeper is ignited either by a
++ * flint and steel, {@link Creeper#ignite()} or
++ * {@link Creeper#setIgnited(boolean)}.
 + */
 +public class CreeperIgniteEvent extends EntityEvent implements Cancellable {
 +    private static final HandlerList handlers = new HandlerList();
diff --git a/patches/server/0249-Add-More-Creeper-API.patch b/patches/server/0249-Add-More-Creeper-API.patch
index ca052b8893..fac9477cb0 100644
--- a/patches/server/0249-Add-More-Creeper-API.patch
+++ b/patches/server/0249-Add-More-Creeper-API.patch
@@ -8,6 +8,15 @@ diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src
 index bc493838420a6857ebc86f84cabdc1b6e3e637a4..8c328d72c42ccaa6891249cc700b70bb34c09545 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
+@@ -133,7 +133,7 @@ public class Creeper extends Monster implements PowerableMob {
+         }
+ 
+         if (nbt.getBoolean("ignited")) {
+-            this.ignite();
++            this.entityData.set(Creeper.DATA_IS_IGNITED, true); // Paper - set directly to avoid firing event
+         }
+ 
+     }
 @@ -309,7 +309,18 @@ public class Creeper extends Monster implements PowerableMob {
      }