From c031534b0d1e3b51cf7bbede7a4ebb8d19c21311 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 12 Nov 2021 10:28:13 +0000 Subject: [PATCH] Debugging --- eco-core/core-plugin/build.gradle | 1 - .../com/willfp/eco/spigot/EcoSpigotPlugin.kt | 8 ----- .../eco/spigot/data/BungeeDataListener.kt | 34 ------------------- .../willfp/eco/spigot/data/DataListener.kt | 9 ++++- .../spigot/data/EcoPlayerProfileHandler.kt | 5 --- .../spigot/data/storage/MySQLDataHandler.kt | 21 +++--------- gradle.properties | 2 +- 7 files changed, 14 insertions(+), 66 deletions(-) delete mode 100644 eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/BungeeDataListener.kt diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle index 37e9a260..063d7173 100644 --- a/eco-core/core-plugin/build.gradle +++ b/eco-core/core-plugin/build.gradle @@ -37,7 +37,6 @@ dependencies { compileOnly 'world.bentobox:bentobox:1.17.3-SNAPSHOT' compileOnly 'com.google.guava:guava:31.0.1-jre' compileOnly 'com.iridium:IridiumSkyblock:3.1.2' - compileOnly 'net.md-5:bungeecord-api:1.16-R0.5-SNAPSHOT' // CombatLogX V10 + NewbieHelper Expansion compileOnly 'com.SirBlobman.combatlogx:CombatLogX-API:10.0.0.0-SNAPSHOT' diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt index c725fc14..39f50a0a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt @@ -123,14 +123,6 @@ abstract class EcoSpigotPlugin : EcoPlugin( // Init FIS this.getProxy(FastItemStackFactoryProxy::class.java).create(ItemStack(Material.AIR)).unwrap() - - /* - I'll figure this one out eventually... - - if (Prerequisite.HAS_BUNGEECORD.isMet) { - BungeeDataListener.register() - } - */ } override fun handleDisable() { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/BungeeDataListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/BungeeDataListener.kt deleted file mode 100644 index c98b64a6..00000000 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/BungeeDataListener.kt +++ /dev/null @@ -1,34 +0,0 @@ -package com.willfp.eco.spigot.data - -import com.willfp.eco.core.Eco -import net.md_5.bungee.api.ProxyServer -import net.md_5.bungee.api.event.ServerConnectedEvent -import net.md_5.bungee.api.event.ServerDisconnectEvent -import net.md_5.bungee.api.event.ServerSwitchEvent -import net.md_5.bungee.api.plugin.Listener -import net.md_5.bungee.event.EventHandler - -class BungeeDataListener : Listener { - @EventHandler - fun onConnected(event: ServerConnectedEvent) { - (Eco.getHandler().playerProfileHandler as EcoPlayerProfileHandler).unloadPlayer(event.player.uniqueId) - } - - @EventHandler - fun onDisconnect(event: ServerDisconnectEvent) { - (Eco.getHandler().playerProfileHandler as EcoPlayerProfileHandler).unloadPlayer(event.player.uniqueId) - } - - @EventHandler - fun onSwitch(event: ServerSwitchEvent) { - (Eco.getHandler().playerProfileHandler as EcoPlayerProfileHandler).unloadPlayer(event.player.uniqueId) - } - - companion object { - fun register() { - ProxyServer.getInstance().pluginManager.registerListener( - null, BungeeDataListener() - ) - } - } -} \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/DataListener.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/DataListener.kt index 7b89b200..76590d07 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/DataListener.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/DataListener.kt @@ -5,6 +5,7 @@ import com.willfp.eco.util.PlayerUtils import org.bukkit.event.EventHandler import org.bukkit.event.Listener import org.bukkit.event.player.PlayerJoinEvent +import org.bukkit.event.player.PlayerLoginEvent import org.bukkit.event.player.PlayerQuitEvent class DataListener : Listener { @@ -12,11 +13,17 @@ class DataListener : Listener { fun onLeave(event: PlayerQuitEvent) { PlayerUtils.updateSavedDisplayName(event.player) (Eco.getHandler().playerProfileHandler as EcoPlayerProfileHandler).unloadPlayer(event.player.uniqueId) + Eco.getHandler().ecoPlugin.logger.info("Player ${event.player.name} Quit (Saving)") } @EventHandler fun onJoin(event: PlayerJoinEvent) { - (Eco.getHandler().playerProfileHandler as EcoPlayerProfileHandler).unloadPlayerBlocking(event.player.uniqueId) PlayerUtils.updateSavedDisplayName(event.player) } + + @EventHandler + fun onLogin(event: PlayerLoginEvent) { + (Eco.getHandler().playerProfileHandler as EcoPlayerProfileHandler).unloadPlayer(event.player.uniqueId) + Eco.getHandler().ecoPlugin.logger.info("Player ${event.player.name} Logged In (Saving)") + } } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/EcoPlayerProfileHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/EcoPlayerProfileHandler.kt index bff6e70e..c834affa 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/EcoPlayerProfileHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/EcoPlayerProfileHandler.kt @@ -33,11 +33,6 @@ class EcoPlayerProfileHandler( } fun unloadPlayer(uuid: UUID) { - handler.savePlayer(uuid) - loaded.remove(uuid) - } - - fun unloadPlayerBlocking(uuid: UUID) { handler.saveAllBlocking(listOf(uuid)) loaded.remove(uuid) } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/MySQLDataHandler.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/MySQLDataHandler.kt index 72ddf683..5fcac528 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/MySQLDataHandler.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/data/storage/MySQLDataHandler.kt @@ -9,20 +9,9 @@ import com.willfp.eco.spigot.EcoSpigotPlugin import org.apache.logging.log4j.Level import org.bukkit.NamespacedKey import org.jetbrains.exposed.dao.id.UUIDTable -import org.jetbrains.exposed.sql.BooleanColumnType -import org.jetbrains.exposed.sql.Column -import org.jetbrains.exposed.sql.Database -import org.jetbrains.exposed.sql.DoubleColumnType -import org.jetbrains.exposed.sql.IntegerColumnType -import org.jetbrains.exposed.sql.ResultRow -import org.jetbrains.exposed.sql.SchemaUtils -import org.jetbrains.exposed.sql.VarCharColumnType -import org.jetbrains.exposed.sql.exposedLogger -import org.jetbrains.exposed.sql.insert -import org.jetbrains.exposed.sql.select +import org.jetbrains.exposed.sql.* import org.jetbrains.exposed.sql.transactions.transaction -import org.jetbrains.exposed.sql.update -import java.util.UUID +import java.util.* import java.util.concurrent.Executors @Suppress("UNCHECKED_CAST") @@ -92,7 +81,7 @@ class MySQLDataHandler( } override fun savePlayer(uuid: UUID) { - savePlayer(uuid, async = false) + savePlayer(uuid, true) } override fun saveAll(uuids: Iterable) { @@ -103,11 +92,11 @@ class MySQLDataHandler( override fun saveAllBlocking(uuids: Iterable) { for (uuid in uuids) { - savePlayer(uuid, async = false) + savePlayer(uuid, false) } } - private fun savePlayer(uuid: UUID, async: Boolean = true) { + private fun savePlayer(uuid: UUID, async: Boolean) { val profile = PlayerProfile.load(uuid) transaction { diff --git a/gradle.properties b/gradle.properties index 2b34f6c7..aca4e6b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 6.13.6 +version = 6.13.7 plugin-name = eco \ No newline at end of file