From 5499979567a94aed6ed893d5e6889cb8b44d551d Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Thu, 2 Mar 2023 22:37:02 +0100 Subject: [PATCH 1/3] Debug config de base MMOCore --- MMOCore-Dist/src/main/resources/default/professions/fishing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MMOCore-Dist/src/main/resources/default/professions/fishing.yml b/MMOCore-Dist/src/main/resources/default/professions/fishing.yml index c5972134..80302899 100644 --- a/MMOCore-Dist/src/main/resources/default/professions/fishing.yml +++ b/MMOCore-Dist/src/main/resources/default/professions/fishing.yml @@ -22,7 +22,7 @@ exp-sources: {} on-fish: overriding-drop-table: conditions: - - 'region{name=swamp,second-region}' + - 'region{name="swamp,second-region"}' - 'biome{name=beach}' # When drop table is read, one of these From 2b5932756f30e7d349006b29cdc636777d93ca61 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Fri, 3 Mar 2023 10:27:45 +0100 Subject: [PATCH 2/3] Debug Model Data Skill Tree GUI. --- .../net/Indyuce/mmocore/gui/api/adaptor/ThreeDimAdaptor.java | 2 -- .../java/net/Indyuce/mmocore/gui/api/item/InventoryItem.java | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/adaptor/ThreeDimAdaptor.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/adaptor/ThreeDimAdaptor.java index 605ba6b9..0c713c51 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/adaptor/ThreeDimAdaptor.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/adaptor/ThreeDimAdaptor.java @@ -368,10 +368,8 @@ public class ThreeDimAdaptor extends Adaptor { .getEntityFromID(event.getPlayer().getWorld(), packet.getIntegers().read(0)); if (entity instanceof ArmorStand armorStand) { if (true) { - Bukkit.broadcastMessage("IN"); if (armorStands.values().contains(armorStand)) { - Bukkit.broadcastMessage("CANCEL" + armorStand.getName()); event.setCancelled(true); } } diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryItem.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryItem.java index 87a2f0b5..df1d90f3 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryItem.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryItem.java @@ -146,7 +146,6 @@ public abstract class InventoryItem { Placeholders placeholders = getPlaceholders(inv, n); ItemStack item = new ItemStack(specificMaterial == null ? material : specificMaterial); ItemMeta meta = item.getItemMeta(); - meta.setCustomModelData(modelData); if (texture != null && meta instanceof SkullMeta) applyTexture(texture, (SkullMeta) meta); @@ -163,7 +162,7 @@ public abstract class InventoryItem { } if (MythicLib.plugin.getVersion().isStrictlyHigher(1, 13)) - meta.setCustomModelData(getModelData()); + meta.setCustomModelData(modelData); item.setItemMeta(meta); return item; From 825473c8c69fcc836e715d438966e90d257d57e2 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Fri, 3 Mar 2023 21:59:47 +0100 Subject: [PATCH 3/3] Debug ressources loading. --- .../mmocore/manager/data/yaml/YAMLPlayerDataManager.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java index fb3cde48..eabe5e83 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/manager/data/yaml/YAMLPlayerDataManager.java @@ -44,10 +44,6 @@ public class YAMLPlayerDataManager extends PlayerDataManager { if (config.contains("class")) data.setClass(MMOCore.plugin.classManager.get(config.getString("class"))); - data.setMana(config.contains("mana") ? config.getDouble("mana") : data.getStats().getStat("MAX_MANA")); - data.setStamina(config.contains("stamina") ? config.getDouble("stamina") : data.getStats().getStat("MAX_STAMINA")); - data.setStellium(config.contains("stellium") ? config.getDouble("stellium") : data.getStats().getStat("MAX_STELLIUM")); - if (config.contains("guild")) { Guild guild = provider.getGuildManager().getGuild(config.getString("guild")); data.setGuild(guild.hasMember(data.getUniqueId()) ? guild : null); @@ -117,6 +113,11 @@ public class YAMLPlayerDataManager extends PlayerDataManager { } + //These should be loaded after to make sure that the MAX_MANA, MAX_STAMINA & MAX_STELLIUM stats are already loaded. + data.setMana(config.contains("mana") ? config.getDouble("mana") : data.getStats().getStat("MAX_MANA")); + data.setStamina(config.contains("stamina") ? config.getDouble("stamina") : data.getStats().getStat("MAX_STAMINA")); + data.setStellium(config.contains("stellium") ? config.getDouble("stellium") : data.getStats().getStat("MAX_STELLIUM")); + data.setFullyLoaded(); }