diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java index f4d146e8a..727f89b13 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java @@ -4,8 +4,12 @@ import com.google.common.collect.Sets; import mineplex.core.blockrestore.BlockRestore; import mineplex.core.common.Rank; import mineplex.core.common.util.*; +import mineplex.core.disguise.disguises.DisguiseBase; +import mineplex.core.gadget.types.Gadget; +import mineplex.core.gadget.types.GadgetType; import mineplex.core.hologram.Hologram; import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.mount.Mount; import mineplex.core.recharge.Recharge; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; @@ -548,6 +552,13 @@ public abstract class SuperSmash extends Game } } + // Deactivate morph if active + Gadget gadget = Manager.getCosmeticManager().getGadgetManager().getActive(player, GadgetType.MORPH); + if (gadget != null) + { + gadget.disable(player); + } + _playerKit.put(player, kit); if (announce)