Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-11-20 06:50:08 +01:00
Code Issues Releases Aktivität

Always throw on serverbound custom payload errors

Quellcode durchsuchen 
Old server versions did suppress exceptions, but that doesn't matter for us
Dieser Commit ist enthalten in:
Nassim Jahnke 2024-05-21 20:47:48 +02:00
Ursprung c5756fe45c
Commit 01589b3c49
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: EF6771C01F6EF02F
4 geänderte Dateien mit 15 neuen und 15 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/ItemPacketRewriter1_13.java
Datei anzeigen

@ -224,7 +224,7 @@ public class ItemPacketRewriter1_13 extends ItemRewriter<ClientboundPackets1_12_
@Override @Override
public void register() { public void register() {
map(Types.STRING); // Channel map(Types.STRING); // Channel
handlerSoftFail(wrapper -> { handler(wrapper -> {
String channel = wrapper.get(Types.STRING, 0); String channel = wrapper.get(Types.STRING, 0);
String old = channel; String old = channel;
channel = getOldPluginChannelId(channel); channel = getOldPluginChannelId(channel);

2
common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/Protocol1_15_2To1_16.java
Datei anzeigen

@ -165,7 +165,7 @@ public class Protocol1_15_2To1_16 extends AbstractProtocol<ClientboundPackets1_1
@Override @Override
public void register() { public void register() {
map(Types.STRING); // Channel map(Types.STRING); // Channel
handlerSoftFail(wrapper -> { handler(wrapper -> {
final String channel = wrapper.get(Types.STRING, 0); final String channel = wrapper.get(Types.STRING, 0);
final String namespacedChannel = Key.namespaced(channel); final String namespacedChannel = Key.namespaced(channel);
if (channel.length() > 32) { if (channel.length() > 32) {

22
common/src/main/java/com/viaversion/viaversion/protocols/v1_20to1_20_2/Protocol1_20To1_20_2.java
Datei anzeigen

@ -78,21 +78,13 @@ public final class Protocol1_20To1_20_2 extends AbstractProtocol<ClientboundPack
soundRewriter.registerSound1_19_3(ClientboundPackets1_19_4.SOUND); soundRewriter.registerSound1_19_3(ClientboundPackets1_19_4.SOUND);
soundRewriter.registerSound1_19_3(ClientboundPackets1_19_4.SOUND_ENTITY); soundRewriter.registerSound1_19_3(ClientboundPackets1_19_4.SOUND_ENTITY);
final PacketHandlers sanitizeCustomPayload = new PacketHandlers() { registerClientbound(ClientboundPackets1_19_4.CUSTOM_PAYLOAD, new PacketHandlers() {
@Override @Override
protected void register() { protected void register() {
map(Types.STRING); // Channel handlerSoftFail(Protocol1_20To1_20_2::sanitizeCustomPayload);
handlerSoftFail(wrapper -> {
final String channel = Key.namespaced(wrapper.get(Types.STRING, 0));
if (channel.equals("minecraft:brand")) {
wrapper.passthrough(Types.STRING);
wrapper.clearInputBuffer();
} }
}); });
} registerServerbound(ServerboundPackets1_20_2.CUSTOM_PAYLOAD, Protocol1_20To1_20_2::sanitizeCustomPayload);
};
registerClientbound(ClientboundPackets1_19_4.CUSTOM_PAYLOAD, sanitizeCustomPayload);
registerServerbound(ServerboundPackets1_20_2.CUSTOM_PAYLOAD, sanitizeCustomPayload);
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);
@ -212,6 +204,14 @@ public final class Protocol1_20To1_20_2 extends AbstractProtocol<ClientboundPack
}); });
} }
private static void sanitizeCustomPayload(final PacketWrapper wrapper) {
final String channel = Key.namespaced(wrapper.passthrough(Types.STRING));
if (channel.equals("minecraft:brand")) {
wrapper.passthrough(Types.STRING);
wrapper.clearInputBuffer();
}
}
@Override @Override
public void transform(final Direction direction, final State state, final PacketWrapper packetWrapper) throws InformativeException, CancelException { public void transform(final Direction direction, final State state, final PacketWrapper packetWrapper) throws InformativeException, CancelException {
if (direction == Direction.SERVERBOUND) { if (direction == Direction.SERVERBOUND) {

2
common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/PlayerPacketRewriter1_9.java
Datei anzeigen

@ -416,7 +416,7 @@ public class PlayerPacketRewriter1_9 {
@Override @Override
public void register() { public void register() {
map(Types.STRING); // 0 - Channel Name map(Types.STRING); // 0 - Channel Name
handlerSoftFail(wrapper -> { handler(wrapper -> {
String name = wrapper.get(Types.STRING, 0); String name = wrapper.get(Types.STRING, 0);
if (name.equals("MC|BSign")) { if (name.equals("MC|BSign")) {
Item item = wrapper.passthrough(Types.ITEM1_8); Item item = wrapper.passthrough(Types.ITEM1_8);