From 30cfd848d8181e6711d45b5a932dde9e89094398 Mon Sep 17 00:00:00 2001
From: DaemonUmbra <daemon.umbra@gmail.com>
Date: Thu, 29 Jul 2021 22:10:35 -0400
Subject: [PATCH] Remove Generic from ProjectileImpactEvent (#7959)

Generification of this event was half-done and has been aborted, leaving the generic parameter in place just creates confusion and crashes
---
 .../java/net/minecraftforge/event/ForgeEventFactory.java  | 4 ++--
 .../event/entity/ProjectileImpactEvent.java               | 8 ++++----
 .../debug/entity/FishingBobberEventTest.java              | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
index cb4778fab7..6beb7009cf 100644
--- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
+++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java
@@ -624,9 +624,9 @@ public class ForgeEventFactory
         return event.getCharge();
     }
 
-    public static <T extends Projectile> boolean onProjectileImpact(T projectile, HitResult ray)
+    public static boolean onProjectileImpact(Projectile projectile, HitResult ray)
     {
-        return MinecraftForge.EVENT_BUS.post(new ProjectileImpactEvent<>(projectile, ray));
+        return MinecraftForge.EVENT_BUS.post(new ProjectileImpactEvent(projectile, ray));
     }
 
     public static LootTable loadLootTable(ResourceLocation name, LootTable table, LootTables lootTableManager)
diff --git a/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java b/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java
index 8da26bd1cf..c28bf56032 100644
--- a/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java
+++ b/src/main/java/net/minecraftforge/event/entity/ProjectileImpactEvent.java
@@ -35,12 +35,12 @@ import net.minecraftforge.eventbus.api.Cancelable;
  * Killing or other handling of the entity after event cancellation is up to the modder.
  */
 @Cancelable
-public class ProjectileImpactEvent<T extends Projectile> extends EntityEvent
+public class ProjectileImpactEvent extends EntityEvent
 {
     private final HitResult ray;
-    private final T projectile;
+    private final Projectile projectile;
 
-    public ProjectileImpactEvent(T projectile, HitResult ray)
+    public ProjectileImpactEvent(Projectile projectile, HitResult ray)
     {
         super(projectile);
         this.ray = ray;
@@ -52,7 +52,7 @@ public class ProjectileImpactEvent<T extends Projectile> extends EntityEvent
         return ray;
     }
 
-    public T getProjectile()
+    public Projectile getProjectile()
     {
         return projectile;
     }
diff --git a/src/test/java/net/minecraftforge/debug/entity/FishingBobberEventTest.java b/src/test/java/net/minecraftforge/debug/entity/FishingBobberEventTest.java
index 434ee36c1f..199119fbbb 100644
--- a/src/test/java/net/minecraftforge/debug/entity/FishingBobberEventTest.java
+++ b/src/test/java/net/minecraftforge/debug/entity/FishingBobberEventTest.java
@@ -43,9 +43,9 @@ public class FishingBobberEventTest
         }
     }
 
-    public static void handleImpact(ProjectileImpactEvent<FishingHook> event)
+    public static void handleImpact(ProjectileImpactEvent event)
     {
-        FishingHook fishingHook = event.getProjectile();
+        if(!(event.getProjectile() instanceof FishingHook fishingHook)) return;
         HitResult trace = event.getRayTraceResult();
         if (trace.getType() == HitResult.Type.ENTITY)
         {