Merge remote-tracking branch 'origin/data-refactoring-bridge-fixes' into data-refactoring

# Conflicts: # Plan/src/main/java/com/djrapitops/plan/data/Actions.java # Plan/src/main/java/com/djrapitops/plan/data/PlayerProfile.java # Plan/src/main/java/com/djrapitops/plan/data/ServerProfile.java # Plan/src/main/java/com/djrapitops/plan/data/container/Action.java # Plan/src/main/java/com/djrapitops/plan/data/container/GeoInfo.java # Plan/src/main/java/com/djrapitops/plan/data/container/StickyData.java # Plan/src/main/java/com/djrapitops/plan/data/store/mutators/HealthInformation.java # Plan/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java # Plan/src/main/java/com/djrapitops/plan/system/database/databases/operation/TransferOperations.java # Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java # Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/ActionsTable.java # Plan/src/main/java/com/djrapitops/plan/system/info/server/BukkitServerInfo.java # Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java # Plan/src/main/java/com/djrapitops/plan/system/listeners/sponge/SpongePlayerListener.java # Plan/src/main/java/com/djrapitops/plan/system/processing/processors/player/FirstLeaveProcessor.java # Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/AnalysisPage.java # Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/NetworkPage.java # Plan/src/main/java/com/djrapitops/plan/system/webserver/pages/parsing/Page.java # Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/SessionTabStructureCreator.java # Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/ActionsTable.java # Plan/src/main/java/com/djrapitops/plan/utilities/html/tables/SessionsTableCreator.java
2024-09-17 17:21:00 +02:00 · 2018-07-09 08:29:12 +03:00 · 2018-07-09 08:29:12 +03:00 · 1039c54f58
commit 1039c54f58
parent ef4e5d6d66 cbae1d3c4c
225 changed files with 754 additions and 724 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,7 +5,7 @@ before_install:
  - pwd
  - cd PlanPluginBridge
  - ls
-  - mvn install:install-file -Dfile=/home/travis/build/Rsl1122/Plan-PlayerAnalytics/PlanPluginBridge/PlanPluginBridge-4.3.0.jar -DpomFile=/home/travis/build/Rsl1122/Plan-PlayerAnalytics/PlanPluginBridge/pom.xml
+  - mvn install:install-file -Dfile=./PlanPluginBridge-4.3.0.jar -DpomFile=./pom.xml
  - cd ../Plan
  - ls
 install:
@ -19,7 +19,8 @@ jdk:
  - oraclejdk8
 script:
  - pwd
-  - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar
+  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then mvn test; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar; fi'
 cache:
  directories:
    - '$HOME/.m2/repository'
--- a/Plan/dependency-reduced-pom.xml
+++ b/Plan/dependency-reduced-pom.xml
@ -21,9 +21,6 @@
          <include>**/*.css</include>
          <include>locale/*.txt</include>
        </includes>
-        <excludes>
-          <exclude>licence.yml</exclude>
-        </excludes>
      </resource>
    </resources>
    <finalName>${project.name}</finalName>
@ -38,7 +35,7 @@
      </plugin>
      <plugin>
        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.3</version>
+          <version>3.1.1</version>
        <executions>
          <execution>
            <phase>package</phase>
@ -68,21 +65,21 @@
              <pattern>org.apache</pattern>
              <shadedPattern>plan.org.apache</shadedPattern>
              <excludes>
-                <exclude>org.apache.logging.*</exclude>
+                  <exclude>org.apache.logging.**</exclude>
              </excludes>
            </relocation>
            <relocation>
              <pattern>com.maxmind</pattern>
              <shadedPattern>plan.com.maxmind</shadedPattern>
              <excludes>
-                <exclude>org.apache.logging.*</exclude>
+                  <exclude>org.apache.logging.**</exclude>
              </excludes>
            </relocation>
            <relocation>
              <pattern>com.fasterxml</pattern>
              <shadedPattern>plan.com.fasterxml</shadedPattern>
              <excludes>
-                <exclude>org.apache.logging.*</exclude>
+                  <exclude>org.apache.logging.**</exclude>
              </excludes>
            </relocation>
          </relocations>
@ -402,4 +399,3 @@
    <maven.compiler.target>1.8</maven.compiler.target>
  </properties>
 </project>
-
--- a/Plan/pom.xml
+++ b/Plan/pom.xml
@ -150,9 +150,6 @@
                    <include>**/*.css</include>
                    <include>locale/*.txt</include>
                </includes>
-                <excludes>
-                    <exclude>licence.yml</exclude>
-                </excludes>
            </resource>
        </resources>
        <plugins>
@ -167,7 +164,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>3.1.1</version>
                <executions>
                    <execution>
                        <phase>package</phase>
@ -197,21 +194,21 @@
                            <pattern>org.apache</pattern>
                            <shadedPattern>plan.org.apache</shadedPattern>
                            <excludes>
-                                <exclude>org.apache.logging.*</exclude>
+                                <exclude>org.apache.logging.**</exclude>
                            </excludes>
                        </relocation>
                        <relocation>
                            <pattern>com.maxmind</pattern>
                            <shadedPattern>plan.com.maxmind</shadedPattern>
                            <excludes>
-                                <exclude>org.apache.logging.*</exclude>
+                                <exclude>org.apache.logging.**</exclude>
                            </excludes>
                        </relocation>
                        <relocation>
                            <pattern>com.fasterxml</pattern>
                            <shadedPattern>plan.com.fasterxml</shadedPattern>
                            <excludes>
-                                <exclude>org.apache.logging.*</exclude>
+                                <exclude>org.apache.logging.**</exclude>
                            </excludes>
                        </relocation>
                    </relocations>
--- a/Plan/src/main/java/com/djrapitops/plan/Plan.java
+++ b/Plan/src/main/java/com/djrapitops/plan/Plan.java
@ -3,7 +3,7 @@
 *    Copyright (C) 2017  Risto Lahtela / Rsl1122
 *
 *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the Plan License. (licence.yml)
+ *    it under the terms of the Plan License. (LICENSE)
 *    Modified software can only be redistributed if allowed in the licence.
 *
 *    This program is distributed in the hope that it will be useful,
@ -15,7 +15,7 @@
 *    along with this program.
 *    If not it should be visible on the distribution page.
 *    Or here
- *    https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/licence.yml
+ *    https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan;

--- a/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java
+++ b/Plan/src/main/java/com/djrapitops/plan/PlanBungee.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan;

--- a/Plan/src/main/java/com/djrapitops/plan/PlanPlugin.java
+++ b/Plan/src/main/java/com/djrapitops/plan/PlanPlugin.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan;

--- a/Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java
+++ b/Plan/src/main/java/com/djrapitops/plan/ShutdownHook.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan;

--- a/Plan/src/main/java/com/djrapitops/plan/api/BungeeAPI.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/BungeeAPI.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api;

--- a/Plan/src/main/java/com/djrapitops/plan/api/CommonAPI.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/CommonAPI.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api;

--- a/Plan/src/main/java/com/djrapitops/plan/api/PlanAPI.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/PlanAPI.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api;

--- a/Plan/src/main/java/com/djrapitops/plan/api/ServerAPI.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/ServerAPI.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/EnableException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/EnableException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/ParseException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/ParseException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebUserAuthException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/WebUserAuthException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/BadRequestException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/BadRequestException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/ConnectionFailException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/ConnectionFailException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/ForbiddenException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/ForbiddenException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/GatewayException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/GatewayException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/InternalErrorException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/InternalErrorException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/NoServersException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/NoServersException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/NotFoundException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/NotFoundException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/TransferDatabaseException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/TransferDatabaseException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/UnauthorizedServerException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/UnauthorizedServerException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/UnsupportedTransferDatabaseException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/UnsupportedTransferDatabaseException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/WebException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/WebException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/WebFailException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/connection/WebFailException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/database/DBException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/database/DBException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.database;

--- a/Plan/src/main/java/com/djrapitops/plan/api/exceptions/database/DBInitException.java
+++ b/Plan/src/main/java/com/djrapitops/plan/api/exceptions/database/DBInitException.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.api.exceptions.database;

--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/BungeeSetupToggleCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/BungeeSetupToggleCommand.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.command.commands;

--- a/Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java
+++ b/Plan/src/main/java/com/djrapitops/plan/command/commands/DevCommand.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.command.commands;

--- a/Plan/src/main/java/com/djrapitops/plan/data/container/GeoInfo.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/container/GeoInfo.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.data.container;

@ -11,6 +11,7 @@ import com.djrapitops.plan.utilities.SHA256Hash;
 import com.google.common.base.Objects;

 import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
 import java.security.NoSuchAlgorithmException;

 /**
@ -25,9 +26,9 @@ public class GeoInfo implements DateHolder {
    private final String ipHash;
    private final long date;

-    public GeoInfo(String ip, String geolocation, long date)
+    public GeoInfo(InetAddress address, String geolocation, long lastUsed)
            throws UnsupportedEncodingException, NoSuchAlgorithmException {
-        this(FormatUtils.formatIP(ip), geolocation, date, new SHA256Hash(ip).create());
+        this(FormatUtils.formatIP(address), geolocation, lastUsed, new SHA256Hash(address.getHostAddress()).create());
    }

    public GeoInfo(String ip, String geolocation, long date, String ipHash) {
--- a/Plan/src/main/java/com/djrapitops/plan/data/container/builders/TPSBuilder.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/container/builders/TPSBuilder.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.data.container.builders;

--- a/Plan/src/main/java/com/djrapitops/plan/data/element/AnalysisContainer.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/element/AnalysisContainer.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.data.element;

--- a/Plan/src/main/java/com/djrapitops/plan/data/element/InspectContainer.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/element/InspectContainer.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.data.element;

--- a/Plan/src/main/java/com/djrapitops/plan/data/element/TableContainer.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/element/TableContainer.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.data.element;

--- a/Plan/src/main/java/com/djrapitops/plan/data/plugin/BanData.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/plugin/BanData.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.data.plugin;

--- a/Plan/src/main/java/com/djrapitops/plan/data/plugin/ContainerSize.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/plugin/ContainerSize.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.data.plugin;

--- a/Plan/src/main/java/com/djrapitops/plan/data/store/mutators/HealthInformation.java
+++ b/Plan/src/main/java/com/djrapitops/plan/data/store/mutators/HealthInformation.java
@ -1,3 +1,7 @@
+/*
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
+ */
 package com.djrapitops.plan.data.store.mutators;

 import com.djrapitops.plan.data.store.Key;
@ -252,5 +256,4 @@ public class HealthInformation {
        regularNewCompareSet.removeAll(veryActiveFWAG);
        return regularNewCompareSet.size();
    }
-
 }
--- a/Plan/src/main/java/com/djrapitops/plan/system/BukkitSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/BukkitSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system;

--- a/Plan/src/main/java/com/djrapitops/plan/system/BungeeSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/BungeeSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system;

--- a/Plan/src/main/java/com/djrapitops/plan/system/PlanSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/PlanSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system;

--- a/Plan/src/main/java/com/djrapitops/plan/system/SpongeSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/SpongeSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system;

--- a/Plan/src/main/java/com/djrapitops/plan/system/SubSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/SubSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system;

--- a/Plan/src/main/java/com/djrapitops/plan/system/cache/CacheSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/cache/CacheSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.cache;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/BungeeDBSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/BungeeDBSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/DBSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/DBSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/ServerDBSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/ServerDBSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/operation/SaveOperations.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.operation;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/operation/TransferOperations.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/operation/TransferOperations.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.operation;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLFetchOps.java
@ -208,6 +208,9 @@ public class SQLFetchOps extends SQLOps implements FetchOperations {

            for (UserInfo userInfo : serverUserInfo) {
                UUID uuid = userInfo.getUuid();
+                if (uuid == null) {
+                    continue;
+                }
                PerServerContainer perServerContainer = perServerContainers.getOrDefault(uuid, new PerServerContainer());
                DataContainer container = perServerContainer.getOrDefault(serverUUID, new DataContainer());
                container.putRawData(PlayerKeys.REGISTERED, userInfo.getRegistered());
--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLSaveOps.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLSaveOps.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.operation;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLTransferOps.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/operation/SQLTransferOps.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.operation;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/processing/ExecStatement.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/processing/ExecStatement.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.processing;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/processing/QueryAllStatement.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/processing/QueryAllStatement.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.processing;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/processing/QueryStatement.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/processing/QueryStatement.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.processing;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/statements/Column.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/statements/Column.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.statements;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/statements/Update.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/statements/Update.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.statements;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/statements/WhereParser.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/statements/WhereParser.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.statements;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/GeoInfoTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/GeoInfoTable.java
@ -20,6 +20,8 @@ import com.djrapitops.plugin.task.RunnableFactory;
 import com.djrapitops.plugin.utilities.Verify;

 import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.security.NoSuchAlgorithmException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@ -100,7 +102,7 @@ public class GeoInfoTable extends UserIDTable {
                                            continue;
                                        }
                                        GeoInfo updatedInfo = new GeoInfo(
-                                                geoInfo.getIp(),
+                                                InetAddress.getByName(geoInfo.getIp()),
                                                geoInfo.getGeolocation(),
                                                geoInfo.getDate()
                                        );
@ -108,7 +110,7 @@ public class GeoInfoTable extends UserIDTable {
                                        statement.setString(2, updatedInfo.getIpHash());
                                        statement.setString(3, geoInfo.getIp());
                                        statement.addBatch();
-                                    } catch (UnsupportedEncodingException | NoSuchAlgorithmException e) {
+                                    } catch (UnknownHostException | UnsupportedEncodingException | NoSuchAlgorithmException e) {
                                        if (Settings.DEV_MODE.isTrue()) {
                                            Log.toLog(this.getClass(), e);
                                        }
--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/ServerTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/ServerTable.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.tables;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/TransferTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/TransferTable.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.tables;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/UserInfoTable.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.tables;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/move/BatchOperationTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/move/BatchOperationTable.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.tables.move;

--- a/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/move/Version8TransferTable.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/database/databases/sql/tables/move/Version8TransferTable.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.database.databases.sql.tables.move;

--- a/Plan/src/main/java/com/djrapitops/plan/system/file/FileSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/file/FileSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.file;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/BungeeInfoSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/BungeeInfoSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/InfoSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/InfoSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/ServerInfoSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/ServerInfoSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/BungeeConnectionSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/BungeeConnectionSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionLog.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionLog.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionOut.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionOut.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/InfoRequestPageHandler.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/InfoRequestPageHandler.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ServerConnectionSystem.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/ServerConnectionSystem.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/connection/WebExceptionLogger.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/connection/WebExceptionLogger.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.connection;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheAnalysisPageRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheAnalysisPageRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheInspectPageRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheInspectPageRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheInspectPluginsTabRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheInspectPluginsTabRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheNetworkPageContentRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheNetworkPageContentRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/CacheRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/CheckConnectionRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/CheckConnectionRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateAnalysisPageRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateAnalysisPageRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateInspectPageRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateInspectPageRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateInspectPluginsTabRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateInspectPluginsTabRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateNetworkPageContentRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateNetworkPageContentRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/GenerateRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequestWithVariables.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/InfoRequestWithVariables.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/SaveDBSettingsRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/SaveDBSettingsRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/SendDBSettingsRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/SendDBSettingsRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/SetupRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/SetupRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/UpdateCancelRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/UpdateCancelRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/UpdateRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/UpdateRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/request/WideRequest.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/request/WideRequest.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.request;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/server/BukkitServerInfo.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/server/BukkitServerInfo.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.server;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/server/BungeeServerInfo.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/server/BungeeServerInfo.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.server;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/server/Server.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/server/Server.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.server;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/server/ServerInfo.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/server/ServerInfo.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.server;

--- a/Plan/src/main/java/com/djrapitops/plan/system/info/server/ServerInfoFile.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/info/server/ServerInfoFile.java
@ -1,6 +1,6 @@
 /*
- * Licence is provided in the jar as license.yml also here:
- * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
+ * License is provided in the jar as LICENSE also here:
+ * https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/LICENSE
 */
 package com.djrapitops.plan.system.info.server;

--- a/Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java
+++ b/Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java
@ -17,6 +17,7 @@ import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;

+import java.net.InetAddress;
 import java.util.UUID;

 /**
@ -88,7 +89,7 @@ public class PlayerOnlineListener implements Listener {
        String world = player.getWorld().getName();
        String gm = player.getGameMode().name();

-        String ip = player.getAddress().getAddress().getHostAddress();
+        InetAddress address = player.getAddress().getAddress();

        String playerName = player.getName();
        String displayName = player.getDisplayName();
@ -97,7 +98,7 @@ public class PlayerOnlineListener implements Listener {

        Processing.submit(
                new RegisterProcessor(uuid, player.getFirstPlayed(), playerName,
-                        new IPUpdateProcessor(uuid, ip, time),
+                        new IPUpdateProcessor(uuid, address, time),
                        new NameProcessor(uuid, playerName, displayName),
                        new PlayerPageUpdateProcessor(uuid)
                )
--- a/Show More
+++ b/Show More