diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/MineStrikeSkin.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/MineStrikeSkin.java index 5eba4de8d..787a05a3c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/MineStrikeSkin.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/MineStrikeSkin.java @@ -5,25 +5,25 @@ import org.bukkit.Material; public enum MineStrikeSkin { - P250_Muertos( "P250", "Muertos", Material.INK_SACK, (byte) 3), - CZ75_Auto_Tigris( "CZ75-Auto", "Tigris", Material.CLAY_BRICK, (byte) 0), - Desert_Eagle_Blaze( "Desert Eagle", "Blaze", Material.NETHER_STALK, (byte) 0), - Nova_Koi( "Nova", "Koi", Material.INK_SACK, (byte) 14), - XM1014_Tranquility( "XM1014", "Tranquility", Material.SULPHUR, (byte) 0), - PP_Bizon_Streak( "PP Bizon", "Streak", Material.INK_SACK, (byte) 4), - P90_Asiimov( "P90", "Asiimov", Material.INK_SACK, (byte) 0), - SSG_08_Blood_in_the_Water( "SSG 08", "Blood in the Water", Material.INK_SACK, (byte) 12), - AWP_Asiimov( "AWP", "Asiimov", Material.DIAMOND, (byte) 0), - P2000_Fire_Elemental( "P2000", "Fire Elemental", Material.INK_SACK, (byte) 6), - FAMAS_Pulse( "FAMAS", "Pulse", Material.CLAY_BALL, (byte) 0), - M4A4_Howl( "M4A4", "Howl", Material.INK_SACK, (byte) 11), - Steyr_AUG_Torque( "Steyr AUG", "Torque", Material.BLAZE_ROD, (byte) 0), - Glock_18_Fade( "Glock 18", "Fade", Material.INK_SACK, (byte) 13), - Galil_AR_Eco( "Galil AR", "Eco", Material.INK_SACK, (byte) 10), - AK_47_Vulcan( "AK-47", "Vulcan", Material.INK_SACK, (byte) 7), - SG553_Pulse( "SG553", "Pulse", Material.INK_SACK, (byte) 5), + P250_Muertos( "P250", "P250 Muertos", Material.INK_SACK, (byte) 3), + CZ75_Auto_Tigris( "CZ75-Auto", "CZ75-Auto Tigris", Material.CLAY_BRICK, (byte) 0), + Desert_Eagle_Blaze( "Desert Eagle", "Desert Eagle Blaze", Material.NETHER_STALK, (byte) 0), + Nova_Koi( "Nova", "Nova Koi", Material.INK_SACK, (byte) 14), + XM1014_Tranquility( "XM1014", "XM1014 Tranquility", Material.SULPHUR, (byte) 0), + PP_Bizon_Streak( "PP Bizon", "PP-Bizon Streak", Material.INK_SACK, (byte) 4), + P90_Asiimov( "P90", "P90 Asiimov", Material.INK_SACK, (byte) 0), + SSG_08_Blood_in_the_Water( "SSG 08", "SSG 08 Blood in the Water", Material.INK_SACK, (byte) 12), + AWP_Asiimov( "AWP", "AWP Asiimov", Material.DIAMOND, (byte) 0), + P2000_Fire_Elemental( "P2000", "P2000 Fire Elemental", Material.INK_SACK, (byte) 6), + FAMAS_Pulse( "FAMAS", "FAMAS Pulse", Material.CLAY_BALL, (byte) 0), + M4A4_Howl( "M4A4", "M4A4 Howl", Material.INK_SACK, (byte) 11), + Steyr_AUG_Torque( "Steyr AUG", "Steyr AUG Torque", Material.BLAZE_ROD, (byte) 0), + Glock_18_Fade( "Glock 18", "Glock 18 Fade", Material.INK_SACK, (byte) 9), + Galil_AR_Eco( "Galil AR", "Galil AR Eco", Material.INK_SACK, (byte) 10), + AK_47_Vulcan( "AK-47", "AK-47 Vulcan", Material.INK_SACK, (byte) 7), + SG553_Pulse( "SG553", "SG554 Pulse", Material.INK_SACK, (byte) 5), - Knife_M9_Bayonette_Fade( "Knife", "M9 Bayonette Fade", Material.DIAMOND_SWORD, (byte) 0); + Knife_M9_Bayonette_Fade( "Knife", "M9 Bayonette Fade", Material.DIAMOND_SWORD, (byte) 0); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/wineffect/WinEffectManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/wineffect/WinEffectManager.java index 9df96a478..5c34c7400 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/wineffect/WinEffectManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/wineffect/WinEffectManager.java @@ -2,12 +2,12 @@ package nautilus.game.arcade.wineffect; import java.util.List; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; import mineplex.core.common.util.UtilEnt; +import mineplex.core.common.util.UtilServer; import mineplex.core.gadget.GadgetManager; import mineplex.core.gadget.gadgets.wineffect.WinEffectPodium; import mineplex.core.gadget.types.Gadget; @@ -43,6 +43,12 @@ public class WinEffectManager game.CreatureAllowOverride = true; + for(Player p : UtilServer.getPlayers()) + { + Gadget g = game.getArcadeManager().getCosmeticManager().getGadgetManager().getActive(p, GadgetType.Item); + if(g != null) g.Disable(p); + } + playEffect(); }