diff --git a/Plan/src/main/java/com/djrapitops/plan/PlanSponge.java b/Plan/src/main/java/com/djrapitops/plan/PlanSponge.java index d9ff71cda..5f9fa4ee0 100644 --- a/Plan/src/main/java/com/djrapitops/plan/PlanSponge.java +++ b/Plan/src/main/java/com/djrapitops/plan/PlanSponge.java @@ -23,7 +23,7 @@ import org.spongepowered.api.plugin.Plugin; import java.io.File; import java.io.InputStream; -@Plugin(id = "plan", name = "Plan", version = "4.2.1", description = "Player Analytics Plugin by Rsl1122", authors = {"Rsl1122"}) +@Plugin(id = "plan", name = "Plan", version = "4.3.0", description = "Player Analytics Plugin by Rsl1122", authors = {"Rsl1122"}) public class PlanSponge extends SpongePlugin implements PlanPlugin { @Inject diff --git a/Plan/src/main/java/com/djrapitops/plan/system/cache/GeolocationCache.java b/Plan/src/main/java/com/djrapitops/plan/system/cache/GeolocationCache.java index d0825e32d..29b1dd6cb 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/cache/GeolocationCache.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/cache/GeolocationCache.java @@ -4,7 +4,6 @@ import com.djrapitops.plan.api.exceptions.EnableException; import com.djrapitops.plan.system.SubSystem; import com.djrapitops.plan.system.file.FileSystem; import com.djrapitops.plan.system.settings.Settings; -import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.utilities.Verify; import com.google.common.cache.Cache; @@ -47,7 +46,7 @@ public class GeolocationCache implements SubSystem { @Override public void enable() throws EnableException { geolocationDB = new File(FileSystem.getDataFolder(), "GeoIP.dat"); - if (!Check.isSpongeAvailable() || Settings.DATA_GEOLOCATIONS.isTrue()) { + if (Settings.DATA_GEOLOCATIONS.isTrue()) { try { GeolocationCache.checkDB(); } catch (UnknownHostException e) { diff --git a/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/player/IPUpdateProcessor.java b/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/player/IPUpdateProcessor.java index caaae6b43..7bebbaea4 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/player/IPUpdateProcessor.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/processing/processors/player/IPUpdateProcessor.java @@ -10,7 +10,6 @@ import com.djrapitops.plan.system.cache.GeolocationCache; import com.djrapitops.plan.system.database.databases.Database; import com.djrapitops.plan.system.processing.CriticalRunnable; import com.djrapitops.plan.system.settings.Settings; -import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.api.utility.log.Log; import java.io.UnsupportedEncodingException; @@ -36,7 +35,7 @@ public class IPUpdateProcessor implements CriticalRunnable { @Override public void run() { - if (!Check.isSpongeAvailable() || Settings.DATA_GEOLOCATIONS.isTrue()) { + if (Settings.DATA_GEOLOCATIONS.isTrue()) { String country = GeolocationCache.getCountry(ip); try { Database.getActive().save().geoInfo(uuid, new GeoInfo(ip, country, time)); diff --git a/Plan/src/main/java/com/djrapitops/plan/system/settings/network/NetworkSettings.java b/Plan/src/main/java/com/djrapitops/plan/system/settings/network/NetworkSettings.java index d42a7efa3..3338e8568 100644 --- a/Plan/src/main/java/com/djrapitops/plan/system/settings/network/NetworkSettings.java +++ b/Plan/src/main/java/com/djrapitops/plan/system/settings/network/NetworkSettings.java @@ -147,7 +147,8 @@ public class NetworkSettings { Settings.MAX_PLAYERS_PLAYERS_PAGE, Settings.PLAYERTABLE_FOOTER, Settings.FORMAT_DATE_RECENT_DAYS, Settings.FORMAT_DATE_RECENT_DAYS_PATTERN, Settings.FORMAT_DATE_CLOCK, Settings.FORMAT_DATE_NO_SECONDS, Settings.FORMAT_DATE_FULL, Settings.DISPLAY_PLAYER_IPS, Settings.ACTIVE_LOGIN_THRESHOLD, - Settings.ACTIVE_PLAY_THRESHOLD, Settings.DISPLAY_GAPS_IN_GRAPH_DATA, Settings.AFK_THRESHOLD_MINUTES + Settings.ACTIVE_PLAY_THRESHOLD, Settings.DISPLAY_GAPS_IN_GRAPH_DATA, Settings.AFK_THRESHOLD_MINUTES, + Settings.DATA_GEOLOCATIONS }; Log.debug("NetworkSettings: Adding Config Values.."); for (Settings setting : sameStrings) { diff --git a/Plan/src/main/resources/bungee.yml b/Plan/src/main/resources/bungee.yml index 50e65696b..4c7a06885 100644 --- a/Plan/src/main/resources/bungee.yml +++ b/Plan/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ name: Plan author: Rsl1122 main: com.djrapitops.plan.PlanBungee -version: 4.2.0-b1 \ No newline at end of file +version: 4.3.0 \ No newline at end of file diff --git a/Plan/src/main/resources/bungeeconfig.yml b/Plan/src/main/resources/bungeeconfig.yml index 459f24239..3c1f1954d 100644 --- a/Plan/src/main/resources/bungeeconfig.yml +++ b/Plan/src/main/resources/bungeeconfig.yml @@ -65,6 +65,7 @@ Data: Commands: LogUnknownCommands: false CombineCommandAliases: true + Geolocations: true # ----------------------------------------------------- Customization: UseServerTime: true diff --git a/Plan/src/main/resources/config.yml b/Plan/src/main/resources/config.yml index 4e102d8f5..06055feb5 100644 --- a/Plan/src/main/resources/config.yml +++ b/Plan/src/main/resources/config.yml @@ -79,6 +79,7 @@ Data: Commands: LogUnknownCommands: false CombineCommandAliases: true + Geolocations: true # ----------------------------------------------------- Customization: UseServerTime: true diff --git a/Plan/src/main/resources/plugin.yml b/Plan/src/main/resources/plugin.yml index d7d70ff21..dc914b096 100644 --- a/Plan/src/main/resources/plugin.yml +++ b/Plan/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: Plan author: Rsl1122 main: com.djrapitops.plan.Plan -version: 4.2.0-b1 +version: 4.3.0 softdepend: - EssentialsX - Towny