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

Only disable costumes

This commit is contained in:
Sam 2017-09-10 23:29:54 +01:00 committed by cnr
parent 134039bf79
commit 52adaf45a2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
View File

@ -1142,8 +1142,7 @@ public class GadgetManager extends MiniPlugin
if (gadget instanceof KitSelectorGadget) if (gadget instanceof KitSelectorGadget)
continue; continue;
for (Player player : UtilServer.getPlayers()) gadget.disableForAll();
gadget.disable(player);
} }
} }
} }

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

@ -1700,7 +1700,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGH)
public void disableGadgetsInGame(GadgetEnableEvent event) public void disableGadgetsInGame(GadgetEnableEvent event)
{ {
if (_game != null && _game.InProgress() && _game.GadgetsDisabled) if (_game != null && _game.InProgress() && _game.GadgetsDisabled && event.getGadget().getGadgetType() == GadgetType.COSTUME)
{ {
event.setShowMessage(false); event.setShowMessage(false);
event.setCancelled(true); event.setCancelled(true);