Skip to content

Commit c23ac5c

Browse files
committed
Bump Bedrock networking library, fix NPE related to resource pack re-downloading
Closes #5243
1 parent 79caa98 commit c23ac5c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

core/src/main/java/org/geysermc/geyser/pack/url/GeyserUrlPackCodec.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525

2626
package org.geysermc.geyser.pack.url;
2727

28+
import java.io.IOException;
29+
import java.nio.channels.SeekableByteChannel;
30+
import java.util.Objects;
2831
import lombok.Getter;
2932
import org.checkerframework.checker.nullness.qual.NonNull;
3033
import org.geysermc.geyser.GeyserImpl;
@@ -36,10 +39,6 @@
3639
import org.geysermc.geyser.registry.loader.ResourcePackLoader;
3740
import org.geysermc.geyser.text.GeyserLocale;
3841

39-
import java.io.IOException;
40-
import java.nio.channels.SeekableByteChannel;
41-
import java.util.Objects;
42-
4342
public class GeyserUrlPackCodec extends UrlPackCodec {
4443
private final @NonNull String url;
4544
@Getter
@@ -130,10 +129,11 @@ public void testForChanges(ResourcePackHolder holder) {
130129
Registries.RESOURCE_PACKS.get().put(updatedPack.uuid(), holder.withPack(pack));
131130

132131
})
133-
.exceptionally(throwable -> {
134-
GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.resource_pack.broken", url), throwable);
135-
Registries.RESOURCE_PACKS.get().remove(holder.uuid());
136-
return null;
132+
.whenComplete((result, throwable) -> {
133+
if (throwable != null) {
134+
GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.resource_pack.broken", url), throwable);
135+
Registries.RESOURCE_PACKS.get().remove(holder.uuid());
136+
}
137137
});
138138
}
139139
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ websocket = "1.5.1"
1212
protocol-connection = "3.0.0.Beta7-20250812.232642-18"
1313
protocol-common = "3.0.0.Beta7-20250812.232642-18"
1414
protocol-codec = "3.0.0.Beta7-20250812.232642-18"
15-
raknet = "1.0.0.CR3-20250218.160705-18"
15+
raknet = "1.0.0.CR3-20250811.214335-20"
1616
minecraftauth = "4.1.1"
1717
mcprotocollib = "1.21.7-20250725.134643-4"
1818
adventure = "4.24.0"

0 commit comments

Comments
 (0)