Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Logic Improvement

Browse Source
This commit is contained in:
HaHaWTH 2023-10-14 19:09:35 +08:00
parent 31123081c7
commit 7a7b148a7d
3 changed files with 91 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/fr/xephi/authme/events/GUICaptchaEvent.java Normal file
View File

@ -0,0 +1,38 @@
package fr.xephi.authme.events;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
import static fr.xephi.authme.listener.GuiCaptchaHandler.closeReasonMap;
public class GUICaptchaEvent extends Event {
private static final HandlerList handlers = new HandlerList();
private final Player player;
public GUICaptchaEvent(Player player) {
this.player = player;
}
public Player getPlayer() {
return player;
}
public boolean isCaptchaVerified(Player player){
return closeReasonMap.containsKey(player);
}
public static HandlerList getHandlerList() {
return handlers;
}
@Override
public @NotNull HandlerList getHandlers() {
return handlers;
}
}

8
src/main/java/fr/xephi/authme/listener/GuiCaptchaHandler.java
View File

@ -4,9 +4,9 @@ import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.ListenerPriority;
import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketEvent;
import com.earth2me.essentials.libs.checkerframework.checker.nullness.qual.NonNull;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.api.v3.AuthMeApi;
import fr.xephi.authme.events.GUICaptchaEvent;
import fr.xephi.authme.settings.properties.HooksSettings;
import fr.xephi.authme.settings.properties.RestrictionSettings;
import fr.xephi.authme.settings.properties.SecuritySettings;
@ -37,12 +37,11 @@ public class GuiCaptchaHandler implements Listener {
private final AuthMeApi authmeApi = AuthMeApi.getInstance();
private final Plugin plugin;
//define timesLeft
public int timesLeft = 3;
//Use ConcurrentHashMap to store player and their close reason
/* We used many async tasks so there is concurrent**/
protected static ConcurrentHashMap<Player, String> closeReasonMap = new ConcurrentHashMap<>();
public static ConcurrentHashMap<Player, String> closeReasonMap = new ConcurrentHashMap<>();
//define randomStringSet
String randomSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890abcdefghijklmnopqrstuvwxyz!@#%&*()_+";
String randomString = "";
@ -66,6 +65,7 @@ public class GuiCaptchaHandler implements Listener {
if (AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getWhoClicked().getUniqueId()) && (getServer().getPluginManager().isPluginEnabled("floodgate") || getServer().getPluginManager().getPlugin("floodgate") != null)) {
if (!closeReasonMap.containsKey(player)) {
closeReasonMap.put(player,"verified");
Bukkit.getPluginManager().callEvent(new GUICaptchaEvent(player));
return;
}
return;
@ -73,6 +73,7 @@ public class GuiCaptchaHandler implements Listener {
if (currentItem != null && currentItem.getType().equals(Material.REDSTONE_BLOCK)){
event.setCancelled(true);
closeReasonMap.put(player, "verified");
Bukkit.getPluginManager().callEvent(new GUICaptchaEvent(player));
player.closeInventory();
player.sendMessage("§a验证完成");
} else {
@ -93,6 +94,7 @@ public class GuiCaptchaHandler implements Listener {
if (!authmeApi.isRegistered(name)) {
if (AuthMe.settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && AuthMe.settings.getProperty(SecuritySettings.GUI_CAPTCHA_BE_COMPATIBILITY) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(event.getPlayer().getUniqueId()) && (getServer().getPluginManager().isPluginEnabled("floodgate") || getServer().getPluginManager().getPlugin("floodgate") != null)) {
closeReasonMap.put(playerunreg, "verified");
Bukkit.getPluginManager().callEvent(new GUICaptchaEvent(playerunreg));
playerunreg.sendMessage("§a基岩版自动验证完成");
return;
}

6
src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java
View File

@ -1,20 +1,22 @@
package fr.xephi.authme.listener;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.api.v3.AuthMeApi;
import fr.xephi.authme.events.GUICaptchaEvent;
import fr.xephi.authme.events.LoginEvent;
import fr.xephi.authme.settings.properties.SecuritySettings;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.plugin.Plugin;
public class LoginLocationFixListener implements Listener{
private final Plugin plugin;
private final AuthMeApi authmeApi = AuthMeApi.getInstance();
@ -25,7 +27,6 @@ public class LoginLocationFixListener implements Listener{
@EventHandler
public void onPlayerJoin(PlayerJoinEvent event) {
Player player = event.getPlayer();
if (authmeApi.isRegistered(player.getName())) {
Material material = Material.matchMaterial("PORTAL");
if (material == null) {
material = Material.matchMaterial("PORTAL_BLOCK");
@ -80,4 +81,3 @@ public class LoginLocationFixListener implements Listener{
}
}
}
}