#1209: Clean up various patches

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

paper-server/nms-patches/net/minecraft/world/entity/projectile/EntityWitherSkull.patch

@@ -1,15 +1,17 @@
 --- a/net/minecraft/world/entity/projectile/EntityWitherSkull.java
 +++ b/net/minecraft/world/entity/projectile/EntityWitherSkull.java
-@@ -20,6 +20,8 @@
+@@ -20,6 +20,10 @@
  import net.minecraft.world.phys.MovingObjectPosition;
  import net.minecraft.world.phys.MovingObjectPositionEntity;
  
-+import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit
++// CraftBukkit start
++import org.bukkit.event.entity.ExplosionPrimeEvent;
++// CraftBukkit end
 +
  public class EntityWitherSkull extends EntityFireball {
  
      private static final DataWatcherObject<Boolean> DATA_DANGEROUS = DataWatcher.defineId(EntityWitherSkull.class, DataWatcherRegistry.BOOLEAN);
-@@ -63,7 +65,7 @@
+@@ -63,7 +67,7 @@
                      if (entity.isAlive()) {
                          this.doEnchantDamageEffects(entityliving, entity);
                      } else {
@@ -18,7 +20,7 @@
                      }
                  }
              } else {
-@@ -81,7 +83,7 @@
+@@ -81,7 +85,7 @@
                  }
  
                  if (b0 > 0) {
@@ -27,7 +29,7 @@
                  }
              }
  
-@@ -92,7 +94,15 @@
+@@ -92,7 +96,15 @@
      protected void onHit(MovingObjectPosition movingobjectposition) {
          super.onHit(movingobjectposition);
          if (!this.level().isClientSide) {