Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
This commit is contained in:
commit
cacf736f4f
@ -16,6 +16,7 @@ import mineplex.core.account.CoreClientManager;
|
|||||||
import mineplex.core.common.util.C;
|
import mineplex.core.common.util.C;
|
||||||
import mineplex.core.common.util.UtilGear;
|
import mineplex.core.common.util.UtilGear;
|
||||||
import mineplex.core.common.util.UtilInv;
|
import mineplex.core.common.util.UtilInv;
|
||||||
|
import mineplex.core.common.util.UtilServer;
|
||||||
import mineplex.core.cosmetic.ui.CosmeticShop;
|
import mineplex.core.cosmetic.ui.CosmeticShop;
|
||||||
import mineplex.core.donation.DonationManager;
|
import mineplex.core.donation.DonationManager;
|
||||||
import mineplex.core.gadget.GadgetManager;
|
import mineplex.core.gadget.GadgetManager;
|
||||||
@ -154,6 +155,10 @@ public class CosmeticManager extends MiniPlugin
|
|||||||
public void setActive(boolean b)
|
public void setActive(boolean b)
|
||||||
{
|
{
|
||||||
_showInterface = b;
|
_showInterface = b;
|
||||||
|
|
||||||
|
if (!b)
|
||||||
|
for (Player player : UtilServer.getPlayers())
|
||||||
|
player.getOpenInventory().close();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void disableItemsForGame()
|
public void disableItemsForGame()
|
||||||
|
@ -835,7 +835,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
|||||||
if (getCosmeticManager().isShowingInterface())
|
if (getCosmeticManager().isShowingInterface())
|
||||||
{
|
{
|
||||||
getCosmeticManager().setActive(false);
|
getCosmeticManager().setActive(false);
|
||||||
getCosmeticManager().disableItemsForGame();
|
getCosmeticManager().disableItemsForGame();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user