Change /ea message layout, make /ea not usable by muted players, make /ea not usable without content and fix hub forcefield for event mod
This commit is contained in:
parent
e2b43bb995
commit
4652b09f78
|
@ -42,7 +42,13 @@ public class ForcefieldManager extends MiniPlugin
|
||||||
|
|
||||||
for (Player player : UtilServer.getPlayers())
|
for (Player player : UtilServer.getPlayers())
|
||||||
{
|
{
|
||||||
if (Manager.getPreferences().get(player).isActive(Preference.FORCE_FIELD) && (Manager.GetClients().Get(player).GetRank().has(Rank.ADMIN) || Manager.GetClients().Get(player).GetRank() == Rank.JNR_DEV || Manager.GetClients().Get(player).GetRank() == Rank.YOUTUBE || Manager.GetClients().Get(player).GetRank() == Rank.TWITCH || Manager.GetClients().Get(player).GetRank() == Rank.YOUTUBE_SMALL))
|
if (Manager.getPreferences().get(player).isActive(Preference.FORCE_FIELD) &&
|
||||||
|
(Manager.GetClients().Get(player).GetRank().has(Rank.ADMIN) ||
|
||||||
|
Manager.GetClients().Get(player).GetRank() == Rank.JNR_DEV ||
|
||||||
|
Manager.GetClients().Get(player).GetRank() == Rank.EVENT_MODERATOR ||
|
||||||
|
Manager.GetClients().Get(player).GetRank() == Rank.YOUTUBE ||
|
||||||
|
Manager.GetClients().Get(player).GetRank() == Rank.TWITCH ||
|
||||||
|
Manager.GetClients().Get(player).GetRank() == Rank.YOUTUBE_SMALL))
|
||||||
{
|
{
|
||||||
for (Player other : UtilServer.getPlayers())
|
for (Player other : UtilServer.getPlayers())
|
||||||
{
|
{
|
||||||
|
@ -56,7 +62,9 @@ public class ForcefieldManager extends MiniPlugin
|
||||||
if (UtilMath.offset(other, player) > range)
|
if (UtilMath.offset(other, player) > range)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (Manager.GetClients().Get(other).GetRank().has(Rank.ADMIN) || Manager.GetClients().Get(other).GetRank() == Rank.JNR_DEV)
|
if (Manager.GetClients().Get(other).GetRank().has(Rank.ADMIN) ||
|
||||||
|
Manager.GetClients().Get(other).GetRank() == Rank.JNR_DEV ||
|
||||||
|
Manager.GetClients().Get(other).GetRank() == Rank.EVENT_MODERATOR)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (Recharge.Instance.use(other, "Forcefield Bump", 500, false, false))
|
if (Recharge.Instance.use(other, "Forcefield Bump", 500, false, false))
|
||||||
|
|
|
@ -58,6 +58,7 @@ import mineplex.core.gadget.types.Gadget;
|
||||||
import mineplex.core.gadget.types.GadgetType;
|
import mineplex.core.gadget.types.GadgetType;
|
||||||
import mineplex.core.give.Give;
|
import mineplex.core.give.Give;
|
||||||
import mineplex.core.mount.Mount;
|
import mineplex.core.mount.Mount;
|
||||||
|
import mineplex.core.punish.PunishClient;
|
||||||
import mineplex.core.updater.UpdateType;
|
import mineplex.core.updater.UpdateType;
|
||||||
import mineplex.core.updater.event.UpdateEvent;
|
import mineplex.core.updater.event.UpdateEvent;
|
||||||
|
|
||||||
|
@ -643,7 +644,7 @@ public class EventModule extends MiniPlugin
|
||||||
{
|
{
|
||||||
_keepInventory = !_keepInventory;
|
_keepInventory = !_keepInventory;
|
||||||
|
|
||||||
UtilPlayer.message(player, F.main("Settings", "BlockBreakCreative: " + F.tf(_keepInventory)));
|
UtilPlayer.message(player, F.main("Settings", "KeepInventory: " + F.tf(_keepInventory)));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void commandGameKit(Player player, String[] args)
|
public void commandGameKit(Player player, String[] args)
|
||||||
|
@ -683,7 +684,16 @@ public class EventModule extends MiniPlugin
|
||||||
|
|
||||||
public void commandEventChat(Player player, String[] args)
|
public void commandEventChat(Player player, String[] args)
|
||||||
{
|
{
|
||||||
String message = ChatColor.BLUE + "[Event Chat] " + ChatColor.GREEN + player.getName() + ": " + F.combine(args, 1, null, false);
|
if (args.length == 1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
PunishClient client = Manager.getPunishments().GetClient(player.getName());
|
||||||
|
if (client != null && (client.IsBanned() || client.IsMuted()))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String message = ChatColor.YELLOW + "Event Chat " + ChatColor.YELLOW + ChatColor.BOLD + player.getName() + " " + ChatColor.RESET + ChatColor.GOLD + F.combine(args, 1, null, false);
|
||||||
UtilPlayer.message(player, message);
|
UtilPlayer.message(player, message);
|
||||||
for (Player other : UtilServer.getPlayers())
|
for (Player other : UtilServer.getPlayers())
|
||||||
{
|
{
|
||||||
|
@ -710,6 +720,7 @@ public class EventModule extends MiniPlugin
|
||||||
|
|
||||||
Manager.GetGame().SetPlayerState(target, PlayerState.IN);
|
Manager.GetGame().SetPlayerState(target, PlayerState.IN);
|
||||||
Manager.GetGame().RespawnPlayer(target);
|
Manager.GetGame().RespawnPlayer(target);
|
||||||
|
Manager.GetGame().GetScoreboard().setPlayerTeam(target, Manager.GetGame().GetTeam(target));
|
||||||
UtilPlayer.message(target, F.main("Game", "You have been Respawned!"));
|
UtilPlayer.message(target, F.main("Game", "You have been Respawned!"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue