diff --git a/Plugins/Mineplex.Core/src/mineplex/core/vanish/Vanish.java b/Plugins/Mineplex.Core/src/mineplex/core/vanish/Vanish.java index 3b6c12e9b..4e435a34a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/vanish/Vanish.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/vanish/Vanish.java @@ -17,7 +17,6 @@ import mineplex.core.vanish.commands.VanishCommand; import mineplex.core.vanish.events.PreVanishEvent; import mineplex.core.vanish.repository.VanishClient; import mineplex.core.vanish.repository.VanishRepository; -import mineplex.game.clans.tutorials.Tutorial; import net.md_5.bungee.api.ChatColor; import net.minecraft.server.v1_8_R3.PacketPlayOutChat; @@ -36,28 +35,20 @@ public class Vanish extends MiniClientPlugin packetHandler.addPacketHandler(info -> { PacketPlayOutChat packet = (PacketPlayOutChat) info.getPacket(); - if (packet.getPacket() instanceof PacketPlayOutChat) + if (packet.b == 1) { - PacketPlayOutChat chat = (PacketPlayOutChat) packet.getPacket(); - - if (chat.b == 1) + if (packet.a.a().isEmpty()) { - if (chat.a.a().isEmpty()) - { - return; - } - - if (chat.a.a().get(0).c().equals(ChatColor.stripColor(Tutorial.AllowedMessage))) - { - chat.a.a().remove(0); - } - else if (!chat.a.a().get(0).c().contains(Tutorial.AllowedBypass)) - { - if (isInTutorial(packet.getPlayer())) - { - packet.setCancelled(true); - } - } + return; + } + + if (packet.a.a().get(0).c().equals(ChatColor.stripColor("Join>"))) + { + packet.a.a().remove(0); + } + else if (!packet.a.a().get(0).c().contains("Join>")) + { + info.setCancelled(true); } } }, PacketPlayOutChat.class);