From 12e8146d34b6d750c4fbb12c3db2f7e1cc5bd973 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Mon, 4 Jul 2022 13:21:55 +0200 Subject: [PATCH] Add column SQL --- .../net/Indyuce/mmocore/gui/AttributeView.java | 3 +-- .../net/Indyuce/mmocore/gui/PlayerStats.java | 2 ++ .../manager/data/mysql/MySQLDataProvider.java | 17 ++++++++++++++++- .../Indyuce/mmocore/party/provided/Party.java | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/Indyuce/mmocore/gui/AttributeView.java b/src/main/java/net/Indyuce/mmocore/gui/AttributeView.java index 6c041919..b63c7f22 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/AttributeView.java +++ b/src/main/java/net/Indyuce/mmocore/gui/AttributeView.java @@ -79,8 +79,7 @@ public class AttributeView extends EditableInventory { StatInfo info = StatInfo.valueOf(buff.getStat()); holders.register("buff_" + buff.getStat().toLowerCase(), info.format(buff.getValue())); holders.register("total_" + buff.getStat().toLowerCase(), info.format(buff.multiply(total).getValue())); - Bukkit.broadcastMessage(info.format(0.34)); - Bukkit.broadcastMessage((new DecimalFormat(null)==null)+""); + }); return holders; diff --git a/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java b/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java index 481c7267..54518f13 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java +++ b/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java @@ -18,6 +18,7 @@ import net.Indyuce.mmocore.experience.Booster; import net.Indyuce.mmocore.experience.Profession; import net.Indyuce.mmocore.party.AbstractParty; import org.apache.commons.lang.Validate; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; @@ -222,6 +223,7 @@ public class PlayerStats extends EditableInventory { ItemStack disp = super.display(inv, n); if (disp.getType() == VersionMaterial.PLAYER_HEAD.toMaterial()) { SkullMeta meta = (SkullMeta) disp.getItemMeta(); + inv.dynamicallyUpdateItem(this, n, disp, current -> { meta.setOwningPlayer(inv.getPlayer()); current.setItemMeta(meta); diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java index f314f318..58766a11 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java @@ -7,6 +7,9 @@ import net.Indyuce.mmocore.manager.data.PlayerDataManager; import net.Indyuce.mmocore.manager.data.yaml.YAMLGuildDataManager; import org.bukkit.configuration.file.FileConfiguration; +import java.sql.SQLException; +import java.util.concurrent.CompletableFuture; + public class MySQLDataProvider extends MMODataSource implements DataProvider { private final MySQLPlayerDataManager playerManager = new MySQLPlayerDataManager(this); private final YAMLGuildDataManager guildManager = new YAMLGuildDataManager(); @@ -42,7 +45,19 @@ getResultAsync("SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA = '" + "experience INT(11) DEFAULT 0,class VARCHAR(20),guild VARCHAR(20),last_login LONG," + "attributes LONGTEXT,professions LONGTEXT,times_claimed LONGTEXT,quests LONGTEXT," + "waypoints LONGTEXT,friends LONGTEXT,skills LONGTEXT,bound_skills LONGTEXT," - + "class_info LONGTEXT,is_saved INT(1), PRIMARY KEY (uuid));"); + + "class_info LONGTEXT, PRIMARY KEY (uuid));");//TODO + + + getResult("SELECT * FROM information_schema.COLUMNS WHERE TABLE_NAME = 'mmocore_playerdata'" + + " AND COLUMN_NAME = 'is_saved'",(result)-> { + try { + if(!result.next()) + executeUpdate("ALTER TABLE mmocore_playerdata ADD is_saved TINYINT"); + } catch (SQLException e) { + throw new RuntimeException(e); + } + + }); } @Override diff --git a/src/main/java/net/Indyuce/mmocore/party/provided/Party.java b/src/main/java/net/Indyuce/mmocore/party/provided/Party.java index 9bc6b2db..1bceebd8 100644 --- a/src/main/java/net/Indyuce/mmocore/party/provided/Party.java +++ b/src/main/java/net/Indyuce/mmocore/party/provided/Party.java @@ -160,6 +160,7 @@ public class Party implements AbstractParty { Request request = new PartyInvite(this, inviter, target); new ConfigMessage("party-invite").addPlaceholders("player", inviter.getPlayer().getName(), "uuid", request.getUniqueId().toString()) .sendAsJSon(target.getPlayer()); + MMOCore.plugin.requestManager.registerRequest(request); }