From 858444992073d3ff37eb78041406332f5813b723 Mon Sep 17 00:00:00 2001 From: lloyddominic26 Date: Wed, 14 Jul 2021 12:57:02 +0800 Subject: [PATCH] Fixed teleported message being sent twice, Renamed and improved permission nodes --- .../teleportnotify/utils/TeleportUtil.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/me/lloyd26/teleportnotify/utils/TeleportUtil.java b/src/main/java/me/lloyd26/teleportnotify/utils/TeleportUtil.java index 68953cf..bcb54db 100644 --- a/src/main/java/me/lloyd26/teleportnotify/utils/TeleportUtil.java +++ b/src/main/java/me/lloyd26/teleportnotify/utils/TeleportUtil.java @@ -171,16 +171,15 @@ public void teleportPlayer() { p.teleport(loc); } } - if (getExecutor().hasPermission("tpnotify.notify.admin")) { - if (getPlayerMessage() != null) getExecutor().sendMessage(ChatColor.translateAlternateColorCodes('&', getPlayerMessage().replace("%coords%", coords))); + if (getPlayerMessage() != null) getExecutor().sendMessage(ChatColor.translateAlternateColorCodes('&', getPlayerMessage().replace("%coords%", coords))); + if (getExecutor().hasPermission("tpnotify.notify.notify")) { if (getPlayer() != null) { - if (getTargetMessage() != null && getPlayer().hasPermission("tpnotify.notify.admin")) { + if (getTargetMessage() != null && getPlayer().hasPermission("tpnotify.notify.receive")) { getPlayer().sendMessage(ChatColor.translateAlternateColorCodes('&', getTargetMessage().replace("%coords%", coords))); } } for (Player p : Bukkit.getOnlinePlayers()) { - if (p.hasPermission("tpnotify.notify.admin")) { - if (!p.getName().equals(getExecutor().getName())) p.sendMessage(ChatColor.translateAlternateColorCodes('&', getTargetMessage().replace("%coords%", coords))); + if (p.hasPermission("tpnotify.notify.receive")) { p.sendMessage(ChatColor.translateAlternateColorCodes('&', getStaffMessage().replace("%coords%", coords))); } } @@ -197,15 +196,15 @@ public void teleportPlayer() { p.teleport(getLocation()); } } - if (getExecutor().hasPermission("tpnotify.notify.admin")) { - if (getPlayerMessage() != null) getExecutor().sendMessage(ChatColor.translateAlternateColorCodes('&', getPlayerMessage())); + if (getPlayerMessage() != null) getExecutor().sendMessage(ChatColor.translateAlternateColorCodes('&', getPlayerMessage())); + if (getExecutor().hasPermission("tpnotify.notify.notify")) { if (getPlayer() != null) { - if (getTargetMessage() != null && getPlayer().hasPermission("tpnotify.notify.admin")) { + if (getTargetMessage() != null && getPlayer().hasPermission("tpnotify.notify.receive")) { getPlayer().sendMessage(ChatColor.translateAlternateColorCodes('&', getTargetMessage())); } } for (Player p : Bukkit.getOnlinePlayers()) { - if (p.hasPermission("tpnotify.notify.admin")) { + if (p.hasPermission("tpnotify.notify.receive")) { if (!p.getName().equals(getExecutor().getName())) p.sendMessage(ChatColor.translateAlternateColorCodes('&', getTargetMessage())); p.sendMessage(ChatColor.translateAlternateColorCodes('&', getStaffMessage())); }