diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/commands/LockCosmeticsCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/commands/LockCosmeticsCommand.java index 437ee0550..25f03de1d 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/commands/LockCosmeticsCommand.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/commands/LockCosmeticsCommand.java @@ -23,12 +23,12 @@ public class LockCosmeticsCommand extends CommandBase @Override public void Execute(Player caller, String[] args) { - // Adds all cosmetic types + // Removes all cosmetic types if (args.length == 0) { addCosmetics(null, caller); } - // Adds specific type + // Removes specific type else { String type = args[0]; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java index d30557f22..f23533280 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/Bridge.java @@ -1311,12 +1311,12 @@ public class Bridge extends TeamGame implements OreObsfucation return; List drops = new ArrayList(); - + for (Material mat : PLAYER_DROP_DELAY_MATERIALS) { if (event.getBlock().getType() == mat) { - drops.addAll(event.getBlock().getDrops()); + drops.addAll(event.getBlock().getDrops(event.getPlayer().getItemInHand())); break; } } @@ -1327,12 +1327,6 @@ public class Bridge extends TeamGame implements OreObsfucation event.setCancelled(true); event.getBlock().setType(Material.AIR); - if (event.getBlock().getType() == Material.FURNACE || UtilItem.isOre(event.getBlock().getType())) // Can't be broken by fist - { - if (event.getPlayer().getItemInHand() == null || !CraftItemStack.asNMSCopy(event.getPlayer().getItemInHand()).b(CraftMagicNumbers.getBlock((CraftBlock) event.getBlock()))) - return; - } - Location loc = event.getBlock().getLocation().clone().add(.5, .5, .5); for (ItemStack item : drops) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java index 5828ce042..b97739e9f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java @@ -180,8 +180,6 @@ public class Build extends SoloGame this.WorldTimeSet = 6000; - this.PrepareFreeze = false; - this.CreatureAllow = true; this.WorldFireSpread = true; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java index e90c94eec..3f11f4fad 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java @@ -713,7 +713,16 @@ public class TurfForts extends TeamGame { if (((CraftPlayer) player).getHandle().spectating) continue; - + + //Slow + if (_enemyTurf.containsKey(player)) + { + int time = (int) ((System.currentTimeMillis() - _enemyTurf.get(player)) / 2500); + + if (time > 0) + Manager.GetCondition().Factory().Slow("Infiltrator Slow", player, player, 0.9, time - 1, false, false, false, false); + } + Block block = player.getLocation().getBlock().getRelative(BlockFace.DOWN); // Apply velocity even if the player is sneaking near turf edges. @@ -749,15 +758,6 @@ public class TurfForts extends TeamGame byte data = block.getData(); - //Slow - if (_enemyTurf.containsKey(player)) - { - int time = (int) ((System.currentTimeMillis() - _enemyTurf.get(player)) / 2500); - - if (time > 0) - Manager.GetCondition().Factory().Slow("Infiltrator Slow", player, player, 0.9, time - 1, false, false, false, false); - } - //On Enemy Turf if ((team.GetColor() == ChatColor.RED && data == 3) || (team.GetColor() == ChatColor.AQUA && data == 14)) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java index 1e5eb71c5..7e877fba7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java @@ -14,6 +14,7 @@ import mineplex.core.common.util.UtilTextBottom; import mineplex.core.common.util.UtilTime; import mineplex.core.game.GameCategory; import mineplex.core.itemstack.ItemStackFactory; +import mineplex.core.punish.PunishClient; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import nautilus.game.arcade.ArcadeManager; @@ -414,6 +415,11 @@ public class GameHostManager implements Listener return; } + if (Manager.getPunishments().GetClient(event.getPlayer().getName()).IsMuted()) + { + return; + } + String msg = ""; for (int i = 1; i < event.getMessage().split(" ").length; i++) {