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

Fix race condition in bungee<->bukkit

Browse Source
This commit is contained in:
games647
2016-08-18 20:15:43 +02:00
parent 71362dfd7d
commit a67d84ef3f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeCordListener.java
View File

@@ -42,7 +42,7 @@ public class BungeeCordListener implements PluginMessageListener {
} }
@Override @Override
public void onPluginMessageReceived(String channel, Player player, byte[] message) { public void onPluginMessageReceived(String channel, final Player player, byte[] message) {
if (!channel.equals(plugin.getName())) { if (!channel.equals(plugin.getName())) {
return; return;
} }
@@ -75,6 +75,7 @@ public class BungeeCordListener implements PluginMessageListener {
BukkitLoginSession playerSession = new BukkitLoginSession(playerName, true); BukkitLoginSession playerSession = new BukkitLoginSession(playerName, true);
playerSession.setVerified(true); playerSession.setVerified(true);
plugin.getSessions().put(id, playerSession); plugin.getSessions().put(id, playerSession);
Bukkit.getScheduler().runTaskAsynchronously(plugin, new ForceLoginTask(plugin, player));
} else if ("AUTO_REGISTER".equalsIgnoreCase(subchannel)) { } else if ("AUTO_REGISTER".equalsIgnoreCase(subchannel)) {
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() { Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@Override @Override
@@ -82,10 +83,11 @@ public class BungeeCordListener implements PluginMessageListener {
BukkitAuthPlugin authPlugin = plugin.getAuthPlugin(); BukkitAuthPlugin authPlugin = plugin.getAuthPlugin();
try { try {
//we need to check if the player is registered on Bukkit too //we need to check if the player is registered on Bukkit too
if (authPlugin != null && !authPlugin.isRegistered(playerName)) { if (authPlugin == null || !authPlugin.isRegistered(playerName)) {
BukkitLoginSession playerSession = new BukkitLoginSession(playerName, false); BukkitLoginSession playerSession = new BukkitLoginSession(playerName, false);
playerSession.setVerified(true); playerSession.setVerified(true);
plugin.getSessions().put(id, playerSession); plugin.getSessions().put(id, playerSession);
new ForceLoginTask(plugin, player).run();
} }
} catch (Exception ex) { } catch (Exception ex) {
plugin.getLogger().log(Level.SEVERE, "Failed to query isRegistered", ex); plugin.getLogger().log(Level.SEVERE, "Failed to query isRegistered", ex);
@@ -93,8 +95,6 @@ public class BungeeCordListener implements PluginMessageListener {
} }
}); });
} }
Bukkit.getScheduler().runTaskAsynchronously(plugin, new ForceLoginTask(plugin, player));
} }
} }
} }