diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java index 6a1367617..199c3981a 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/aac/PlayerHackKickListener.java @@ -7,7 +7,7 @@ package com.djrapitops.pluginbridge.plan.aac; import com.djrapitops.plan.system.database.databases.Database; import com.djrapitops.plan.system.database.databases.sql.SQLDB; -import com.djrapitops.plan.system.processing.Processor; +import com.djrapitops.plan.system.processing.Processing; import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plugin.api.utility.log.Log; import me.konsolas.aac.api.AACAPIProvider; @@ -43,7 +43,7 @@ public class PlayerHackKickListener implements Listener { HackObject hackObject = new HackObject(uuid, time, hackType, violations); - Processor.queue(() -> { + Processing.submitNonCritical(() -> { try { new HackerTable((SQLDB) Database.getActive()).insertHackRow(hackObject); } catch (SQLException e) { diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java index f7c623ac3..7f909ada0 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/factions/FactionAccordionCreator.java @@ -55,7 +55,7 @@ public class FactionAccordionCreator { } } - List memberProfiles = players.stream().filter(p -> members.contains(p.getUniqueId())).collect(Collectors.toList()); + List memberProfiles = players.stream().filter(p -> members.contains(p.getUuid())).collect(Collectors.toList()); List sessions = memberProfiles.stream() .map(PlayerProfile::getSessions) diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java index a05a0d258..cbcbb6bb4 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/kingdoms/KingdomAccordionCreator.java @@ -41,7 +41,7 @@ public class KingdomAccordionCreator { int residentsNum = members.size(); List memberProfiles = players.stream() - .filter(p -> members.contains(p.getUniqueId())) + .filter(p -> members.contains(p.getUuid())) .collect(Collectors.toList()); List sessions = memberProfiles.stream() diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/PlayerVersionListener.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/PlayerVersionListener.java index 53bdc97a3..18a4e61ac 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/PlayerVersionListener.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/protocolsupport/PlayerVersionListener.java @@ -8,7 +8,7 @@ package com.djrapitops.pluginbridge.plan.protocolsupport; import com.djrapitops.plan.Plan; import com.djrapitops.plan.system.database.databases.Database; import com.djrapitops.plan.system.database.databases.sql.SQLDB; -import com.djrapitops.plan.system.processing.Processor; +import com.djrapitops.plan.system.processing.Processing; import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.pluginbridge.plan.viaversion.ProtocolTable; import org.bukkit.entity.Player; @@ -40,7 +40,7 @@ public class PlayerVersionListener implements Listener { ProtocolVersion protocolVersion = ProtocolSupportAPI.getProtocolVersion(player); int playerVersion = protocolVersion.getId(); Plan plan = Plan.getInstance(); - Processor.queue(() -> { + Processing.submitNonCritical(() -> { try { new ProtocolTable((SQLDB) Database.getActive()).saveProtocolVersion(uuid, playerVersion); } catch (SQLException e) { diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java index 0ac75367e..9a97d130f 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/towny/TownAccordionCreator.java @@ -55,7 +55,7 @@ public class TownAccordionCreator { } } - List memberProfiles = players.stream().filter(p -> members.contains(p.getUniqueId())).collect(Collectors.toList()); + List memberProfiles = players.stream().filter(p -> members.contains(p.getUuid())).collect(Collectors.toList()); List sessions = memberProfiles.stream() .map(PlayerProfile::getSessions) diff --git a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java index 18f41ec99..44887ac6d 100644 --- a/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java +++ b/PlanPluginBridge/src/main/java/com/djrapitops/pluginbridge/plan/viaversion/PlayerVersionListener.java @@ -7,7 +7,7 @@ package com.djrapitops.pluginbridge.plan.viaversion; import com.djrapitops.plan.system.database.databases.Database; import com.djrapitops.plan.system.database.databases.sql.SQLDB; -import com.djrapitops.plan.system.processing.Processor; +import com.djrapitops.plan.system.processing.Processing; import com.djrapitops.plugin.api.utility.log.Log; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -36,7 +36,7 @@ public class PlayerVersionListener implements Listener { public void onJoin(PlayerJoinEvent event) { UUID uuid = event.getPlayer().getUniqueId(); int playerVersion = viaAPI.getPlayerVersion(uuid); - Processor.queue(() -> { + Processing.submitNonCritical(() -> { try { new ProtocolTable((SQLDB) Database.getActive()).saveProtocolVersion(uuid, playerVersion); } catch (SQLException e) {