cleaned up some code

This commit is contained in:
Jack
2024-07-23 02:27:39 -04:00
parent 20bf2d74fc
commit 6db07a376b
2 changed files with 4 additions and 5 deletions

View File

@@ -106,9 +106,9 @@ public final class RealTimeWeather extends JavaPlugin {
world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM")); world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM"));
return; return;
} }
} else if (config.getSunriseSunset().equals("custom")) } else if (config.getSunriseSunset().equals("custom")) {
world.setTime(calculateWorldTime(cal, config.getSunriseCustomTime(), config.getSunsetCustomTime())); world.setTime(calculateWorldTime(cal, config.getSunriseCustomTime(), config.getSunsetCustomTime()));
else } else
world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM")); world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM"));
} }
}, 0L, config.getTimeSyncInterval()); }, 0L, config.getTimeSyncInterval());
@@ -170,9 +170,9 @@ public final class RealTimeWeather extends JavaPlugin {
if (currentMinutes >= sunriseMinutes && currentMinutes < sunsetMinutes) { if (currentMinutes >= sunriseMinutes && currentMinutes < sunsetMinutes) {
return ((currentMinutes - sunriseMinutes) / (sunsetMinutes - sunriseMinutes) * 13569) + 23041; return ((currentMinutes - sunriseMinutes) / (sunsetMinutes - sunriseMinutes) * 13569) + 23041;
} else { } else {
if (currentMinutes < sunriseMinutes) { if (currentMinutes < sunriseMinutes)
currentMinutes += 1440; currentMinutes += 1440;
}
return ((currentMinutes - sunsetMinutes) / (1440 - sunsetMinutes + sunriseMinutes) * 13569) + 12610; return ((currentMinutes - sunsetMinutes) / (1440 - sunsetMinutes + sunriseMinutes) * 13569) + 12610;
} }
} }

View File

@@ -33,7 +33,6 @@ public class WeatherRequestObject {
for (Object rawCondition : conditions) { for (Object rawCondition : conditions) {
int id = Integer.parseInt(String.valueOf(((JSONObject) rawCondition).get("id"))); int id = Integer.parseInt(String.valueOf(((JSONObject) rawCondition).get("id")));
while (id >= 10) while (id >= 10)
id /= 10; id /= 10;