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

Actually check that the player is allowed to have the default kit

Browse Source
This commit is contained in:
Sam 2017-08-10 20:14:57 +01:00
parent b9640a763c
commit 8135ca022c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
View File

@ -114,7 +114,7 @@ public class GamePlayerManager implements Listener
if (kit instanceof ProgressingKit)
{
ProgressingKit progressingKit = (ProgressingKit) kit;
if (progressingKit.isDefault(player.getUniqueId()))
if (progressingKit.canEquipKit(player) && progressingKit.isDefault(player.getUniqueId()))
{
progressingKit.onSelected(player.getUniqueId());
return;

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/ProgressingKitManager.java
View File

@ -302,13 +302,15 @@ public class ProgressingKitManager implements Listener
{
UtilServer.getPlayersCollection().forEach(player ->
{
UUID id = player.getUniqueId();
for (Kit kit : _manager.GetGame().GetKits())
{
//Set default kit
if (kit instanceof ProgressingKit)
{
ProgressingKit progressingKit = (ProgressingKit) kit;
if (progressingKit.isDefault(player.getUniqueId()))
if (progressingKit.canEquipKit(player) && progressingKit.isDefault(id))
{
progressingKit.onSelected(player.getUniqueId());
break;