From 62bc8f6b210e0d210023b4601b9ade7de4bd6c72 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:35:35 +0800 Subject: [PATCH] Season condition should check the greenhouse --- .../api/requirement/AbstractRequirementManager.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/api/src/main/java/net/momirealms/customcrops/api/requirement/AbstractRequirementManager.java b/api/src/main/java/net/momirealms/customcrops/api/requirement/AbstractRequirementManager.java index 1c19b18..09e497c 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/requirement/AbstractRequirementManager.java +++ b/api/src/main/java/net/momirealms/customcrops/api/requirement/AbstractRequirementManager.java @@ -421,17 +421,6 @@ public abstract class AbstractRequirementManager implements RequirementManage } protected void registerSeasonRequirement() { - registerRequirement((args, actions, runActions) -> { - Set seasons = new HashSet<>(ListUtils.toList(args).stream().map(it -> it.toUpperCase(Locale.ENGLISH)).toList()); - return context -> { - Location location = requireNonNull(context.arg(ContextKeys.LOCATION)); - Season season = plugin.getWorldManager().getSeason(location.getWorld()); - if (season == Season.DISABLE) return true; - if (seasons.contains(season.name())) return true; - if (runActions) ActionManager.trigger(context, actions); - return false; - }; - }, "season"); registerRequirement((args, actions, runActions) -> { Set seasons = new HashSet<>(ListUtils.toList(args).stream().map(it -> it.toUpperCase(Locale.ENGLISH)).toList()); return context -> { @@ -468,7 +457,7 @@ public abstract class AbstractRequirementManager implements RequirementManage if (runActions) ActionManager.trigger(context, actions); return false; }; - }, "suitable-season", "suitable_season"); + }, "suitable-season", "suitable_season", "season"); registerRequirement((args, actions, runActions) -> { Set seasons = new HashSet<>(ListUtils.toList(args).stream().map(it -> it.toUpperCase(Locale.ENGLISH)).toList()); return context -> {