MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Merge pull request #76 from kashike/mrn

Browse Source 
ServerPreConnectEvent#getInfo -> getServer
This commit is contained in:
Andrew Steinborn
2018-09-14 00:17:25 -04:00
committed by GitHub
parent 656987db03 c3fd559ac2
commit d028c281c9
2 changed files with 7 additions and 7 deletions
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 static final ServerResult DENIED = new ServerResult(false, null);
private final boolean allowed; 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.allowed = allowed;
this.info = info; this.server = server;
} }
@Override @Override
@@ -62,8 +62,8 @@ public class ServerPreConnectEvent implements ResultedEvent<ServerPreConnectEven
return allowed; return allowed;
} }
public Optional<ServerInfo> getInfo() { public Optional<ServerInfo> getServer() {
return Optional.ofNullable(info); return Optional.ofNullable(server);
} }
@Override @Override
@@ -71,7 +71,7 @@ public class ServerPreConnectEvent implements ResultedEvent<ServerPreConnectEven
if (!allowed) { if (!allowed) {
return "denied"; return "denied";
} }
return "allowed: connect to " + info.getName(); return "allowed: connect to " + server.getName();
} }
public static ServerResult denied() { 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();
}); });
} }