Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-01 08:10:00 +01:00
Code Issues Projects Releases Wiki Activity

Cancel "message not delivered" messages

Browse Source 
Fixes #3438
This commit is contained in:
Nassim Jahnke 2024-06-25 15:19:03 +02:00
parent 1ff3035bc0
commit ceb1cffb00
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/Protocol1_20To1_20_2.java
View File

@ -18,6 +18,7 @@
package com.viaversion.viaversion.protocols.v1_20to1_20_2; package com.viaversion.viaversion.protocols.v1_20to1_20_2;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.nbt.tag.CompoundTag;
import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.api.connection.ProtocolInfo; import com.viaversion.viaversion.api.connection.ProtocolInfo;
@ -90,6 +91,22 @@ public final class Protocol1_20To1_20_2 extends AbstractProtocol<ClientboundPack
sanitizeCustomPayload(wrapper); sanitizeCustomPayload(wrapper);
}); });
registerClientbound(ClientboundPackets1_19_4.SYSTEM_CHAT, wrapper -> {
if (wrapper.user().isClientSide() || Via.getPlatform().isProxy()) {
return;
}
// Workaround for GH-3438, where chat messages are sent before the login has completed, usually during proxy server switches
// The server will unnecessarily send an error text message, thinking a packet ran into an error, when it was just cancelled and re-queued
final JsonElement component = wrapper.passthrough(Types.COMPONENT);
if (component instanceof JsonObject object && object.has("translate")) {
final JsonElement translate = object.get("translate");
if (translate != null && translate.getAsString().equals("multiplayer.message_not_delivered")) {
wrapper.cancel();
}
}
});
registerClientbound(ClientboundPackets1_19_4.RESOURCE_PACK, wrapper -> { registerClientbound(ClientboundPackets1_19_4.RESOURCE_PACK, wrapper -> {
final String url = wrapper.passthrough(Types.STRING); final String url = wrapper.passthrough(Types.STRING);
final String hash = wrapper.passthrough(Types.STRING); final String hash = wrapper.passthrough(Types.STRING);