Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-01-27 01:51:41 +01:00
Code Issues Projects Releases Wiki Activity

Try with an higher priority (like 3.4)

Browse Source
This commit is contained in:
Gabriele C 2016-08-03 21:17:52 +02:00
parent 80337f758b
commit f4add64695
2 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.inventory.InventoryOpenEvent;
import org.bukkit.event.player.AsyncPlayerChatEvent; import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
import org.bukkit.event.player.PlayerBedEnterEvent; import org.bukkit.event.player.PlayerBedEnterEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerDropItemEvent;
@ -195,37 +194,12 @@ public class PlayerListener implements Listener {
} }
} }
// Note: AsyncPlayerPreLoginEvent is not fired by all servers in offline mode @EventHandler(priority = EventPriority.NORMAL)
// e.g. CraftBukkit does not. So we need to run crucial things in onPlayerLogin
// We have no performance improvements if we do the same thing on two different events
// The single session feature only works with the AsyncPlayerPreLoginEvent, i.e. it does not work
// with CraftBukkit, cf. issue #831
@EventHandler(priority = EventPriority.LOWEST)
public void onAsyncPreLogin(AsyncPlayerPreLoginEvent event) {
if (!AsyncPlayerPreLoginEvent.Result.ALLOWED.equals(event.getLoginResult())) {
return;
}
final String name = event.getName();
try {
onJoinVerifier.checkSingleSession(name);
} catch (FailedVerificationException e) {
event.setKickMessage(m.retrieveSingle(e.getReason(), e.getArgs()));
event.setLoginResult(AsyncPlayerPreLoginEvent.Result.KICK_OTHER);
}
}
@EventHandler(priority = EventPriority.LOW)
public void onPlayerJoin(PlayerJoinEvent event) {
final Player player = event.getPlayer();
teleportationService.teleportNewPlayerToFirstSpawn(player);
management.performJoin(player);
}
@EventHandler(priority = EventPriority.LOW)
public void onPlayerLogin(PlayerLoginEvent event) { public void onPlayerLogin(PlayerLoginEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
if (validationService.isUnrestricted(player.getName())) { final String name = player.getName();
if (validationService.isUnrestricted(name)) {
return; return;
} else if (onJoinVerifier.refusePlayerForFullServer(event)) { } else if (onJoinVerifier.refusePlayerForFullServer(event)) {
return; return;
@ -233,9 +207,9 @@ public class PlayerListener implements Listener {
return; return;
} }
final String name = player.getName();
try { try {
// Fast stuff // Fast stuff
onJoinVerifier.checkSingleSession(name);
onJoinVerifier.checkIsValidName(name); onJoinVerifier.checkIsValidName(name);
// Get the auth later as this may cause the single session check to fail // Get the auth later as this may cause the single session check to fail
@ -257,6 +231,13 @@ public class PlayerListener implements Listener {
teleportationService.teleportOnJoin(player); teleportationService.teleportOnJoin(player);
} }
@EventHandler(priority = EventPriority.LOW)
public void onPlayerJoin(PlayerJoinEvent event) {
final Player player = event.getPlayer();
teleportationService.teleportNewPlayerToFirstSpawn(player);
management.performJoin(player);
}
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerQuit(PlayerQuitEvent event) { public void onPlayerQuit(PlayerQuitEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();

2
src/test/java/fr/xephi/authme/listener/ListenerConsistencyTest.java
View File

@ -28,7 +28,7 @@ public final class ListenerConsistencyTest {
"PlayerListener#onPlayerJoin", "PlayerListener#onPlayerLogin", "PlayerListener#onPlayerJoin", "PlayerListener#onPlayerLogin",
"PlayerListener#onPlayerQuit", "ServerListener#onPluginDisable", "PlayerListener#onPlayerQuit", "ServerListener#onPluginDisable",
"ServerListener#onServerPing", "ServerListener#onPluginEnable", "ServerListener#onServerPing", "ServerListener#onPluginEnable",
"PlayerListener#onJoinMessage", "PlayerListener#onAsyncPreLogin"); "PlayerListener#onJoinMessage");
@Test @Test
public void shouldSetIgnoreCancelledToTrue() { public void shouldSetIgnoreCancelledToTrue() {