Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-22 04:37:42 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jules' into jules

Browse Source
This commit is contained in:
Jules 2023-05-14 16:35:28 +02:00
commit df5c8e4791
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MMOItems-API/pom.xml
View File

@ -143,7 +143,7 @@
<dependency>
<groupId>net.Indyuce</groupId>
<artifactId>MMOCore-API</artifactId>
<version>1.11.2-SNAPSHOT</version>
<version>1.12-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- MythicEnchants -->

3
MMOItems-API/src/main/java/net/Indyuce/mmoitems/MMOItems.java
View File

@ -86,7 +86,6 @@ public class MMOItems extends JavaPlugin {
private BlockManager blockManager;
private TierManager tierManager;
private SetManager setManager;
private VaultSupport vaultSupport;
private final List<RPGHandler> 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();

9
MMOItems-API/src/main/java/net/Indyuce/mmoitems/comp/mmocore/MMOCoreHook.java
View File

@ -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 {

2
MMOItems-Dist/src/main/resources/plugin.yml
View File

@ -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:

1
pom.xml
View File

@ -16,7 +16,6 @@
<description>A great item solution for your RPG server!!</description>
<properties>
<revision>6.9.2-SNAPSHOT</revision>
<downloadSources>false</downloadSources>
<downloadJavadocs>false</downloadJavadocs>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>