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

Log response from failed geyser dump uploading

Browse Source
This commit is contained in:
onebeastchris
2025-08-04 23:46:30 +02:00
parent efa41e05b7
commit bea10781bd
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.java
View File

@@ -25,6 +25,7 @@
package org.geysermc.geyser.command.defaults; package org.geysermc.geyser.command.defaults;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.util.DefaultIndenter; import com.fasterxml.jackson.core.util.DefaultIndenter;
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
@@ -148,7 +149,7 @@ public class DumpCommand extends GeyserCommand {
} else { } else {
source.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.dump.uploading", source.locale())); source.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.dump.uploading", source.locale()));
String response; String response = null;
JsonNode responseNode; JsonNode responseNode;
try { try {
response = WebUtils.post(DUMP_URL + "documents", dumpData); response = WebUtils.post(DUMP_URL + "documents", dumpData);
@@ -156,6 +157,9 @@ public class DumpCommand extends GeyserCommand {
} catch (IOException e) { } catch (IOException e) {
source.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.upload_error", source.locale())); source.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.upload_error", source.locale()));
geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.upload_error_short"), e); geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.upload_error_short"), e);
if (e instanceof JsonParseException && response != null) {
geyser.getLogger().error("Failed to parse dump response! got: " + response);
}
return; return;
} }

11
core/src/main/java/org/geysermc/geyser/network/UpstreamPacketHandler.java
View File

@@ -361,12 +361,6 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
return PacketSignal.HANDLED; return PacketSignal.HANDLED;
} }
if (finishedResourcePackSending) {
GeyserImpl.getInstance().getLogger().warning("Received resource pack chunk packet after stage completed! " + packet.toString());
session.disconnect("Illegal duplicate resource pack packet received!");
return PacketSignal.HANDLED;
}
// Resolve some console pack downloading issues. // Resolve some console pack downloading issues.
// See <https://github.com/PowerNukkitX/PowerNukkitX/pull/1997> for reference // See <https://github.com/PowerNukkitX/PowerNukkitX/pull/1997> for reference
chunkRequestQueue.add(packet); chunkRequestQueue.add(packet);
@@ -406,6 +400,11 @@ public class UpstreamPacketHandler extends LoggingPacketHandler {
chunkRequestQueue.clear(); chunkRequestQueue.clear();
return; return;
} }
} else if (finishedResourcePackSending) {
GeyserImpl.getInstance().getLogger().warning("Received resource pack chunk packet after stage completed! " + packet);
session.disconnect("Duplicate resource pack packet received!");
chunkRequestQueue.clear();
return;
} }
ResourcePackChunkDataPacket data = new ResourcePackChunkDataPacket(); ResourcePackChunkDataPacket data = new ResourcePackChunkDataPacket();