Skip to content

Commit efc93ae

Browse files
committed
Ensure reloads trigger forwarding update
1 parent f2fe76d commit efc93ae

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

api/src/main/java/com/velocitypowered/api/proxy/server/ServerInfo.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ public boolean equals(@Nullable Object o) {
110110
}
111111

112112
return Objects.equals(name, that.name)
113-
&& Objects.equals(address, that.address);
113+
&& Objects.equals(address, that.address)
114+
&& Objects.equals(forwardingMode, that.forwardingMode);
114115
}
115116

116117
@Override

proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -838,9 +838,9 @@ public void reloadServerList() {
838838
private static List<ServerInfo> loadServersFromNewList(VelocityConfiguration config) {
839839
List<ServerInfo> serverList = new ArrayList<>();
840840

841-
config.getServers().forEach((serverName, address) -> {
842-
InetSocketAddress socketAddress = AddressUtil.parseAddress(address);
843-
serverList.add(new ServerInfo(serverName, socketAddress));
841+
config.getBackendServers().forEach((serverName, backendConfig) -> {
842+
InetSocketAddress socketAddress = AddressUtil.parseAddress(backendConfig.address());
843+
serverList.add(new ServerInfo(serverName, socketAddress, backendConfig.forwardingMode()));
844844
});
845845

846846
return serverList;

0 commit comments

Comments
 (0)