From f41e94a3f4a81bf98b6689a4cc6cc1516762adf0 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 1 Sep 2017 16:57:15 +0100 Subject: [PATCH] Fix compilation errors --- .../arcade/game/games/moba/kit/HeroKit.java | 6 ++++-- .../mineplex/gemhunters/mount/MountModule.java | 18 ------------------ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/kit/HeroKit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/kit/HeroKit.java index 17466df50..232a9c384 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/kit/HeroKit.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/kit/HeroKit.java @@ -11,7 +11,8 @@ import org.bukkit.inventory.PlayerInventory; import com.mojang.authlib.GameProfile; -import mineplex.core.common.Rank; +import mineplex.core.account.permissions.PermissionGroup; +import mineplex.core.account.repository.token.Rank; import mineplex.core.common.skin.SkinData; import mineplex.core.common.util.C; import mineplex.core.common.util.UtilItem; @@ -27,6 +28,7 @@ import mineplex.core.updater.event.UpdateEvent; import mineplex.core.utils.UtilGameProfile; import nautilus.game.arcade.ArcadeManager; +import nautilus.game.arcade.ArcadeManager.Perm; import nautilus.game.arcade.game.games.moba.Moba; import nautilus.game.arcade.game.games.moba.MobaRole; import nautilus.game.arcade.game.games.moba.progression.MobaProgression; @@ -92,7 +94,7 @@ public class HeroKit extends Kit MobaProgression progression = ((Moba) Manager.GetGame()).getProgression(); return _unlockLevel == 0 || Manager.GetDonation().Get(player).ownsUnknownSalesPackage(progression.getPackageName(this)) || - Manager.GetClients().hasRank(player, Rank.MODERATOR) || + Manager.GetClients().Get(player).hasPermission(Perm.KIT_ACCESS) || Manager.hasKitsUnlocked(player) ; } diff --git a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/mount/MountModule.java b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/mount/MountModule.java index 691d4989d..5d673e3f4 100644 --- a/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/mount/MountModule.java +++ b/Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/mount/MountModule.java @@ -22,18 +22,14 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.HorseInventory; import org.bukkit.inventory.ItemStack; -import mineplex.core.Managers; import mineplex.core.MiniClientPlugin; import mineplex.core.ReflectivelyCreateMiniPlugin; -import mineplex.core.command.CommandBase; -import mineplex.core.common.Rank; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilServer; import mineplex.core.disguise.DisguiseManager; import mineplex.core.gadget.GadgetManager; -import mineplex.core.gadget.gadgets.gamemodifiers.GameCosmeticManager; import mineplex.core.gadget.gadgets.gamemodifiers.gemhunters.GemHuntersMountGadget; import mineplex.core.game.GameDisplay; import mineplex.core.recharge.Recharge; @@ -65,20 +61,6 @@ public class MountModule extends MiniClientPlugin _gadget = require(GadgetManager.class); } - @Override - public void addCommands() - { - addCommand(new CommandBase(this, Rank.DEVELOPER, "showmethemounts") - { - - @Override - public void Execute(Player caller, String[] args) - { - Managers.require(GameCosmeticManager.class).getGadgetFrom("Donkey Mount").enable(caller); - } - }); - } - @Override protected MountData addPlayer(UUID uuid) {