From 07d9bbbf7c7f2ac83c056328d950c44dee299ef0 Mon Sep 17 00:00:00 2001 From: HaHaWTH Date: Wed, 18 Oct 2023 22:11:16 +0800 Subject: [PATCH] LoginLocationFixListener logic improvement --- .../listener/LoginLocationFixListener.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java b/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java index 867c1357..2b47c592 100644 --- a/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java +++ b/src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java @@ -14,23 +14,31 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.plugin.Plugin; -public class LoginLocationFixListener implements Listener{ +public class LoginLocationFixListener implements Listener { private final Plugin plugin; private final AuthMeApi authmeApi = AuthMeApi.getInstance(); + public LoginLocationFixListener(Plugin plugin) { this.plugin = plugin; } + + private static Material material = Material.matchMaterial("PORTAL"); + BlockFace[] faces = {BlockFace.WEST, BlockFace.EAST, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.SOUTH_EAST, BlockFace.SOUTH_WEST, BlockFace.NORTH_EAST, BlockFace.NORTH_WEST}; - @EventHandler - public void onPlayerJoin(PlayerJoinEvent event){ - Player player = event.getPlayer(); - Material material = Material.matchMaterial("PORTAL"); + + static { if (material == null) { material = Material.matchMaterial("PORTAL_BLOCK"); - if(material == null){ + if (material == null) { material = Material.matchMaterial("NETHER_PORTAL"); } } + + } + + @EventHandler + public void onPlayerJoin(PlayerJoinEvent event) { + Player player = event.getPlayer(); Location JoinLocation = player.getLocation().getBlock().getLocation().add(0.5, 0.1, 0.5); if (AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL)) { if (!JoinLocation.getBlock().getType().equals(material) && !JoinLocation.getBlock().getRelative(BlockFace.UP).getType().equals(material)) {