Move Aikar's EAR 1 into EAR 2 patch

paper-server/patches/sources/net/minecraft/world/entity/projectile/AbstractArrow.java.patch

@@ -8,7 +8,7 @@
  import net.minecraft.world.entity.player.Player;
  import net.minecraft.world.item.Item;
  import net.minecraft.world.item.ItemStack;
-@@ -63,16 +_,26 @@
+@@ -63,16 +_,16 @@
      protected int inGroundTime;
      public AbstractArrow.Pickup pickup = AbstractArrow.Pickup.DISALLOWED;
      public int shakeTime;
@@ -26,16 +26,6 @@
      @Nullable
 -    private ItemStack firedFromWeapon = null;
 +    public ItemStack firedFromWeapon = null; // Paper - private -> public
-+
-+    // Spigot Start
-+    @Override
-+    public void inactiveTick() {
-+        if (this.isInGround()) {
-+            this.life += 1;
-+        }
-+        super.inactiveTick();
-+    }
-+    // Spigot End
  
      protected AbstractArrow(EntityType<? extends AbstractArrow> entityType, Level level) {
          super(entityType, level);

paper-server/patches/sources/net/minecraft/world/entity/projectile/FireworkRocketEntity.java.patch

@@ -8,33 +8,6 @@
  
      public FireworkRocketEntity(EntityType<? extends FireworkRocketEntity> entityType, Level level) {
          super(entityType, level);
-@@ -84,6 +_,26 @@
-         this.setOwner(shooter);
-     }
- 
-+    // Spigot Start - copied from tick
-+    @Override
-+    public void inactiveTick() {
-+        this.life += 1;
-+
-+        if (this.life > this.lifetime) {
-+            Level world = this.level();
-+
-+            if (world instanceof ServerLevel serverLevel) {
-+                // CraftBukkit start
-+                if (!org.bukkit.craftbukkit.event.CraftEventFactory.callFireworkExplodeEvent(this).isCancelled()) {
-+                    this.explode(serverLevel);
-+                }
-+                // CraftBukkit end
-+            }
-+        }
-+        super.inactiveTick();
-+    }
-+    // Spigot End
-+
-     @Override
-     protected void defineSynchedData(SynchedEntityData.Builder builder) {
-         builder.define(DATA_ID_FIREWORKS_ITEM, getDefaultItem());
 @@ -158,7 +_,7 @@
          }