From c0bfdd34b73d3839a1b3d8961b00f0da2e1f3621 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 26 Sep 2019 08:50:33 +0100 Subject: [PATCH] And it compiles again! --- .../gmail/nossr50/commands/ChatNotificationToggleCommand.java | 3 +-- src/main/java/com/gmail/nossr50/listeners/EntityListener.java | 2 +- .../com/gmail/nossr50/skills/herbalism/HerbalismManager.java | 4 ++-- src/main/java/com/gmail/nossr50/util/EventManager.java | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/ChatNotificationToggleCommand.java b/src/main/java/com/gmail/nossr50/commands/ChatNotificationToggleCommand.java index 4d36d9e19..9a28acfc7 100644 --- a/src/main/java/com/gmail/nossr50/commands/ChatNotificationToggleCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/ChatNotificationToggleCommand.java @@ -2,7 +2,6 @@ package com.gmail.nossr50.commands; import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.commands.CommandUtils; import com.google.common.collect.ImmutableList; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -21,7 +20,7 @@ public class ChatNotificationToggleCommand implements TabExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if (CommandUtils.noConsoleUsage(sender)) { + if (pluginRef.getCommandTools().noConsoleUsage(sender)) { return true; } diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index 68e7e0bec..09e5736ff 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -287,7 +287,7 @@ public class EntityListener implements Listener { // Don't process this event for marked entities, for players this is handled above, // However, for entities, we do not wanna cancel this event to allow plugins to observe changes // properly - if (defender.getMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY).size() > 0) { + if (defender.getMetadata(MetadataConstants.CUSTOM_DAMAGE_METAKEY).size() > 0) { return; } diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java index e4f6b2720..35f86daff 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -220,8 +220,8 @@ public class HerbalismManager extends SkillManager { public void checkDoubleDropsOnBrokenPlants(Player player, Collection brokenPlants) { //Only proceed if skill unlocked and permission enabled - if (!RankUtils.hasUnlockedSubskill(player, SubSkillType.HERBALISM_DOUBLE_DROPS) - || !Permissions.isSubSkillEnabled(player, SubSkillType.HERBALISM_DOUBLE_DROPS)) { + if (!pluginRef.getRankTools().hasUnlockedSubskill(player, SubSkillType.HERBALISM_DOUBLE_DROPS) + || !pluginRef.getPermissionTools().isSubSkillEnabled(player, SubSkillType.HERBALISM_DOUBLE_DROPS)) { return; } diff --git a/src/main/java/com/gmail/nossr50/util/EventManager.java b/src/main/java/com/gmail/nossr50/util/EventManager.java index 7ec8853bd..4896b9c3c 100644 --- a/src/main/java/com/gmail/nossr50/util/EventManager.java +++ b/src/main/java/com/gmail/nossr50/util/EventManager.java @@ -170,9 +170,9 @@ public class EventManager { return event; } - public static McMMOPlayerProfileLoadEvent callPlayerProfileLoadEvent(Player player, PlayerProfile profile){ + public McMMOPlayerProfileLoadEvent callPlayerProfileLoadEvent(Player player, PlayerProfile profile){ McMMOPlayerProfileLoadEvent event = new McMMOPlayerProfileLoadEvent(player, profile); - mcMMO.p.getServer().getPluginManager().callEvent(event); + pluginRef.getServer().getPluginManager().callEvent(event); return event; }