Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-27 16:40:10 +01:00
Code Issues Releases Aktivität

Don't add base protocols when using special versions (#3704)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
RK_01 2024-02-18 21:55:14 +01:00 committet von GitHub
Ursprung 48241ba841
Commit 78aecbddf8
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194
2 geänderte Dateien mit 6 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

1
api/src/main/java/com/viaversion/viaversion/api/protocol/version/VersionType.java
Datei anzeigen

@ -59,6 +59,7 @@ public enum VersionType {
* Any version that doesn't fit in the above categories (e.g. April Fools). * Any version that doesn't fit in the above categories (e.g. April Fools).
* <p> * <p>
* Protocol versions using this type must override the compareTo method. * Protocol versions using this type must override the compareTo method.
* Protocol versions using this type must add base protocols to the pipeline manually.
*/ */
SPECIAL SPECIAL
} }

7
common/src/main/java/com/viaversion/viaversion/protocols/base/BaseProtocol.java
Datei anzeigen

@ -30,6 +30,7 @@ import com.viaversion.viaversion.api.protocol.packet.State;
import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider; import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import com.viaversion.viaversion.api.protocol.version.VersionProvider; import com.viaversion.viaversion.api.protocol.version.VersionProvider;
import com.viaversion.viaversion.api.protocol.version.VersionType;
import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.protocols.base.packet.BaseClientboundPacket; import com.viaversion.viaversion.protocols.base.packet.BaseClientboundPacket;
import com.viaversion.viaversion.protocols.base.packet.BasePacketTypesProvider; import com.viaversion.viaversion.protocols.base.packet.BasePacketTypesProvider;
@ -93,7 +94,9 @@ public class BaseProtocol extends AbstractProtocol<BaseClientboundPacket, BaseCl
} }
// Add Base Protocol // Add Base Protocol
pipeline.add(Via.getManager().getProtocolManager().getBaseProtocol(serverProtocol)); if (!serverProtocol.getVersionType().equals(VersionType.SPECIAL)) {
pipeline.add(Via.getManager().getProtocolManager().getBaseProtocol(serverProtocol));
}
if (Via.getManager().isDebug()) { if (Via.getManager().isDebug()) {
Via.getPlatform().getLogger().info("User connected with protocol: " + info.protocolVersion() + " and serverProtocol: " + info.serverProtocolVersion()); Via.getPlatform().getLogger().info("User connected with protocol: " + info.protocolVersion() + " and serverProtocol: " + info.serverProtocolVersion());
@ -139,4 +142,4 @@ public class BaseProtocol extends AbstractProtocol<BaseClientboundPacket, BaseCl
protected PacketTypesProvider<BaseClientboundPacket, BaseClientboundPacket, BaseServerboundPacket, BaseServerboundPacket> createPacketTypesProvider() { protected PacketTypesProvider<BaseClientboundPacket, BaseClientboundPacket, BaseServerboundPacket, BaseServerboundPacket> createPacketTypesProvider() {
return BasePacketTypesProvider.INSTANCE; return BasePacketTypesProvider.INSTANCE;
} }
} }