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

Fix #1587

Browse Source 
AsyncPlayerPreLoginEvent#getAddress() sometimes return null if it unresolved.
In that case we should pass it to PlayerLoginEvent to do the join verification process.
This commit is contained in:
DNx 2018-07-07 20:54:38 +07:00
parent 4c640fddd9
commit 1d118afd17
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/fr/xephi/authme/listener/PlayerListener.java
View File

@ -54,6 +54,8 @@ import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.event.player.PlayerShearEntityEvent; import org.bukkit.event.player.PlayerShearEntityEvent;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
import static fr.xephi.authme.settings.properties.RestrictionSettings.ALLOWED_MOVEMENT_RADIUS; import static fr.xephi.authme.settings.properties.RestrictionSettings.ALLOWED_MOVEMENT_RADIUS;
import static fr.xephi.authme.settings.properties.RestrictionSettings.ALLOW_UNAUTHED_MOVEMENT; import static fr.xephi.authme.settings.properties.RestrictionSettings.ALLOW_UNAUTHED_MOVEMENT;
@ -95,6 +97,7 @@ public class PlayerListener implements Listener {
private BungeeSender bungeeSender; private BungeeSender bungeeSender;
private boolean isAsyncPlayerPreLoginEventCalled = false; private boolean isAsyncPlayerPreLoginEventCalled = false;
private List<String> unresolvedPlayerHostname = new ArrayList<>();
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) { public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
@ -263,6 +266,11 @@ public class PlayerListener implements Listener {
return; return;
} }
if (event.getAddress() == null) {
unresolvedPlayerHostname.add(event.getName());
return;
}
final String name = event.getName(); final String name = event.getName();
if (validationService.isUnrestricted(name)) { if (validationService.isUnrestricted(name)) {
@ -307,7 +315,9 @@ public class PlayerListener implements Listener {
return; return;
} }
if (!isAsyncPlayerPreLoginEventCalled || !settings.getProperty(PluginSettings.USE_ASYNC_PRE_LOGIN_EVENT)) {
if (!isAsyncPlayerPreLoginEventCalled || !settings.getProperty(PluginSettings.USE_ASYNC_PRE_LOGIN_EVENT)
|| unresolvedPlayerHostname.remove(name)) {
try { try {
runOnJoinChecks(JoiningPlayer.fromPlayerObject(player), event.getAddress().getHostAddress()); runOnJoinChecks(JoiningPlayer.fromPlayerObject(player), event.getAddress().getHostAddress());
} catch (FailedVerificationException e) { } catch (FailedVerificationException e) {