Skip to content

Commit

Permalink
Renamed and improved permission nodes
Browse files Browse the repository at this point in the history
  • Loading branch information
Lloyd26 committed Jul 14, 2021
1 parent 8584449 commit 982d573
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions src/main/java/me/lloyd26/teleportnotify/commands/tp.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
String targetName = target.getName();
player.teleport(target.getLocation());
player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("messages.commands.tp.1player.player").replace("%target%", targetName)));
if (target.hasPermission("tpnotify.notify.admin")) {
if (target.hasPermission("tpnotify.notify.receive")) {
target.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("messages.commands.tp.1player.target").replace("%player%", sender.getName())));
}
if (player.hasPermission("tpnotify.notify.admin")) {
if (player.hasPermission("tpnotify.notify.notify")) {
for (Player p : Bukkit.getOnlinePlayers()) {
if (p.hasPermission("tpnotify.notify.admin")) {
if (p.hasPermission("tpnotify.notify.receive")) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("messages.commands.tp.1player.staff").replace("%player%", sender.getName()).replace("%target%", targetName)));
}
}
Expand All @@ -51,9 +51,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
sender.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("messages.commands.tp.2player.player").replace("%player1%", player1Name).replace("%player2%", player2Name)));
playerToSend.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("messages.commands.tp.2player.player1").replace("%player2%", player2Name).replace("%player%", (sender instanceof ConsoleCommandSender ? Utils.getConsoleName() : sender.getName()))));
target.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("messages.commands.tp.2player.player2").replace("%player1%", player1Name).replace("%player%", (sender instanceof ConsoleCommandSender ? Utils.getConsoleName() : sender.getName()))));
if (sender.hasPermission("tpnotify.notify.admin")) {
if (sender.hasPermission("tpnotify.notify.notify")) {
for (Player p : Bukkit.getOnlinePlayers()) {
if (p.hasPermission("tpnotify.notify.admin")) {
if (p.hasPermission("tpnotify.notify.receive")) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("messages.commands.tp.2player.staff").replace("%player%", (sender instanceof ConsoleCommandSender ? Utils.getConsoleName() : sender.getName())).replace("%player1%", player1Name).replace("%player2%", player2Name)));
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/me/lloyd26/teleportnotify/commands/tphere.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
String targetName = target.getName();
target.teleport(player.getLocation());
player.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("messages.commands.tphere.player").replaceAll("%target%", targetName)));
if (target.hasPermission("tpnotify.notify.admin")) {
if (target.hasPermission("tpnotify.notify.receive")) {
target.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("messages.commands.tphere.target").replaceAll("%player%", playerName)));
}
if (player.hasPermission("tpnotify.notify.admin")) {
if (player.hasPermission("tpnotify.notify.notify")) {
for (Player p : Bukkit.getOnlinePlayers()) {
if (p.hasPermission("tpnotify.notify.admin")) {
if (p.hasPermission("tpnotify.notify.receive")) {
p.sendMessage(ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("messages.commands.tphere.staff").replaceAll("%player%", playerName).replaceAll("%target%", targetName)));
}
}
Expand Down

0 comments on commit 982d573

Please sign in to comment.