JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation errors

This commit is contained in:
Sam 2017-09-01 16:57:15 +01:00
parent 90d4f9c1f7
commit f41e94a3f4
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/kit/HeroKit.java
View File

@ -11,7 +11,8 @@ import org.bukkit.inventory.PlayerInventory;
import com.mojang.authlib.GameProfile; 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.skin.SkinData;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilItem; import mineplex.core.common.util.UtilItem;
@ -27,6 +28,7 @@ import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.utils.UtilGameProfile; import mineplex.core.utils.UtilGameProfile;
import nautilus.game.arcade.ArcadeManager; 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.Moba;
import nautilus.game.arcade.game.games.moba.MobaRole; import nautilus.game.arcade.game.games.moba.MobaRole;
import nautilus.game.arcade.game.games.moba.progression.MobaProgression; import nautilus.game.arcade.game.games.moba.progression.MobaProgression;
@ -92,7 +94,7 @@ public class HeroKit extends Kit
MobaProgression progression = ((Moba) Manager.GetGame()).getProgression(); MobaProgression progression = ((Moba) Manager.GetGame()).getProgression();
return _unlockLevel == 0 || return _unlockLevel == 0 ||
Manager.GetDonation().Get(player).ownsUnknownSalesPackage(progression.getPackageName(this)) || 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) Manager.hasKitsUnlocked(player)
; ;
} }

18
Plugins/mineplex-game-gemhunters/src/mineplex/gemhunters/mount/MountModule.java
View File

@ -22,18 +22,14 @@ import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.HorseInventory; import org.bukkit.inventory.HorseInventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import mineplex.core.Managers;
import mineplex.core.MiniClientPlugin; import mineplex.core.MiniClientPlugin;
import mineplex.core.ReflectivelyCreateMiniPlugin; 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.F;
import mineplex.core.common.util.UtilEnt; import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilServer;
import mineplex.core.disguise.DisguiseManager; import mineplex.core.disguise.DisguiseManager;
import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.GadgetManager;
import mineplex.core.gadget.gadgets.gamemodifiers.GameCosmeticManager;
import mineplex.core.gadget.gadgets.gamemodifiers.gemhunters.GemHuntersMountGadget; import mineplex.core.gadget.gadgets.gamemodifiers.gemhunters.GemHuntersMountGadget;
import mineplex.core.game.GameDisplay; import mineplex.core.game.GameDisplay;
import mineplex.core.recharge.Recharge; import mineplex.core.recharge.Recharge;
@ -65,20 +61,6 @@ public class MountModule extends MiniClientPlugin<MountData>
_gadget = require(GadgetManager.class); _gadget = require(GadgetManager.class);
} }
@Override
public void addCommands()
{
addCommand(new CommandBase<MountModule>(this, Rank.DEVELOPER, "showmethemounts")
{
@Override
public void Execute(Player caller, String[] args)
{
Managers.require(GameCosmeticManager.class).getGadgetFrom("Donkey Mount").enable(caller);
}
});
}
@Override @Override
protected MountData addPlayer(UUID uuid) protected MountData addPlayer(UUID uuid)
{ {