Merge pull request #117 from Gadse-KastCraft/premium-vanish-support

More PremiumVanish support

Author: OllieMartin

multichat/src/main/java/xyz/olivermartin/multichat/bungee/Events.java

@@ -13,6 +13,7 @@
 import com.olivermartin410.plugins.TChatInfo;
 import com.olivermartin410.plugins.TGroupChatInfo;
 
+import de.myzelyam.api.vanish.BungeeVanishAPI;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.chat.ComponentBuilder;
@@ -388,7 +389,7 @@ public void onChat(ChatEvent event) {
 
 				DebugManager.log("Does player have simple colour permission? " + (player.hasPermission("multichat.chat.colour.simple")||player.hasPermission("multichat.chat.color.simple")));
 
-				DebugManager.log("Does player have rgb colour permission? " + (player.hasPermission("multichat.chat.colour.rgb")||player.hasPermission("multichat.chat.color.rgb")));
+				DebugManager.log("Does player have rgb colour permission? " + (player.hasPermission("multichat.chat.colour.rgb")||player.hasPermission("multichat.chat.color.rgb")));
 
 				// Let server know players channel preference
 				BungeeComm.sendPlayerChannelMessage(player.getName(), Channel.getChannel(player.getUniqueId()).getName(), Channel.getChannel(player.getUniqueId()), player.getServer().getInfo(), (player.hasPermission("multichat.chat.colour")||player.hasPermission("multichat.chat.color")||player.hasPermission("multichat.chat.colour.simple")||player.hasPermission("multichat.chat.color.simple")), (player.hasPermission("multichat.chat.colour")||player.hasPermission("multichat.chat.color")||player.hasPermission("multichat.chat.colour.rgb")||player.hasPermission("multichat.chat.color.rgb")));
@@ -493,7 +494,12 @@ public void onLogin(PostLoginEvent event) {
 		ConsoleManager.log("Refreshed UUID-Name lookup: " + uuid.toString());
 
 		if ( ConfigManager.getInstance().getHandler("joinmessages.yml").getConfig().getBoolean("showjoin") == true ) {
-
+			
+			// PremiumVanish support, return as early as possible to avoid loading unnecessary resources
+			if (MultiChat.premiumVanish && MultiChat.hideVanishedStaffInJoin && BungeeVanishAPI.isInvisible(player)) {
+				return;
+			}
+			
 			String joinformat = ConfigManager.getInstance().getHandler("joinmessages.yml").getConfig().getString("serverjoin");
 			String silentformat = ConfigManager.getInstance().getHandler("joinmessages.yml").getConfig().getString("silentjoin");
 			String welcomeMessage = ConfigManager.getInstance().getHandler("joinmessages.yml").getConfig().getString("welcome_message");
@@ -515,10 +521,11 @@ public void onLogin(PostLoginEvent event) {
 			if (ConfigManager.getInstance().getHandler("joinmessages.yml").getConfig().contains("private_welcome")) {
 				privateWelcome = ConfigManager.getInstance().getHandler("joinmessages.yml").getConfig().getBoolean("private_welcome");
 			}
-
+			
+			boolean broadcastJoin = !player.hasPermission("multichat.staff.silentjoin");
 			for (ProxiedPlayer onlineplayer : ProxyServer.getInstance().getPlayers()) {
 
-				if (!player.hasPermission("multichat.staff.silentjoin")) {
+				if (broadcastJoin) {
 
 					if (firstJoin && broadcastWelcome) {
 						onlineplayer.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&', welcomeMessage)));

multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java

@@ -97,6 +97,7 @@ public class MultiChat extends Plugin implements Listener {
 	public static boolean premiumVanish = false;
 	public static boolean hideVanishedStaffInMsg = true;
 	public static boolean hideVanishedStaffInStaffList = true;
+	public static boolean hideVanishedStaffInJoin = true;
 
 	public static List<String> legacyServers = new ArrayList<String>();
 
@@ -378,6 +379,7 @@ public void onEnable() {
 				if (configYML.contains("premium_vanish")) {
 					hideVanishedStaffInMsg = configYML.getBoolean("premium_vanish.prevent_message");
 					hideVanishedStaffInStaffList = configYML.getBoolean("premium_vanish.prevent_staff_list");
+					hideVanishedStaffInJoin = configYML.getBoolean("premium_vanish.silence_join");
 				}
 
 			}

multichat/src/main/java/xyz/olivermartin/multichat/bungee/commands/MultiChatCommand.java

@@ -150,16 +150,17 @@ public void execute(CommandSender sender, String[] args) {
 						Channel.getGlobalChannel().addServer(server);
 					}
 
-					// Manage premiumVanish dependency
 					if (ProxyServer.getInstance().getPluginManager().getPlugin("PremiumVanish") != null) {
 						MultiChat.premiumVanish = true;
-						System.out.println("[MultiChat] Hooked with PremiumVanish!");
 
 						if (ConfigManager.getInstance().getHandler("config.yml").getConfig().contains("premium_vanish")) {
-							MultiChat.hideVanishedStaffInMsg = ConfigManager.getInstance().getHandler("config.yml").getConfig().getBoolean("premium_vanish.prevent_message");
-							MultiChat.hideVanishedStaffInStaffList = ConfigManager.getInstance().getHandler("config.yml").getConfig().getBoolean("premium_vanish.prevent_staff_list");
+							MultiChat.hideVanishedStaffInMsg = ConfigManager.getInstance().getHandler("config.yml").getConfig().getSection("premium_vanish").getBoolean("prevent_message");
+							MultiChat.hideVanishedStaffInStaffList = ConfigManager.getInstance().getHandler("config.yml").getConfig().getSection("premium_vanish").getBoolean("prevent_staff_list");
+							MultiChat.hideVanishedStaffInJoin = ConfigManager.getInstance().getHandler("config.yml").getConfig().getSection("premium_vanish").getBoolean("silence_join");
 						}
 
+					} else {
+						MultiChat.premiumVanish = false;
 					}
 
 					MessageManager.sendMessage(sender, "command_multichat_reload_completed");

multichat/src/main/resources/config.yml

@@ -270,6 +270,7 @@ privacy_settings:
 premium_vanish:
     prevent_message: true # Prevent players being able to /msg vanished staff
     prevent_staff_list: true # Prevent vanished staff showing up in /staff
+    silence_join: true # Prevent vanished players sending a join message
 
 # Legacy (PRE-1.16) Servers
 # Listing servers here will mark them as 'LEGACY' servers