Skip to content

Commit a868254

Browse files
committed
Undid breaking changes
Why were those made?? They broke cloudnet
1 parent 51ffdd5 commit a868254

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

src/main/java/dev/waterdog/waterdogpe/ProxyServer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ private void boot() {
244244
}
245245

246246
InetSocketAddress bindAddress = this.getConfiguration().getBindAddress();
247-
bindAddress = new InetSocketAddress(bindAddress.getHostString(), bindAddress.getPort());
248247
this.logger.info("Binding to {}", bindAddress);
249248

250249
if (this.getConfiguration().enableQuery()) {
@@ -253,7 +252,7 @@ private void boot() {
253252

254253
this.bindChannels(bindAddress);
255254
for (Integer port : this.getConfiguration().getAdditionalPorts()) {
256-
InetSocketAddress additionalBind = new InetSocketAddress(bindAddress.getHostString(), port);
255+
InetSocketAddress additionalBind = new InetSocketAddress(bindAddress.getAddress(), port);
257256
this.bindChannels(additionalBind);
258257
}
259258

src/main/java/dev/waterdog/waterdogpe/player/ProxiedPlayer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ public void sendToastMessage(String title, String content) {
674674
public void redirectServer(ServerInfo serverInfo) {
675675
Preconditions.checkNotNull(serverInfo, "Server info can not be null!");
676676
TransferPacket packet = new TransferPacket();
677-
packet.setAddress(serverInfo.getPublicAddress().getHostString());
677+
packet.setAddress(serverInfo.getPublicAddress().getAddress().getHostAddress());
678678
packet.setPort(serverInfo.getPublicAddress().getPort());
679679
this.sendPacket(packet);
680680
}

src/main/java/dev/waterdog/waterdogpe/utils/config/serializer/InetSocketAddressConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public Object toConfig(Class<?> type, Object object, ParameterizedType parameter
3535
return null;
3636
}
3737
InetSocketAddress address = (InetSocketAddress) object;
38-
return address.getHostString() + ":" + address.getPort();
38+
return address.getHostName() + ":" + address.getPort();
3939
}
4040

4141
@Override
@@ -46,7 +46,7 @@ public Object fromConfig(Class<?> type, Object object, ParameterizedType paramet
4646
String string = (String) object;
4747
String address = string.substring(0, string.lastIndexOf(":"));
4848
int port = Integer.parseInt(string.substring(string.lastIndexOf(":") + 1));
49-
return InetSocketAddress.createUnresolved(address, port);
49+
return new InetSocketAddress(address, port);
5050
}
5151

5252
@Override

src/main/java/dev/waterdog/waterdogpe/utils/config/serializer/ServerEntryConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public ServerEntryConverter(InternalConverter internalConverter) {
3838
public Object toConfig(Class<?> type, Object object, ParameterizedType parameterizedType) {
3939
Map<String, String> map = new HashMap<>();
4040
ServerEntry serverEntry = (ServerEntry) object;
41-
map.put("address", serverEntry.getAddress().getHostString() + ":" + serverEntry.getAddress().getPort());
41+
map.put("address", serverEntry.getAddress().getAddress().getHostAddress() + ":" + serverEntry.getAddress().getPort());
4242
if (serverEntry.getPublicAddress() != null && serverEntry.getPublicAddress() != serverEntry.getAddress()) {
43-
map.put("public_address", serverEntry.getPublicAddress().getHostString() + ":" + serverEntry.getPublicAddress().getPort());
43+
map.put("public_address", serverEntry.getAddress().getAddress().getHostAddress() + ":" + serverEntry.getAddress().getPort());
4444
}
4545
if (serverEntry.getServerType() != null) {
4646
map.put("server_type", serverEntry.getServerType());

0 commit comments

Comments
 (0)