diff --git a/MMOItems-API/pom.xml b/MMOItems-API/pom.xml index d6ce2d8f..e4e95adf 100644 --- a/MMOItems-API/pom.xml +++ b/MMOItems-API/pom.xml @@ -143,7 +143,7 @@ net.Indyuce MMOCore-API - 1.11.2-SNAPSHOT + 1.12-SNAPSHOT provided diff --git a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/MMOItems.java b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/MMOItems.java index 42b4aff6..1ad577b7 100644 --- a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/MMOItems.java +++ b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/MMOItems.java @@ -86,7 +86,6 @@ public class MMOItems extends JavaPlugin { private BlockManager blockManager; private TierManager tierManager; private SetManager setManager; - private VaultSupport vaultSupport; private final List rpgPlugins = new ArrayList<>(); @@ -106,6 +105,8 @@ public class MMOItems extends JavaPlugin { @Override public void onLoad() { + getLogger().log(Level.INFO, "Plugin file is called '" + getFile().getName() + "'"); + PluginUtils.isDependencyPresent("WorldEdit", u -> { try { new WorldEditSupport(); diff --git a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mmocore/MMOCoreHook.java b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mmocore/MMOCoreHook.java index 30684005..e2384886 100644 --- a/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mmocore/MMOCoreHook.java +++ b/MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mmocore/MMOCoreHook.java @@ -1,8 +1,8 @@ package net.Indyuce.mmoitems.comp.mmocore; +import io.lumine.mythic.lib.api.event.SynchronizedDataLoadEvent; import io.lumine.mythic.lib.version.VersionMaterial; import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.event.AsyncPlayerDataLoadEvent; import net.Indyuce.mmocore.api.event.PlayerChangeClassEvent; import net.Indyuce.mmocore.api.event.PlayerLevelUpEvent; import net.Indyuce.mmocore.api.event.PlayerResourceUpdateEvent; @@ -84,9 +84,10 @@ public class MMOCoreHook implements RPGHandler, Listener { * Fixes https://gitlab.com/phoenix-dvpmt/mmocore/-/issues/545 */ @EventHandler - public void updateInventoryOnLoad(AsyncPlayerDataLoadEvent event) { - if (PlayerData.has(event.getPlayer())) - PlayerData.get(event.getPlayer()).getInventory().scheduleUpdate(); + public void updateInventoryOnLoad(SynchronizedDataLoadEvent event) { + if (event.getManager().getOwningPlugin().equals(MMOCore.plugin)) + if (PlayerData.has(event.getHolder().getPlayer())) + PlayerData.get(event.getHolder().getPlayer()).getInventory().scheduleUpdate(); } public static class MMOCoreRPGPlayer extends RPGPlayer { diff --git a/MMOItems-Dist/src/main/resources/plugin.yml b/MMOItems-Dist/src/main/resources/plugin.yml index 4ea4cd66..805209c1 100644 --- a/MMOItems-Dist/src/main/resources/plugin.yml +++ b/MMOItems-Dist/src/main/resources/plugin.yml @@ -4,7 +4,7 @@ main: net.Indyuce.mmoitems.MMOItems author: Indyuce description: ${project.description} depend: [MythicLib] -softdepend: [WorldGuard,Residence,BossShopPro,SkillAPI,SkillsPro,MMOCore,MythicMobs,MMOInventory,PlaceholderAPI,Vault,Denizen,AureliumSkills] +softdepend: [WorldGuard,Residence,BossShopPro,SkillAPI,SkillsPro,MMOCore,MMOProfiles,MythicMobs,MMOInventory,PlaceholderAPI,Vault,Denizen,AureliumSkills] api-version: 1.13 commands: mmoitems: diff --git a/README.md b/README.md index cf06835c..3353da1e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Register the PhoenixDevt repo ``` phoenix - https://nexus.phoenixdevt.fr/repository/maven-public/ + https://nexus.phoenixdevt.fr/repository/maven-public/ ``` And then add MMOItems-API as dependency diff --git a/pom.xml b/pom.xml index 6e333949..a6a9b9f3 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,6 @@ A great item solution for your RPG server!! - 6.9.2-SNAPSHOT false false UTF-8