From ed5d18c0dfb5b266fda92ad3c18b1851fb364706 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sat, 15 Aug 2020 18:03:26 -0500
Subject: [PATCH] rip supervanish

---
 .../totalfreedommod/discord/Discord.java      |  10 +-
 src/main/resources/permissions.yml            | 164 +-----------------
 2 files changed, 16 insertions(+), 158 deletions(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
index 777a0bc1..06e82590 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java
@@ -274,13 +274,19 @@ public class Discord extends FreedomService
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event)
     {
-        messageChatChannel("**" + deformat(event.getPlayer().getName()) + " joined the server" + "**");
+        if (!plugin.sl.isVanished(event.getPlayer().getName()))
+        {
+            messageChatChannel("**" + deformat(event.getPlayer().getName()) + " joined the server" + "**");
+        }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerLeave(PlayerQuitEvent event)
     {
-        messageChatChannel("**" + deformat(event.getPlayer().getName()) + " left the server" + "**");
+        if (!plugin.sl.isVanished(event.getPlayer().getName()))
+        {
+            messageChatChannel("**" + deformat(event.getPlayer().getName()) + " left the server" + "**");
+        }
     }
 
     public void messageChatChannel(String message)
diff --git a/src/main/resources/permissions.yml b/src/main/resources/permissions.yml
index 5dcb05f2..325dfea9 100644
--- a/src/main/resources/permissions.yml
+++ b/src/main/resources/permissions.yml
@@ -1,5 +1,6 @@
 #
-# TotalFreedomMod Permissions
+# TotalFreedomMod 5.5 Permissions
+# by ZeroEpoch1969
 #
 
 # Note that every group inherits the previous groups' permissions
@@ -10,146 +11,9 @@
 remove:
   - "voxelsniper"
   - "bending"
-  - "essentials"
-  - "sv"
 
 # Operator permission nodes
 operators:
-  # Essentials
-  - "essentials.afk"
-  - "essentials.afk.message"
-  - "essentials.afk.auto"
-  - "essentials.back"
-  - "essentials.back.*"
-  - "essentials.balance"
-  - "essentials.balance.others"
-  - "essentials.balancetop"
-  - "essentials.bigtree"
-  - "essentials.book"
-  - "essentials.book.title"
-  - "essentials.book.others"
-  - "essentials.commandcooldowns.bypass"
-  - "essentials.compass"
-  - "essentials.condense"
-  - "essentials.createkit"
-  - "essentials.delkit"
-  - "essentials.delwarp"
-  - "essentials.depth"
-  - "essentials.disposal"
-  - "essentials.eco"
-  - "essentials.eco.loan"
-  - "essentials.enderchest"
-  - "essentials.exp"
-  - "essentials.exp.give"
-  - "essentials.exp.others"
-  - "essentials.exp.set"
-  - "essentials.ext"
-  - "essentials.feed"
-  - "essentials.feed.cooldown.bypass"
-  - "essentials.firework"
-  - "essentials.firework.fire"
-  - "essentials.firework.multiple"
-  - "essentials.fly"
-  - "essentials.fly.safelogin"
-  - "essentials.gc"
-  - "essentials.getpos"
-  - "essentials.give"
-  - "essentials.give.item-all"
-  - "essentials.god"
-  - "essentials.god.pvp" # Handled by TFM
-  - "essentials.hat"
-  - "essentials.heal"
-  - "essentials.heal.cooldown.bypass"
-  - "essentials.help"
-  - "essentials.home.compass"
-  - "essentials.home.bed"
-  - "essentials.ignore"
-  - "essentials.item"
-  - "essentials.itemlore"
-  - "essentials.itemdb"
-  - "essentials.itemname"
-  - "essentials.jump"
-  - "essentials.jump.lock"
-  - "essentials.kit"
-  - "essentials.kits.*"
-  - "essentials.beezooka"
-  - "essentials.mail"
-  - "essentials.mail.send"
-  - "essentials.me"
-  - "essentials.more"
-  - "essentials.motd"
-  - "essentials.msg"
-  - "essentials.msgtoggle"
-  - "essentials.near"
-  - "essentials.near.maxexempt"
-  - "essentials.nick"
-  - "essentials.nick.blacklist.bypass"
-  - "essentials.nick.changecolors"
-  - "essentials.nick.changecolors.bypass"
-  - "essentials.nick.rgb"
-  - "essentials.nocommandcost.all"
-  - "essentials.oversizedstacks"
-  - "essentials.pay"
-  - "essentials.pay.multiple"
-  - "essentials.payconfirmtoggle"
-  - "essentials.paytoggle"
-  - "essentials.ping"
-  - "essentials.ptime"
-  - "essentials.pweather"
-  - "essentials.rtoggle"
-  - "essentials.realname"
-  - "essentials.recipe"
-  - "essentials.remove"
-  - "essentials.repair"
-  - "essentials.repair.*"
-  - "essentials.rest"
-  - "essentials.rules"
-  - "essentials.seen"
-  - "essentials.sell"
-  - "essentials.sell.*"
-  - "essentials.home"
-  - "essentials.sethome"
-  - "essentials.sethome.bed"
-  - "essentials.sethome.multiple"
-  - "essentials.sethome.multiple.unlimited"
-  - "essentials.delhome"
-  - "essentials.setwarp"
-  - "essentials.setworth"
-  - "essentials.showkit"
-  - "essentials.skull"
-  - "essentials.skull.*"
-  - "essentials.spawn"
-  - "essentials.spawner"
-  - "essentials.speed"
-  - "essentials.speed.fly"
-  - "essentials.speed.walk"
-  - "essentials.suicide"
-  - "essentials.top"
-  - "essentials.tp"
-  - "essentials.tp.position"
-  - "essentials.tpoffline"
-  - "essentials.tpa"
-  - "essentials.tpacancel"
-  - "essentials.tpaccept"
-  - "essentials.tpahere"
-  - "essentials.tpdeny"
-  - "essentials.tppos"
-  - "essentials.tptoggle"
-  - "essentials.tree"
-  - "essentials.unlimited"
-  - "essentials.unlimited.item-all"
-  - "essentials.unlimited.others"
-  - "essentials.warp"
-  - "essentials.warp.list"
-  - "essentials.whois"
-  - "essentials.workbench"
-  - "essentials.world"
-  - "essentials.worth"
-  - "essentials.signs.*"
-  - "essentials.editsign"
-  - "essentials.editsign.rgb"
-  - "essentials.editsign.color"
-
   # WorldEdit
   - "worldedit.help"
   - "worldedit.history.undo.self"
@@ -196,27 +60,15 @@ master_builders:
   - "voxelsniper.goto"
   - "voxelsniper.brush.*"
 
-# Trial Mod permission nodes
-trial_mods:
+# Super Admin permission nodes
+super_admins:
   - "coreprotect.*"
   - "worldedit.*"
   - "worldguard.*"
   - "bending.*"
-  - "essentials.chat.ignoreexempt"
-  - "essentials.chat.spy"
-  - "essentials.seen.ip"
-  - "essentials.seen.ipsearch"
-  - "essentials.setspawn"
-  - "essentials.socialspy"
-  - "essentials.tphere"
-  - "essentials.tpo"
-  - "essentials.tpohere"
-  - "sv.see"
-  - "sv.toggleitems"
 
-# Mod permission nodes
-mods: []
+# Telnet Admin permission nodes
+telnet_admins: []
 
-# Admin permission nodes
-admins:
-  - "sv.others"
\ No newline at end of file
+# Senior Admin permission nodes
+senior_admins: []
\ No newline at end of file