Fixed teleported message being sent twice, Renamed and improved permi…

…ssion nodes
Lloyd26 · Jul 14, 2021 · 8584449 · 8584449
1 parent b388d0d
commit 8584449
Showing 1 changed file with 8 additions and 9 deletions.
diff --git 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()));
                     }