Update dependencies

This commit is contained in:
2024-10-16 17:57:07 -05:00
parent 58322f8138
commit 1a31aac5ce
7 changed files with 28 additions and 42 deletions

View File

@ -26,7 +26,7 @@ public class BukkitTelnetModule extends PlexModule
@Override
public void enable()
{
if (getPlex().getSystem().equalsIgnoreCase("permissions") && !Bukkit.getPluginManager().isPluginEnabled("Vault"))
if (!Bukkit.getPluginManager().isPluginEnabled("Vault"))
{
failed = true;
PlexLog.error("Plex-BukkitTelnet requires the 'Vault' plugin as well as a Permissions plugin that hooks into 'Vault.' We recommend LuckPerms!");
@ -37,7 +37,7 @@ public class BukkitTelnetModule extends PlexModule
if (!Bukkit.getPluginManager().isPluginEnabled("BukkitTelnet"))
{
failed = true;
PlexLog.warn("The Plex-BukkitTelnet module requires the BukkitTelnet plugin to work. I am automatically compiling BukkitTelnet plugin for you, however if something fails, please download it from: https://github.com/plexusorg/BukkitTelnet/releases");
PlexLog.warn("The BukkitTelnet module requires the BukkitTelnet plugin to work. I am automatically compiling BukkitTelnet plugin for you, however if something fails, please download it from: https://github.com/plexusorg/BukkitTelnet/releases");
try
{
PatchedTelnetCompiler.execute();
@ -61,7 +61,7 @@ public class BukkitTelnetModule extends PlexModule
}
catch (ClassNotFoundException | NoSuchMethodException ignored)
{
PlexLog.warn("You are using an older version of BukkitTelnet that does not support Plex. I am automatically compiling a build that does work for you, however if something fails, please download a version that does from: https://ci.plex.us.org/job/Plex-BukkitTelnet");
PlexLog.warn("You are using an older version of BukkitTelnet that does not support Plex. I am automatically compiling a build that does work for you, however if something fails, please download a version that does from: https://ci.plex.us.org/job/Module-BukkitTelnet");
try
{

View File

@ -2,41 +2,22 @@ package dev.plex.listener;
import dev.plex.cache.DataUtils;
import dev.plex.player.PlexPlayer;
import dev.plex.rank.enums.Rank;
import dev.plex.util.PlexLog;
import me.totalfreedom.bukkittelnet.BukkitTelnet;
import me.totalfreedom.bukkittelnet.api.TelnetPreLoginEvent;
import org.bukkit.event.EventHandler;
public class BukkitTelnetListener extends PlexListener
{
public class BukkitTelnetListener extends PlexListener {
@EventHandler
public void onPreLogin(TelnetPreLoginEvent event)
{
public void onPreLogin(TelnetPreLoginEvent event) {
final String ip = event.getIp();
final PlexPlayer player = DataUtils.getPlayerByIP(ip);
if (player == null)
{
if (player == null) {
return;
}
if (plugin.getSystem().equalsIgnoreCase("ranks"))
{
PlexLog.debug("Plex-BukkitTelnet using ranks check");
if (player.getRankFromString().isAtLeast(Rank.ADMIN))
{
event.setBypassPassword(true);
event.setName(player.getName());
}
}
else if (plugin.getSystem().equalsIgnoreCase("permissions"))
{
PlexLog.debug("Plex-BukkitTelnet using permissions check");
if (BukkitTelnet.getPlugin().handler.hasPermission(player.getName(), "plex.telnet.autoconnect"))
{
event.setBypassPassword(true);
event.setName(player.getName());
}
}
if (BukkitTelnet.getPlugin().handler.hasPermission(player.getName(), "plex.telnet.autoconnect")) {
event.setBypassPassword(true);
event.setName(player.getName());
}
}
}