TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-30 02:37:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix running force actions in LoginSecurity thread-safe

Browse Source
This commit is contained in:
games647
2019-04-14 10:16:19 +02:00
parent 15c5857c4f
commit 9c1ba81cbe
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/pom.xml
View File

@ -113,7 +113,7 @@
<dependency> <dependency>
<groupId>com.comphenix.protocol</groupId> <groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId> <artifactId>ProtocolLib</artifactId>
<version>4.4.0-SNAPSHOT</version> <version>4.4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

30
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hook/LoginSecurityHook.java
View File

@ -8,6 +8,10 @@ import com.lenis0012.bukkit.loginsecurity.session.PlayerSession;
import com.lenis0012.bukkit.loginsecurity.session.action.LoginAction; import com.lenis0012.bukkit.loginsecurity.session.action.LoginAction;
import com.lenis0012.bukkit.loginsecurity.session.action.RegisterAction; import com.lenis0012.bukkit.loginsecurity.session.action.RegisterAction;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
/** /**
@ -29,9 +33,18 @@ public class LoginSecurityHook implements AuthPlugin<Player> {
@Override @Override
public boolean forceLogin(Player player) { public boolean forceLogin(Player player) {
PlayerSession session = LoginSecurity.getSessionManager().getPlayerSession(player); Future<Boolean> future = Bukkit.getScheduler().callSyncMethod(plugin, () -> {
return session.isAuthorized() || session.performAction(new LoginAction(AuthService.PLUGIN, plugin)).isSuccess(); PlayerSession session = LoginSecurity.getSessionManager().getPlayerSession(player);
return session.isAuthorized()
|| session.performAction(new LoginAction(AuthService.PLUGIN, plugin)).isSuccess();
});
try {
return future.get();
} catch (InterruptedException | ExecutionException ex) {
plugin.getLog().error("Failed to forceLogin player: {}", player, ex);
return false;
}
} }
@Override @Override
@ -42,7 +55,16 @@ public class LoginSecurityHook implements AuthPlugin<Player> {
@Override @Override
public boolean forceRegister(Player player, String password) { public boolean forceRegister(Player player, String password) {
PlayerSession session = LoginSecurity.getSessionManager().getPlayerSession(player); Future<Boolean> future = Bukkit.getScheduler().callSyncMethod(plugin, () -> {
return session.performAction(new RegisterAction(AuthService.PLUGIN, plugin, password)).isSuccess(); PlayerSession session = LoginSecurity.getSessionManager().getPlayerSession(player);
return session.performAction(new RegisterAction(AuthService.PLUGIN, plugin, password)).isSuccess();
});
try {
return future.get();
} catch (InterruptedException | ExecutionException ex) {
plugin.getLog().error("Failed to forceLogin player: {}", player, ex);
return false;
}
} }
} }

1
core/src/main/java/com/github/games647/fastlogin/core/shared/FastLoginCore.java
View File

@ -192,7 +192,6 @@ public class FastLoginCore<P extends C, C, T extends PlatformPlugin<C>> {
return false; return false;
} }
public Configuration getConfig() { public Configuration getConfig() {
return config; return config;
} }