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

DMT no longer effected by 3s chat delay

Browse Source 
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
This commit is contained in:
Cheese 2015-06-20 11:12:24 +10:00
parent 13ae7a19db
commit 2c43dc76c9
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
View File

@ -14,12 +14,11 @@ public enum Rank
ADMIN("Admin", ChatColor.RED), ADMIN("Admin", ChatColor.RED),
SNR_MODERATOR("Sr.Mod", ChatColor.GOLD), SNR_MODERATOR("Sr.Mod", ChatColor.GOLD),
MODERATOR("Mod", ChatColor.GOLD), MODERATOR("Mod", ChatColor.GOLD),
JNR_DEV("Jr.Dev", ChatColor.GOLD), JNR_DEV("Jr.Dev", ChatColor.RED),
HELPER("Trainee", ChatColor.DARK_AQUA), HELPER("Trainee", ChatColor.DARK_AQUA),
MAPLEAD("MapLead", ChatColor.DARK_PURPLE), MAPLEAD("MapLead", ChatColor.DARK_PURPLE),
MAPDEV("Builder", ChatColor.BLUE), MAPDEV("Builder", ChatColor.BLUE),
EVENT("Event", ChatColor.WHITE), EVENT("Event", ChatColor.WHITE),
//Staff ^^ //Staff ^^

9
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
View File

@ -58,6 +58,7 @@ public class Chat extends MiniPlugin
private int _chatSlow = 0; private int _chatSlow = 0;
private long _silenced = 0; private long _silenced = 0;
private boolean _threeSecondDelay = true;
private HashMap<UUID, MessageData> _playerLastMessage = new HashMap<UUID, MessageData>(); private HashMap<UUID, MessageData> _playerLastMessage = new HashMap<UUID, MessageData>();
@ -302,7 +303,8 @@ public class Chat extends MiniPlugin
event.setCancelled(true); event.setCancelled(true);
return; 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)) !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."); 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()); _playerLastMessage.remove(event.getPlayer().getUniqueId());
} }
public void setThreeSecondDelay(boolean b)
{
_threeSecondDelay = b;
}
} }

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/Draw.java
View File

@ -123,6 +123,8 @@ public class Draw extends SoloGame
new KeenEyeStatTracker(this), new KeenEyeStatTracker(this),
new PureLuckStatTracker(this) new PureLuckStatTracker(this)
); );
Manager.GetChat().setThreeSecondDelay(false);
} }
@Override @Override

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
View File

@ -243,10 +243,10 @@ public class MineStrike extends TeamGame
new String[] new String[]
{ {
C.cAqua + "SWAT" + C.cWhite + " Defend the Bomb Sites", 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 + " 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); _shopManager = new ShopManager(this);

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java
View File

@ -160,6 +160,7 @@ public class GameCreationManager implements Listener
// Manager.GetAntiStack().SetEnabled(true); // Manager.GetAntiStack().SetEnabled(true);
Manager.getCosmeticManager().setHideParticles(false); Manager.getCosmeticManager().setHideParticles(false);
Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.CustomWeaponName); Manager.GetDamage().GetCombatManager().setUseWeaponName(AttackReason.CustomWeaponName);
Manager.GetChat().setThreeSecondDelay(true);
HashMap<String, ChatColor> pastTeams = null; HashMap<String, ChatColor> pastTeams = null;