Merge branch '3.7.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics

Plan/.idea/libraries/Maven__com_djrapitops_abstract_plugin_framework_2_0_3.xml

@@ -1,7 +1,7 @@
 <component name="libraryTable">
   <library name="Maven: com.djrapitops:abstract-plugin-framework:2.0.3">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/../../Abstract-Plugin-Framework/AbstractPluginFramework/target/AbstractPluginFramework.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/abstract-plugin-framework/2.0.3/abstract-plugin-framework-2.0.3.jar!/" />
     </CLASSES>
     <JAVADOC>
       <root url="jar://$MAVEN_REPOSITORY$/com/djrapitops/abstract-plugin-framework/2.0.3/abstract-plugin-framework-2.0.3-javadoc.jar!/" />

Plan/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.djrapitops</groupId>
     <artifactId>Plan</artifactId>
-    <version>3.6.2</version>
+    <version>3.6.3</version>
     <packaging>jar</packaging>
     <repositories>
         <repository>

Plan/src/main/java/com/djrapitops/plan/Plan.java

@@ -259,6 +259,7 @@ public class Plan extends BukkitPlugin<Plan> {
             scheduler.shutdown(); // Schedules the save to shutdown after it has ran the execute method.
         }
 
+        getPluginLogger().endAllDebugs();
         Log.info(Locale.get(Msg.DISABLED).toString());
         Locale.unload();
     }

Plan/src/main/java/com/djrapitops/plan/data/cache/DataCacheHandler.java

@@ -312,7 +312,6 @@ public class DataCacheHandler extends SessionCache {
      * @param uuid Player's UUID
      */
     public void saveCachedData(UUID uuid) {
-        Log.debug(uuid + ": SaveCachedData");
         DBCallableProcessor saveProcessor = data -> {
             data.access();
             data.setClearAfterSave(true);

Plan/src/main/java/com/djrapitops/plan/data/cache/queue/DataCacheProcessQueue.java

@@ -88,7 +88,6 @@ class ProcessConsumer extends Consumer<HandlingInfo> {
             return;
         }
 
-        Log.debug(info.getUuid() + ": Processing type: " + info.getType().name());
         DBCallableProcessor p = data -> {
             if (!info.process(data)) {
                 Log.error("Attempted to process data for wrong uuid: W:" + data.getUuid() + " | R:" + info.getUuid() + " Type:" + info.getType().name());

Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java

@@ -538,6 +538,7 @@ public abstract class SQLDB extends Database {
             return;
         }
         Log.debug("Database", "Save userdata: " + uuid);
+        Benchmark.start("Save Single UserData");
         checkConnection();
         data.access();
         usersTable.saveUserDataInformation(data);
@@ -551,6 +552,7 @@ public abstract class SQLDB extends Database {
         worldTimesTable.saveWorldTimes(userId, data.getWorldTimes().getTimes());
         data.stopAccessing();
         commit();
+        Benchmark.stop("Database", "Save Single UserData");
         setAvailable();
     }
 

Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java

@@ -112,7 +112,7 @@ public class SessionsTable extends Table {
             return;
         }
 
-        Benchmark.start("Save Sessions");
+
         PreparedStatement statement = null;
         try {
             statement = prepareStatement("INSERT INTO " + tableName + " ("
@@ -120,7 +120,6 @@ public class SessionsTable extends Table {
                     + columnSessionStart + ", "
                     + columnSessionEnd
                     + ") VALUES (?, ?, ?)");
-
             for (SessionData session : sessions) {
                 long end = session.getSessionEnd();
                 long start = session.getSessionStart();
@@ -137,7 +136,6 @@ public class SessionsTable extends Table {
             statement.executeBatch();
         } finally {
             close(statement);
-            Benchmark.stop("Database", "Save Sessions");
         }
     }
 

Plan/src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: Plan
 author: Rsl1122
 main: main.java.com.djrapitops.plan.Plan
-version: 3.6.2
+version: 3.6.3
 softdepend:
 - OnTime
 - EssentialsX