#1209: Clean up various patches

By: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>

paper-server/nms-patches/net/minecraft/world/entity/item/EntityTNTPrimed.patch

@@ -1,10 +1,13 @@
 --- a/net/minecraft/world/entity/item/EntityTNTPrimed.java
 +++ b/net/minecraft/world/entity/item/EntityTNTPrimed.java
-@@ -15,12 +15,16 @@
+@@ -15,12 +15,19 @@
  import net.minecraft.world.entity.TraceableEntity;
  import net.minecraft.world.level.World;
  
-+import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit
++// CraftBukkit start;
++import org.bukkit.craftbukkit.event.CraftEventFactory;
++import org.bukkit.event.entity.ExplosionPrimeEvent;
++// CraftBukkit end
 +
  public class EntityTNTPrimed extends Entity implements TraceableEntity {
  
@@ -17,7 +20,7 @@
  
      public EntityTNTPrimed(EntityTypes<? extends EntityTNTPrimed> entitytypes, World world) {
          super(entitytypes, world);
-@@ -71,10 +75,13 @@
+@@ -71,10 +78,13 @@
  
          this.setFuse(i);
          if (i <= 0) {
@@ -32,18 +35,16 @@
          } else {
              this.updateInWaterStateAndDoFluidPushing();
              if (this.level().isClientSide) {
-@@ -85,9 +92,16 @@
+@@ -85,9 +95,14 @@
      }
  
      private void explode() {
 -        float f = 4.0F;
 +        // CraftBukkit start
 +        // float f = 4.0F;
++        ExplosionPrimeEvent event = CraftEventFactory.callExplosionPrimeEvent((org.bukkit.entity.Explosive)this.getBukkitEntity());
  
 -        this.level().explode(this, this.getX(), this.getY(0.0625D), this.getZ(), 4.0F, World.a.TNT);
-+        ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
-+        this.level().getCraftServer().getPluginManager().callEvent(event);
-+
 +        if (!event.isCancelled()) {
 +            this.level().explode(this, this.getX(), this.getY(0.0625D), this.getZ(), event.getRadius(), event.getFire(), World.a.TNT);
 +        }