From 2c43dc76c97fd9e68332505b759d8eacf0039413 Mon Sep 17 00:00:00 2001 From: Cheese Date: Sat, 20 Jun 2015 11:12:24 +1000 Subject: [PATCH] DMT no longer effected by 3s chat delay Minestrike no longer has 'terrorists' Jr.Dev rank up! --- .../src/mineplex/core/common/Rank.java | 3 +-- Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java | 9 ++++++++- .../src/nautilus/game/arcade/game/games/draw/Draw.java | 2 ++ .../game/arcade/game/games/minestrike/MineStrike.java | 4 ++-- .../game/arcade/managers/GameCreationManager.java | 1 + 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java index f993da040..98e95941a 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java @@ -14,12 +14,11 @@ public enum Rank ADMIN("Admin", ChatColor.RED), SNR_MODERATOR("Sr.Mod", ChatColor.GOLD), MODERATOR("Mod", ChatColor.GOLD), - JNR_DEV("Jr.Dev", ChatColor.GOLD), + JNR_DEV("Jr.Dev", ChatColor.RED), HELPER("Trainee", ChatColor.DARK_AQUA), MAPLEAD("MapLead", ChatColor.DARK_PURPLE), MAPDEV("Builder", ChatColor.BLUE), - EVENT("Event", ChatColor.WHITE), //Staff ^^ diff --git a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java index 0cb37a7a5..25510bb10 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java @@ -58,6 +58,7 @@ public class Chat extends MiniPlugin private int _chatSlow = 0; private long _silenced = 0; + private boolean _threeSecondDelay = true; private HashMap _playerLastMessage = new HashMap(); @@ -302,7 +303,8 @@ public class Chat extends MiniPlugin event.setCancelled(true); return; } - else if (_clientManager.Get(sender).GetRank() == Rank.ALL && + else if (_threeSecondDelay && + _clientManager.Get(sender).GetRank() == Rank.ALL && !Recharge.Instance.use(sender, "All Chat Message", 3000, false, false)) { UtilPlayer.message(sender, C.cYellow + "You can only chat once every 3 seconds to prevent spam."); @@ -594,4 +596,9 @@ public class Chat extends MiniPlugin { _playerLastMessage.remove(event.getPlayer().getUniqueId()); } + + public void setThreeSecondDelay(boolean b) + { + _threeSecondDelay = b; + } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java index 309cd2b2f..b5f140d5c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java @@ -123,6 +123,8 @@ public class Draw extends SoloGame new KeenEyeStatTracker(this), new PureLuckStatTracker(this) ); + + Manager.GetChat().setThreeSecondDelay(false); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java index dab3e58da..b1900ffd7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java @@ -243,10 +243,10 @@ public class MineStrike extends TeamGame new String[] { C.cAqua + "SWAT" + C.cWhite + " Defend the Bomb Sites", - C.cAqua + "SWAT" + C.cWhite + " Kill the Terrorists", + C.cAqua + "SWAT" + C.cWhite + " Kill the Bombers", " ", C.cRed + "Bombers" + C.cWhite + " Plant the Bomb at Bomb Site", - C.cRed + "Bombers" + C.cWhite + " Kill the Counter-Terrorists", + C.cRed + "Bombers" + C.cWhite + " Kill the SWAT Team", }); _shopManager = new ShopManager(this); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java index a749ac987..e914a77c2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java @@ -160,6 +160,7 @@ public class GameCreationManager implements Listener // Manager.GetAntiStack().SetEnabled(true); Manager.getCosmeticManager().setHideParticles(false); Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.CustomWeaponName); + Manager.GetChat().setThreeSecondDelay(true); HashMap pastTeams = null;