mirror/Velocity
2
0
Fork 0
mirror of https://github.com/PaperMC/Velocity.git synced 2024-12-09 07:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

ServerPreConnectEvent#getInfo -> getServer

Browse Source
This commit is contained in:
kashike 2018-09-12 22:41:51 -07:00
parent ab2c887e2c
commit c3fd559ac2
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/main/java/com/velocitypowered/api/event/player/ServerPreConnectEvent.java
View File

@ -50,11 +50,11 @@ public class ServerPreConnectEvent implements ResultedEvent<ServerPreConnectEven
private static final ServerResult DENIED = new ServerResult(false, null);
private final boolean allowed;
private final ServerInfo info;
private final ServerInfo server;
private ServerResult(boolean allowed, @Nullable ServerInfo info) {
private ServerResult(boolean allowed, @Nullable ServerInfo server) {
this.allowed = allowed;
this.info = info;
this.server = server;
}
@Override
@ -62,8 +62,8 @@ public class ServerPreConnectEvent implements ResultedEvent<ServerPreConnectEven
return allowed;
}
public Optional<ServerInfo> getInfo() {
return Optional.ofNullable(info);
public Optional<ServerInfo> getServer() {
return Optional.ofNullable(server);
}
@Override
@ -71,7 +71,7 @@ public class ServerPreConnectEvent implements ResultedEvent<ServerPreConnectEven
if (!allowed) {
return "denied";
}
return "allowed: connect to " + info.getName();
return "allowed: connect to " + server.getName();
}
public static ServerResult denied() {

2
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
View File

@ -284,7 +284,7 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
);
}
return new VelocityServerConnection(newEvent.getResult().getInfo().get(), this, server).connect();
return new VelocityServerConnection(newEvent.getResult().getServer().get(), this, server).connect();
});
}