Move Aikar's EAR 1 into EAR 2 patch

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

@@ -15,24 +15,6 @@
  public class Villager extends AbstractVillager implements ReputationEventHandler, VillagerDataHolder {
      private static final Logger LOGGER = LogUtils.getLogger();
      private static final EntityDataAccessor<VillagerData> DATA_VILLAGER_DATA = SynchedEntityData.defineId(Villager.class, EntityDataSerializers.VILLAGER_DATA);
-@@ -257,6 +_,17 @@
-         return this.assignProfessionWhenSpawned;
-     }
- 
-+    // Spigot Start
-+    @Override
-+    public void inactiveTick() {
-+        // SPIGOT-3874, SPIGOT-3894, SPIGOT-3846, SPIGOT-5286 :(
-+        if (this.level().spigotConfig.tickInactiveVillagers && this.isEffectiveAi()) {
-+            this.customServerAiStep((ServerLevel) this.level());
-+        }
-+        super.inactiveTick();
-+    }
-+    // Spigot End
-+
-     @Override
-     protected void customServerAiStep(ServerLevel level) {
-         ProfilerFiller profilerFiller = Profiler.get();
 @@ -275,7 +_,7 @@
                      this.increaseProfessionLevelOnUpdate = false;
                  }