Probably fix #24

This commit is contained in:
4drian3d 2022-02-02 19:37:15 -05:00
parent 577fe2e305
commit 1098852a58
3 changed files with 5 additions and 7 deletions

View File

@ -2,7 +2,7 @@
This plugin adds the support for [Velocity](https://velocitypowered.com/) to [AuthMeReloaded](https://github.com/AuthMe/AuthMeReloaded) This plugin adds the support for [Velocity](https://velocitypowered.com/) to [AuthMeReloaded](https://github.com/AuthMe/AuthMeReloaded)
## Requirements ## Requirements
- Paper, Airplane or Purpur - Paper, Airplane or Purpur 1.16+
- Velocity 3.0.1+ - Velocity 3.0.1+
- Java 16 - Java 16

View File

@ -1,6 +1,5 @@
package com.glyart.authmevelocity.spigot.events; package com.glyart.authmevelocity.spigot.events;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable; import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
@ -12,7 +11,7 @@ public class PreSendLoginEvent extends PlayerEvent implements Cancellable {
private boolean isCancelled; private boolean isCancelled;
public PreSendLoginEvent(@NotNull final Player player) { public PreSendLoginEvent(@NotNull final Player player) {
super(player, !Bukkit.isPrimaryThread()); super(player);
} }
@Override @Override

View File

@ -8,9 +8,9 @@ import fr.xephi.authme.events.LoginEvent;
import fr.xephi.authme.events.LogoutEvent; import fr.xephi.authme.events.LogoutEvent;
import fr.xephi.authme.events.RegisterEvent; import fr.xephi.authme.events.RegisterEvent;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
public class AuthMeListener implements Listener { public class AuthMeListener implements Listener {
@ -20,12 +20,11 @@ public class AuthMeListener implements Listener {
this.plugin = plugin; this.plugin = plugin;
} }
@EventHandler @EventHandler(priority = EventPriority.HIGHEST)
public void onLogin(final LoginEvent event) { public void onLogin(final LoginEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
PreSendLoginEvent preSendLoginEvent = new PreSendLoginEvent(player); PreSendLoginEvent preSendLoginEvent = new PreSendLoginEvent(player);
Bukkit.getPluginManager().callEvent(preSendLoginEvent); if(!preSendLoginEvent.callEvent()){
if(!preSendLoginEvent.isCancelled()){
plugin.sendMessageToProxy(player, MessageType.LOGIN); plugin.sendMessageToProxy(player, MessageType.LOGIN);
} }
} }