From 45b90a0d451d7bbfec6e84c26d7f2097d6a0d43d Mon Sep 17 00:00:00 2001
From: DaemonUmbra <daemon.umbra@gmail.com>
Date: Fri, 12 Jun 2020 18:33:44 -0400
Subject: [PATCH] Added ProjectileImpactEvent.FireworkRocket (#6758)

---
 .../item/FireworkRocketEntity.java.patch      | 10 +++++++++
 .../event/ForgeEventFactory.java              |  6 ++++++
 .../event/entity/ProjectileImpactEvent.java   | 21 +++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 100644 patches/minecraft/net/minecraft/entity/item/FireworkRocketEntity.java.patch

diff --git a/patches/minecraft/net/minecraft/entity/item/FireworkRocketEntity.java.patch b/patches/minecraft/net/minecraft/entity/item/FireworkRocketEntity.java.patch
new file mode 100644
index 000000000..62400ef66
--- /dev/null
+++ b/patches/minecraft/net/minecraft/entity/item/FireworkRocketEntity.java.patch
@@ -0,0 +1,10 @@
+--- a/net/minecraft/entity/item/FireworkRocketEntity.java
++++ b/net/minecraft/entity/item/FireworkRocketEntity.java
+@@ -187,6 +187,7 @@
+    }
+ 
+    protected void func_213892_a(RayTraceResult p_213892_1_) {
++      if(p_213892_1_.func_216346_c() != RayTraceResult.Type.MISS && net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, p_213892_1_)) return;
+       if (p_213892_1_.func_216346_c() == RayTraceResult.Type.ENTITY && !this.field_70170_p.field_72995_K) {
+          this.func_213893_k();
+       } else if (this.field_70132_H) {
diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
index 95d240920..f85ef8724 100644
--- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
+++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
@@ -36,6 +36,7 @@ import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.EntityClassification;
 import net.minecraft.entity.effect.LightningBoltEntity;
+import net.minecraft.entity.item.FireworkRocketEntity;
 import net.minecraft.entity.item.ItemEntity;
 import net.minecraft.entity.monster.ZombieEntity;
 import net.minecraft.entity.passive.AnimalEntity;
@@ -630,6 +631,11 @@ public class ForgeEventFactory
         return MinecraftForge.EVENT_BUS.post(new ProjectileImpactEvent.Throwable(throwable, ray));
     }
 
+    public static boolean onProjectileImpact(FireworkRocketEntity fireworkRocket, RayTraceResult ray)
+    {
+        return MinecraftForge.EVENT_BUS.post(new ProjectileImpactEvent.FireworkRocket(fireworkRocket, ray));
+    }
+
     public static LootTable loadLootTable(ResourceLocation name, LootTable table, LootTableManager lootTableManager)
     {
         LootTableLoadEvent event = new LootTableLoadEvent(name, table, lootTableManager);
diff --git a/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java b/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java
index 06261d18c..1dccfc749 100644
--- a/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java
+++ b/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java
@@ -20,6 +20,7 @@
 package net.minecraftforge.event.entity;
 
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.FireworkRocketEntity;
 import net.minecraft.entity.projectile.AbstractArrowEntity;
 import net.minecraft.entity.projectile.DamagingProjectileEntity;
 import net.minecraft.entity.projectile.ThrowableEntity;
@@ -104,4 +105,24 @@ public class ProjectileImpactEvent extends EntityEvent
             return throwable;
         }
     }
+
+    /**
+     * Event is cancellable, causes firework to ignore the current hit and continue on its journey.
+     */
+    @Cancelable
+    public static class FireworkRocket extends ProjectileImpactEvent
+    {
+        private final FireworkRocketEntity fireworkRocket;
+
+        public FireworkRocket(FireworkRocketEntity fireworkRocket, RayTraceResult ray)
+        {
+            super(fireworkRocket, ray);
+            this.fireworkRocket = fireworkRocket;
+        }
+
+        public FireworkRocketEntity getFireworkRocket()
+        {
+            return fireworkRocket;
+        }
+    }
 }