From ac0611bdf2f99b8c410ff2f990ea5ae18068bf75 Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Wed, 28 Apr 2021 01:15:46 -0700 Subject: [PATCH] update mcmmo depend --- Docs/BukkitPlugins.md | 2 +- lib | 2 +- pom.xml | 2 +- .../bukkit/commands/mcmmo/McMMOCommand.java | 21 +++++++++---------- .../mcmmo/McMMOEntityProperties.java | 3 ++- .../mcmmo/McMMOLocationProperties.java | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Docs/BukkitPlugins.md b/Docs/BukkitPlugins.md index 69f7df0e1..0996ee8d0 100644 --- a/Docs/BukkitPlugins.md +++ b/Docs/BukkitPlugins.md @@ -15,7 +15,7 @@ Supported Plugins: (And the sources we acquired Jar files from.) - Lib's Disguises (https://www.spigotmc.org/resources/libs-disguises.32453/) - LuckPerms (https://www.spigotmc.org/resources/luckperms-an-advanced-permissions-plugin.28140/) - MagicSpells (https://github.com/TheComputerGeek2/MagicSpells/releases) -- mcMMO (https://papermc.io/ci/job/mcMMO/) +- mcMMO (https://ci.mcmmo.org/job/mcMMO/job/mcMMO/) - MobArena (http://dev.bukkit.org/bukkit-plugins/mobarena/) - MythicMobs (https://www.spigotmc.org/resources/mythicmobs.5702/) - NoCheatPlus (http://ci.md-5.net/job/NoCheatPlus/) diff --git a/lib b/lib index 6210426bb..74aa4a075 160000 --- a/lib +++ b/lib @@ -1 +1 @@ -Subproject commit 6210426bb6bc47cbf9d345af13f8e8dd940ab79f +Subproject commit 74aa4a0750ab1a32ed1061e78c8a4e517513f5fa diff --git a/pom.xml b/pom.xml index 68a65e49b..3942cbd57 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ com.gmail.nossr50.mcMMO mcMMO - 2.1.148-SNAPSHOT + 2.1.197-SNAPSHOT system ${basedir}/lib/mcMMO.jar diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/commands/mcmmo/McMMOCommand.java b/src/main/java/com/denizenscript/depenizen/bukkit/commands/mcmmo/McMMOCommand.java index cdef17c9c..e7727d7bf 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/commands/mcmmo/McMMOCommand.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/commands/mcmmo/McMMOCommand.java @@ -4,10 +4,9 @@ import com.denizenscript.denizencore.objects.Argument; import com.gmail.nossr50.api.ExperienceAPI; import com.gmail.nossr50.api.PartyAPI; -import com.gmail.nossr50.config.Config; import com.gmail.nossr50.config.experience.ExperienceConfig; -import com.gmail.nossr50.database.DatabaseManagerFactory; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; +import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.party.PartyManager; import com.denizenscript.denizen.objects.PlayerTag; import com.denizenscript.denizen.utilities.debugging.Debug; @@ -178,7 +177,7 @@ else if (player != null && player.isOnline() && party != null && PartyManager.ge } } else if (player != null) { - DatabaseManagerFactory.getDatabaseManager().removeUser(player.getName(), player.getUUID()); + mcMMO.getDatabaseManager().removeUser(player.getName(), player.getUUID()); } break; } @@ -224,18 +223,18 @@ else if (player != null) { return; } PrimarySkillType skillType = PrimarySkillType.getSkill(skill.asString()); - boolean isEnabled = Config.getInstance().getHardcoreStatLossEnabled(skillType); + boolean isEnabled = mcMMO.p.getGeneralConfig().getHardcoreStatLossEnabled(skillType); switch (State.valueOf(state.asString().toUpperCase())) { case TOGGLE: { - Config.getInstance().setHardcoreStatLossEnabled(skillType, !isEnabled); + mcMMO.p.getGeneralConfig().setHardcoreStatLossEnabled(skillType, !isEnabled); break; } case TRUE: { - Config.getInstance().setHardcoreStatLossEnabled(skillType, true); + mcMMO.p.getGeneralConfig().setHardcoreStatLossEnabled(skillType, true); break; } case FALSE: { - Config.getInstance().setHardcoreStatLossEnabled(skillType, false); + mcMMO.p.getGeneralConfig().setHardcoreStatLossEnabled(skillType, false); break; } } @@ -246,18 +245,18 @@ else if (player != null) { return; } PrimarySkillType skillType = PrimarySkillType.getSkill(skill.asString()); - boolean isEnabled = Config.getInstance().getHardcoreVampirismEnabled(skillType); + boolean isEnabled = mcMMO.p.getGeneralConfig().getHardcoreVampirismEnabled(skillType); switch (State.valueOf(state.asString().toUpperCase())) { case TOGGLE: { - Config.getInstance().setHardcoreVampirismEnabled(skillType, !isEnabled); + mcMMO.p.getGeneralConfig().setHardcoreVampirismEnabled(skillType, !isEnabled); break; } case TRUE: { - Config.getInstance().setHardcoreVampirismEnabled(skillType, true); + mcMMO.p.getGeneralConfig().setHardcoreVampirismEnabled(skillType, true); break; } case FALSE: { - Config.getInstance().setHardcoreVampirismEnabled(skillType, false); + mcMMO.p.getGeneralConfig().setHardcoreVampirismEnabled(skillType, false); break; } } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/properties/mcmmo/McMMOEntityProperties.java b/src/main/java/com/denizenscript/depenizen/bukkit/properties/mcmmo/McMMOEntityProperties.java index 17b3b3c07..ed79daba4 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/properties/mcmmo/McMMOEntityProperties.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/properties/mcmmo/McMMOEntityProperties.java @@ -7,6 +7,7 @@ import com.denizenscript.denizencore.objects.ObjectTag; import com.denizenscript.denizencore.objects.properties.Property; import com.denizenscript.denizencore.tags.Attribute; +import com.gmail.nossr50.util.compat.layers.persistentdata.MobMetaFlagType; public class McMMOEntityProperties implements Property { @@ -66,7 +67,7 @@ public String getAttribute(Attribute attribute) { // Returns whether the entity is tracked by McMMO as a 'spawned' mob (one from a spawner block or spawn egg). // --> if (attribute.startsWith("is_spawned_mob")) { - return new ElementTag(entity.getBukkitEntity().hasMetadata(mcMMO.entityMetadataKey)) + return new ElementTag(mcMMO.getCompatibilityManager().getPersistentDataLayer().hasMobFlag(MobMetaFlagType.MOB_SPAWNER_MOB, entity.getLivingEntity())) .getAttribute(attribute.fulfill(1)); } } diff --git a/src/main/java/com/denizenscript/depenizen/bukkit/properties/mcmmo/McMMOLocationProperties.java b/src/main/java/com/denizenscript/depenizen/bukkit/properties/mcmmo/McMMOLocationProperties.java index 964ed31b4..bf33d6ff1 100644 --- a/src/main/java/com/denizenscript/depenizen/bukkit/properties/mcmmo/McMMOLocationProperties.java +++ b/src/main/java/com/denizenscript/depenizen/bukkit/properties/mcmmo/McMMOLocationProperties.java @@ -66,7 +66,7 @@ public String getAttribute(Attribute attribute) { // Returns whether the location is tracked by McMMO as a player-placed block (might only apply to certain block types). // --> if (attribute.startsWith("is_placed")) { - return new ElementTag(mcMMO.getPlaceStore().isTrue(location.getBlockX(), location.getBlockY(), location.getBlockZ(), location.getWorld())) + return new ElementTag(mcMMO.getPlaceStore().isTrue(location.getBlock())) .getAttribute(attribute.fulfill(1)); } }