From 1c415c05119b05d480f8d3456bb0a20f4526d39a Mon Sep 17 00:00:00 2001 From: Jules Date: Wed, 19 Jun 2024 20:44:48 -0700 Subject: [PATCH] Fixed player attribute data not loading from SQL database --- MMOCore-API/pom.xml | 26 +++++++++++++++++++ .../player/attribute/PlayerAttributes.java | 4 +-- .../mmocore/api/quest/PlayerQuests.java | 4 +-- .../mmocore/api/util/MMOCoreUtils.java | 4 +-- .../mmocore/experience/PlayerProfessions.java | 4 +-- .../mmocore/manager/MMOLoadManager.java | 2 +- .../data/sql/MMOCoreDataSynchronizer.java | 6 ++++- .../data/sql/PlayerDataTableUpdater.java | 4 +-- .../manager/data/sql/SQLDataHandler.java | 8 +++--- .../compat/MythicDungeonsPartyModule.java | 2 +- MMOCore-Dist/pom.xml | 7 +++++ 11 files changed, 53 insertions(+), 18 deletions(-) diff --git a/MMOCore-API/pom.xml b/MMOCore-API/pom.xml index 775bd894..e8c0aa80 100644 --- a/MMOCore-API/pom.xml +++ b/MMOCore-API/pom.xml @@ -123,6 +123,21 @@ 1.20.6-R0.1-SNAPSHOT provided true + + + + com.google.code.gson + gson + + + + + + commons-lang + commons-lang + 2.6 + provided + true @@ -182,6 +197,17 @@ worldguard-bukkit 7.0.2-SNAPSHOT provided + + + + org.bukkit + bukkit + + + com.google.code.gson + gson + + diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttributes.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttributes.java index e7fadf5f..5d6daf78 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttributes.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttributes.java @@ -1,11 +1,11 @@ package net.Indyuce.mmocore.api.player.attribute; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.UtilityMethods; import io.lumine.mythic.lib.api.player.EquipmentSlot; import io.lumine.mythic.lib.api.stat.StatInstance; +import io.lumine.mythic.lib.gson.JsonElement; +import io.lumine.mythic.lib.gson.JsonObject; import io.lumine.mythic.lib.player.modifier.ModifierSource; import io.lumine.mythic.lib.player.modifier.ModifierType; import io.lumine.mythic.lib.util.Closeable; diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java index 1fa192ee..815e7ff8 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java @@ -1,8 +1,8 @@ package net.Indyuce.mmocore.api.quest; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.gson.JsonElement; +import io.lumine.mythic.lib.gson.JsonObject; import io.lumine.mythic.lib.util.Closeable; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java index d2156e76..efead5b0 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java @@ -1,9 +1,9 @@ package net.Indyuce.mmocore.api.util; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.UtilityMethods; +import io.lumine.mythic.lib.gson.JsonArray; +import io.lumine.mythic.lib.gson.JsonObject; import io.lumine.mythic.lib.hologram.Hologram; import io.lumine.mythic.lib.version.VEnchantment; import net.Indyuce.mmocore.MMOCore; diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/PlayerProfessions.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/PlayerProfessions.java index d3e8f7c3..c52fc838 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/PlayerProfessions.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/experience/PlayerProfessions.java @@ -1,9 +1,9 @@ package net.Indyuce.mmocore.experience; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; import io.lumine.mythic.lib.MythicLib; import io.lumine.mythic.lib.UtilityMethods; +import io.lumine.mythic.lib.gson.JsonElement; +import io.lumine.mythic.lib.gson.JsonObject; import io.lumine.mythic.lib.version.VParticle; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.ConfigMessage; diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java index b0a56770..9a969858 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.manager; -import com.google.gson.JsonParseException; import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.gson.JsonParseException; import net.Indyuce.mmocore.experience.source.type.ExperienceSource; import net.Indyuce.mmocore.api.block.BlockType; import net.Indyuce.mmocore.api.load.DefaultMMOLoader; diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java index 3335bf49..77408bc6 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/MMOCoreDataSynchronizer.java @@ -127,7 +127,11 @@ public class MMOCoreDataSynchronizer extends SQLDataSynchronizer { } private boolean isEmpty(@Nullable String str) { - return str == null || str.equalsIgnoreCase("null") || str.equalsIgnoreCase("{}") || str.equalsIgnoreCase("[]") || str.equalsIgnoreCase(""); + return str == null + || str.isEmpty() + || str.equalsIgnoreCase("null") + || str.equals("{}") + || str.equals("[]"); } @Override diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/PlayerDataTableUpdater.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/PlayerDataTableUpdater.java index 2088093e..430701cc 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/PlayerDataTableUpdater.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/PlayerDataTableUpdater.java @@ -1,8 +1,8 @@ package net.Indyuce.mmocore.manager.data.sql; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; import io.lumine.mythic.lib.data.sql.SQLDataSource; +import io.lumine.mythic.lib.gson.JsonArray; +import io.lumine.mythic.lib.gson.JsonObject; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.data.yaml.YAMLPlayerDataHandler; diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/SQLDataHandler.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/SQLDataHandler.java index e8bed1b3..77e1e3c7 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/SQLDataHandler.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/sql/SQLDataHandler.java @@ -1,20 +1,18 @@ package net.Indyuce.mmocore.manager.data.sql; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; import io.lumine.mythic.lib.UtilityMethods; import io.lumine.mythic.lib.data.sql.SQLDataSource; import io.lumine.mythic.lib.data.sql.SQLSynchronizedDataHandler; +import io.lumine.mythic.lib.gson.JsonArray; +import io.lumine.mythic.lib.gson.JsonObject; import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.manager.data.OfflinePlayerData; import net.Indyuce.mmocore.api.player.PlayerData; -import net.Indyuce.mmocore.api.player.profess.PlayerClass; import net.Indyuce.mmocore.api.player.profess.SavedClassInformation; +import net.Indyuce.mmocore.manager.data.OfflinePlayerData; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.sql.SQLException; -import java.util.List; import java.util.UUID; import java.util.stream.Collectors; diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/party/compat/MythicDungeonsPartyModule.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/party/compat/MythicDungeonsPartyModule.java index dcecd232..f5bcea97 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/party/compat/MythicDungeonsPartyModule.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/party/compat/MythicDungeonsPartyModule.java @@ -5,7 +5,7 @@ import net.Indyuce.mmocore.party.AbstractParty; import net.Indyuce.mmocore.party.PartyModule; import net.playavalon.mythicdungeons.api.MythicDungeonsService; import net.playavalon.mythicdungeons.player.party.partysystem.MythicParty; -import org.apache.commons.lang3.Validate; +import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.Listener; diff --git a/MMOCore-Dist/pom.xml b/MMOCore-Dist/pom.xml index e3d42007..369687f6 100644 --- a/MMOCore-Dist/pom.xml +++ b/MMOCore-Dist/pom.xml @@ -78,6 +78,13 @@ 1.20.6-R0.1-SNAPSHOT provided true + + + + com.google.code.gson + gson + +