RedGuy/AuthMeVelocity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

misc: Some minor improvements

Browse Source
This commit is contained in:
4drian3d 2022-07-12 16:11:36 +00:00
parent cc3803307e
commit 01b41e47ae
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxy/src/main/java/com/glyart/authmevelocity/proxy/listener/PluginMessageListener.java
View File

@ -87,7 +87,7 @@ public class PluginMessageListener {
private void createServerConnectionRequest(Player loggedPlayer, ServerConnection connection){ private void createServerConnectionRequest(Player loggedPlayer, ServerConnection connection){
final RegisteredServer loginServer = loggedPlayer.getCurrentServer().orElse(connection).getServer(); final RegisteredServer loginServer = loggedPlayer.getCurrentServer().orElse(connection).getServer();
proxy.getEventManager().fireAndForget(new ProxyLoginEvent(loggedPlayer)); proxy.getEventManager().fireAndForget(new ProxyLoginEvent(loggedPlayer));
if(config.getToServerOptions().sendToServer()){ if (config.getToServerOptions().sendToServer()) {
final List<String> serverList = config.getToServerOptions().getTeleportServers(); final List<String> serverList = config.getToServerOptions().getTeleportServers();
final String randomServer = serverList.get(rm.nextInt(serverList.size())); final String randomServer = serverList.get(rm.nextInt(serverList.size()));
proxy.getServer(randomServer).ifPresentOrElse(serverToSend -> proxy.getServer(randomServer).ifPresentOrElse(serverToSend ->

4
spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/AuthMeListener.java
View File

@ -25,8 +25,8 @@ public class AuthMeListener implements Listener {
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public void onLogin(LoginEvent event) { public void onLogin(LoginEvent event) {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
PreSendLoginEvent preSendLoginEvent = new PreSendLoginEvent(player);
if(preSendLoginEvent.callEvent()){ if (new PreSendLoginEvent(player).callEvent()) {
plugin.sendMessageToProxy(player, MessageType.LOGIN, player.getName()); plugin.sendMessageToProxy(player, MessageType.LOGIN, player.getName());
} }
} }

18
spigot/src/main/java/com/glyart/authmevelocity/spigot/listeners/MessageListener.java
View File

@ -13,14 +13,16 @@ public class MessageListener implements PluginMessageListener {
@Override @Override
public void onPluginMessageReceived(@NotNull String identifier, @NotNull Player player, @NotNull byte[] bytes) { public void onPluginMessageReceived(@NotNull String identifier, @NotNull Player player, @NotNull byte[] bytes) {
if(identifier.equals("authmevelocity")){ if (!identifier.equals("authmevelocity")) {
ByteArrayDataInput input = ByteStreams.newDataInput(bytes); return;
String subchannel = input.readUTF(); }
if("main".equals(subchannel)){
String msg = input.readUTF(); ByteArrayDataInput input = ByteStreams.newDataInput(bytes);
if("LOGIN".equals(msg)){ String subchannel = input.readUTF();
AuthMeApi.getInstance().forceLogin(player); if ("main".equals(subchannel)) {
} String msg = input.readUTF();
if ("LOGIN".equals(msg)) {
AuthMeApi.getInstance().forceLogin(player);
} }
} }
} }