diff --git a/pom.xml b/pom.xml index f18408f..b07f1e8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,11 @@ pom 1.1.0 + + 16 + 16 + + apache.snapshots @@ -36,7 +41,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.3.0-SNAPSHOT + 3.3.1-SNAPSHOT package diff --git a/proxy/pom.xml b/proxy/pom.xml index 8817c1f..0182d86 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -9,6 +9,11 @@ 4.0.0 + + 16 + 16 + + proxy diff --git a/spigot/src/main/java/com/glyart/authmevelocity/spigot/events/PreSendLoginEvent.java b/spigot/src/main/java/com/glyart/authmevelocity/spigot/events/PreSendLoginEvent.java new file mode 100644 index 0000000..50d5af6 --- /dev/null +++ b/spigot/src/main/java/com/glyart/authmevelocity/spigot/events/PreSendLoginEvent.java @@ -0,0 +1,31 @@ +package com.glyart.authmevelocity.spigot.events; + +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; +import org.bukkit.event.HandlerList; +import org.bukkit.event.player.PlayerEvent; +import org.jetbrains.annotations.NotNull; + +public class PreSendLoginEvent extends PlayerEvent implements Cancellable { + private static final HandlerList HANDLERS = new HandlerList(); + private boolean isCancelled; + + public PreSendLoginEvent(@NotNull Player player) { + super(player); + } + + @Override + public boolean isCancelled() { + return isCancelled; + } + + @Override + public void setCancelled(boolean cancelled) { + this.isCancelled = cancelled; + } + + @Override + public @NotNull HandlerList getHandlers() { + return HANDLERS; + } +} diff --git a/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java b/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java index e59a15a..0a0b864 100644 --- a/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java +++ b/spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java @@ -1,7 +1,12 @@ package com.glyart.authmevelocity.spigot.listeners; import com.glyart.authmevelocity.spigot.AuthMeVelocityPlugin; +import com.glyart.authmevelocity.spigot.events.PreSendLoginEvent; + import fr.xephi.authme.events.LoginEvent; + +import org.bukkit.Bukkit; +import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -14,6 +19,11 @@ public class AuthMeListener implements Listener { @EventHandler public void onLogin(LoginEvent event) { - plugin.sendLoginToProxy(event.getPlayer()); + Player player = event.getPlayer(); + PreSendLoginEvent sendloginevent = new PreSendLoginEvent(player); + Bukkit.getPluginManager().callEvent(sendloginevent); + if(!sendloginevent.isCancelled()){ + plugin.sendLoginToProxy(player); + } } }