diff --git a/src/main/java/io/github/jack1424/realtimeweather/RealTimeWeather.java b/src/main/java/io/github/jack1424/realtimeweather/RealTimeWeather.java index 8782bec..2d56f80 100644 --- a/src/main/java/io/github/jack1424/realtimeweather/RealTimeWeather.java +++ b/src/main/java/io/github/jack1424/realtimeweather/RealTimeWeather.java @@ -106,9 +106,9 @@ public final class RealTimeWeather extends JavaPlugin { world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM")); return; } - } else if (config.getSunriseSunset().equals("custom")) + } else if (config.getSunriseSunset().equals("custom")) { world.setTime(calculateWorldTime(cal, config.getSunriseCustomTime(), config.getSunsetCustomTime())); - else + } else world.setTime(calculateWorldTime(cal, "5:02:27 AM", "6:36:36 PM")); } }, 0L, config.getTimeSyncInterval()); @@ -170,9 +170,9 @@ public final class RealTimeWeather extends JavaPlugin { if (currentMinutes >= sunriseMinutes && currentMinutes < sunsetMinutes) { return ((currentMinutes - sunriseMinutes) / (sunsetMinutes - sunriseMinutes) * 13569) + 23041; } else { - if (currentMinutes < sunriseMinutes) { + if (currentMinutes < sunriseMinutes) currentMinutes += 1440; - } + return ((currentMinutes - sunsetMinutes) / (1440 - sunsetMinutes + sunriseMinutes) * 13569) + 12610; } } diff --git a/src/main/java/io/github/jack1424/realtimeweather/requests/WeatherRequestObject.java b/src/main/java/io/github/jack1424/realtimeweather/requests/WeatherRequestObject.java index bdacf7d..ed4e960 100644 --- a/src/main/java/io/github/jack1424/realtimeweather/requests/WeatherRequestObject.java +++ b/src/main/java/io/github/jack1424/realtimeweather/requests/WeatherRequestObject.java @@ -33,7 +33,6 @@ public class WeatherRequestObject { for (Object rawCondition : conditions) { int id = Integer.parseInt(String.valueOf(((JSONObject) rawCondition).get("id"))); - while (id >= 10) id /= 10;