Move Aikar's EAR 1 into EAR 2 patch

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

@@ -39,7 +39,7 @@
  public abstract class LivingEntity extends Entity implements Attackable {
      private static final Logger LOGGER = LogUtils.getLogger();
      private static final String TAG_ACTIVE_EFFECTS = "active_effects";
-@@ -266,11 +_,36 @@
+@@ -266,11 +_,29 @@
          EquipmentSlot.class
      );
      protected float appliedScale = 1.0F;
@@ -59,13 +59,6 @@
 +        return this.getYHeadRot();
 +    }
 +    // CraftBukkit end
-+    // Spigot start
-+    public void inactiveTick()
-+    {
-+        super.inactiveTick();
-+        ++this.noActionTime; // Above all the floats
-+    }
-+    // Spigot end
  
      protected LivingEntity(EntityType<? extends LivingEntity> entityType, Level level) {
          super(entityType, level);