diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/placeholder/PluginPlaceholders.java b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/placeholder/PluginPlaceholders.java index fbe783d..b130557 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/placeholder/PluginPlaceholders.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/mechanic/placeholder/PluginPlaceholders.java @@ -139,6 +139,14 @@ public class PluginPlaceholders extends PlaceholderExpansion { if (minutes < 10) return hours + ":0" + minutes + ap; else return hours + ":" + minutes + ap; } + case "time-24" -> { + long time = onlinePlayer.getWorld().getTime(); + double converttime = time * 3.6; + int hours = (int) Math.floor(converttime % 86400 / 3600); + int minutes = (int) Math.floor(converttime % 3600 / 60); + int mchours = hours <= 17 ? hours + 6 : hours - 18; + return mchours + ":" + (minutes >= 10 ? minutes : "0"+minutes); + } case "actionbar" -> { return plugin.getActionBarManager().getOtherPluginActionBar(onlinePlayer); } 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))