forked from Minecraft/QoL
Added death mute command
parent
55c1c92ea1
commit
1a03c2fc72
|
@ -13,6 +13,7 @@ import xyz.etztech.qol.other.TPSRunnable;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
@MavenLibrary(group = "net.ess3", artifact = "Essentials", version = "2.13.1", repository = "http://repo.ess3.net/content/groups/essentials")
|
@MavenLibrary(group = "net.ess3", artifact = "Essentials", version = "2.13.1", repository = "http://repo.ess3.net/content/groups/essentials")
|
||||||
|
@ -28,6 +29,7 @@ public class QoL extends MavenPlugin {
|
||||||
private Logger log = Logger.getLogger( "Minecraft" );
|
private Logger log = Logger.getLogger( "Minecraft" );
|
||||||
|
|
||||||
private static List<String> mutes = new ArrayList<>();
|
private static List<String> mutes = new ArrayList<>();
|
||||||
|
private static List<UUID> deathMutes = new ArrayList<>();
|
||||||
private static boolean whitelist = false;
|
private static boolean whitelist = false;
|
||||||
private static boolean timeout = false;
|
private static boolean timeout = false;
|
||||||
private static List<String> audits = new ArrayList<>();
|
private static List<String> audits = new ArrayList<>();
|
||||||
|
@ -93,6 +95,8 @@ public class QoL extends MavenPlugin {
|
||||||
this.getCommand("colors").setExecutor(colorsCommand);
|
this.getCommand("colors").setExecutor(colorsCommand);
|
||||||
WorldInfoCommand worldInfoCommand = new WorldInfoCommand(this);
|
WorldInfoCommand worldInfoCommand = new WorldInfoCommand(this);
|
||||||
this.getCommand("worldinfo").setExecutor(worldInfoCommand);
|
this.getCommand("worldinfo").setExecutor(worldInfoCommand);
|
||||||
|
DeathMuteCommand deathMuteCommand = new DeathMuteCommand(this);
|
||||||
|
this.getCommand("deathmute").setExecutor(deathMuteCommand);
|
||||||
|
|
||||||
if (getConfig().getStringList("list").size() > 0) {
|
if (getConfig().getStringList("list").size() > 0) {
|
||||||
ListCommand listCommand = new ListCommand(this);
|
ListCommand listCommand = new ListCommand(this);
|
||||||
|
@ -218,12 +222,16 @@ public class QoL extends MavenPlugin {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void addDeathMute(Player player) {
|
||||||
|
deathMutes.add(player.getUniqueId());
|
||||||
public static boolean hasSM(Player player) {
|
|
||||||
return mutes.contains(player.getUniqueId().toString());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public static boolean hasSM(Player player) { return mutes.contains(player.getUniqueId().toString()); }
|
||||||
|
|
||||||
|
public static boolean hasDeathMute(Player player) { return deathMutes.contains(player.getUniqueId()); }
|
||||||
|
|
||||||
public static void removeSM(Player player) {
|
public static void removeSM(Player player) {
|
||||||
mutes.remove(player.getUniqueId().toString());
|
mutes.remove(player.getUniqueId().toString());
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,56 @@
|
||||||
|
package xyz.etztech.qol.commands;
|
||||||
|
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.command.Command;
|
||||||
|
import org.bukkit.command.CommandExecutor;
|
||||||
|
import org.bukkit.command.CommandSender;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import xyz.etztech.qol.EtzTechUtil;
|
||||||
|
import xyz.etztech.qol.Lang;
|
||||||
|
import xyz.etztech.qol.QoL;
|
||||||
|
|
||||||
|
public class DeathMuteCommand implements CommandExecutor {
|
||||||
|
|
||||||
|
QoL plugin;
|
||||||
|
|
||||||
|
public DeathMuteCommand(QoL paramQoL)
|
||||||
|
{
|
||||||
|
this.plugin = paramQoL;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCommand(CommandSender commandSender, Command command, String s, String[] args) {
|
||||||
|
if (!commandSender.hasPermission("qol.deathmute")) {
|
||||||
|
EtzTechUtil.sms(commandSender, Lang.NO_PERMISSION.getDef());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (args.length < 1) {
|
||||||
|
EtzTechUtil.sms(commandSender, ChatColor.RED + "/dm <player>");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
Player argPlayer = null;
|
||||||
|
for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
|
||||||
|
if (onlinePlayer.getName().equalsIgnoreCase(args[0])) {
|
||||||
|
argPlayer = onlinePlayer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (argPlayer == null) {
|
||||||
|
EtzTechUtil.sms(commandSender, ChatColor.RED + "No player found.");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
final Player player = argPlayer;
|
||||||
|
|
||||||
|
|
||||||
|
EtzTechUtil.sms(commandSender, ChatColor.GREEN + "Death Muting " + ChatColor.YELLOW +
|
||||||
|
player.getName());
|
||||||
|
|
||||||
|
QoL.addDeathMute(player);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -26,16 +26,19 @@ public class DeathListener implements Listener {
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onDeath(PlayerDeathEvent event) {
|
public void onDeath(PlayerDeathEvent event) {
|
||||||
String message = event.getDeathMessage();
|
String message = event.getDeathMessage();
|
||||||
|
|
||||||
event.setDeathMessage("");
|
event.setDeathMessage("");
|
||||||
|
|
||||||
Location location = event.getEntity().getLocation();
|
if (!plugin.hasDeathMute(event.getEntity().getPlayer())) {
|
||||||
String coords = StringUtils.join(Arrays.asList(location.getBlockX(), location.getBlockY(), location.getBlockZ()), ", ");
|
Location location = event.getEntity().getLocation();
|
||||||
|
String coords = StringUtils.join(Arrays.asList(location.getBlockX(), location.getBlockY(), location.getBlockZ()), ", ");
|
||||||
|
|
||||||
TextComponent newMessage = new TextComponent(message);
|
TextComponent newMessage = new TextComponent(message);
|
||||||
newMessage.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Location: " + coords).create()));
|
newMessage.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Location: " + coords).create()));
|
||||||
|
|
||||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
player.spigot().sendMessage(newMessage);
|
player.spigot().sendMessage(newMessage);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,6 +33,9 @@ commands:
|
||||||
shadowmute:
|
shadowmute:
|
||||||
description: Shadow Mute command
|
description: Shadow Mute command
|
||||||
aliases: [sm]
|
aliases: [sm]
|
||||||
|
deathmute:
|
||||||
|
description: Death mute command
|
||||||
|
aliases: [dm]
|
||||||
whitelist:
|
whitelist:
|
||||||
description: Whitelist command
|
description: Whitelist command
|
||||||
timeout:
|
timeout:
|
||||||
|
@ -65,6 +68,9 @@ permissions:
|
||||||
qol.shadowmute:
|
qol.shadowmute:
|
||||||
description: Ability to use the Shadow Mute command
|
description: Ability to use the Shadow Mute command
|
||||||
default: op
|
default: op
|
||||||
|
qol.deathmute:
|
||||||
|
description: Ability to use the Death Mute command
|
||||||
|
default: op
|
||||||
qol.auditable:
|
qol.auditable:
|
||||||
description: Audits command usage
|
description: Audits command usage
|
||||||
default: op
|
default: op
|
||||||
|
|
Loading…
Reference in New Issue