GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-12-19 14:59:27 +00:00
Code Issues Releases Activity

Bump Bedrock networking library, fix NPE related to resource pack re-downloading

Browse Source 
Closes https://github.com/GeyserMC/Geyser/issues/5243
This commit is contained in:
onebeastchris
2025-08-13 03:10:40 +03:00
parent 79caa98e4f
commit c23ac5caf3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,9 @@
package org.geysermc.geyser.pack.url; package org.geysermc.geyser.pack.url;
import java.io.IOException;
import java.nio.channels.SeekableByteChannel;
import java.util.Objects;
import lombok.Getter; import lombok.Getter;
import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.NonNull;
import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.GeyserImpl;
@@ -36,10 +39,6 @@ import org.geysermc.geyser.registry.Registries;
import org.geysermc.geyser.registry.loader.ResourcePackLoader; import org.geysermc.geyser.registry.loader.ResourcePackLoader;
import org.geysermc.geyser.text.GeyserLocale; import org.geysermc.geyser.text.GeyserLocale;
import java.io.IOException;
import java.nio.channels.SeekableByteChannel;
import java.util.Objects;
public class GeyserUrlPackCodec extends UrlPackCodec { public class GeyserUrlPackCodec extends UrlPackCodec {
private final @NonNull String url; private final @NonNull String url;
@Getter @Getter
@@ -130,10 +129,11 @@ public class GeyserUrlPackCodec extends UrlPackCodec {
Registries.RESOURCE_PACKS.get().put(updatedPack.uuid(), holder.withPack(pack)); Registries.RESOURCE_PACKS.get().put(updatedPack.uuid(), holder.withPack(pack));
}) })
.exceptionally(throwable -> { .whenComplete((result, throwable) -> {
GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.resource_pack.broken", url), throwable); if (throwable != null) {
Registries.RESOURCE_PACKS.get().remove(holder.uuid()); GeyserImpl.getInstance().getLogger().error(GeyserLocale.getLocaleStringLog("geyser.resource_pack.broken", url), throwable);
return null; Registries.RESOURCE_PACKS.get().remove(holder.uuid());
}
}); });
} }
} }

2
gradle/libs.versions.toml
View File

@@ -12,7 +12,7 @@ websocket = "1.5.1"
protocol-connection = "3.0.0.Beta7-20250812.232642-18" protocol-connection = "3.0.0.Beta7-20250812.232642-18"
protocol-common = "3.0.0.Beta7-20250812.232642-18" protocol-common = "3.0.0.Beta7-20250812.232642-18"
protocol-codec = "3.0.0.Beta7-20250812.232642-18" protocol-codec = "3.0.0.Beta7-20250812.232642-18"
raknet = "1.0.0.CR3-20250218.160705-18" raknet = "1.0.0.CR3-20250811.214335-20"
minecraftauth = "4.1.1" minecraftauth = "4.1.1"
mcprotocollib = "1.21.7-20250725.134643-4" mcprotocollib = "1.21.7-20250725.134643-4"
adventure = "4.24.0" adventure = "4.24.0"