diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/requirement/RequirementManagerImpl.java b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/requirement/RequirementManagerImpl.java index a9c958f..d988c03 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/requirement/RequirementManagerImpl.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/requirement/RequirementManagerImpl.java @@ -378,9 +378,8 @@ public class RequirementManagerImpl implements RequirementManager { return condition -> { String currentWeather; World world = Objects.requireNonNull(condition.getOfflinePlayer().getPlayer()).getWorld(); - if (world.hasStorm()) currentWeather = "rainstorm"; + if (world.isClearWeather()) currentWeather = "clear"; else if (world.isThundering()) currentWeather = "thunder"; - else if (world.isClearWeather()) currentWeather = "clear"; else currentWeather = "rain"; for (String weather : weathers) if (weather.equalsIgnoreCase(currentWeather)) diff --git a/paper/src/main/resources/configs/custom-placeholders.yml b/paper/src/main/resources/configs/custom-placeholders.yml index 7ecf131..806464a 100644 --- a/paper/src/main/resources/configs/custom-placeholders.yml +++ b/paper/src/main/resources/configs/custom-placeholders.yml @@ -33,11 +33,6 @@ conditional-text: conditions: weather: - thunder - priority_4: - text: 'Rainstorm' - conditions: - weather: - - rainstorm # https://mo-mi.gitbook.io/xiaomomi-plugins/plugin-wiki/customnameplates/custom-placeholders/nameplate-text nameplate-text: