3
0
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-10-08 11:10:06 +02:00

ProtocolInfo is not a StoredObject

You can't actually call UserConnection#get with ProtocolInfo.class since the ProtocolInfo interface is not a StoredObject
Dieser Commit ist enthalten in:
KennyTV 2021-04-28 18:57:08 +02:00
Ursprung 8e15b6d42b
Commit 00746833ac
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 6BE3B555EBC5982B
2 geänderte Dateien mit 9 neuen und 5 gelöschten Zeilen

Datei anzeigen

@ -23,7 +23,6 @@
package com.viaversion.viaversion.connection; package com.viaversion.viaversion.connection;
import com.viaversion.viaversion.api.connection.ProtocolInfo; import com.viaversion.viaversion.api.connection.ProtocolInfo;
import com.viaversion.viaversion.api.connection.StoredObject;
import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.ProtocolPipeline; import com.viaversion.viaversion.api.protocol.ProtocolPipeline;
import com.viaversion.viaversion.api.protocol.packet.State; import com.viaversion.viaversion.api.protocol.packet.State;
@ -31,7 +30,8 @@ import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
import java.util.UUID; import java.util.UUID;
public class ProtocolInfoImpl extends StoredObject implements ProtocolInfo { public class ProtocolInfoImpl implements ProtocolInfo {
private final UserConnection connection;
private State state = State.HANDSHAKE; private State state = State.HANDSHAKE;
private int protocolVersion = -1; private int protocolVersion = -1;
private int serverProtocolVersion = -1; private int serverProtocolVersion = -1;
@ -39,8 +39,8 @@ public class ProtocolInfoImpl extends StoredObject implements ProtocolInfo {
private UUID uuid; private UUID uuid;
private ProtocolPipeline pipeline; private ProtocolPipeline pipeline;
public ProtocolInfoImpl(UserConnection user) { public ProtocolInfoImpl(UserConnection connection) {
super(user); this.connection = connection;
} }
@Override @Override
@ -106,6 +106,11 @@ public class ProtocolInfoImpl extends StoredObject implements ProtocolInfo {
this.pipeline = pipeline; this.pipeline = pipeline;
} }
@Override
public UserConnection getUser() {
return connection;
}
@Override @Override
public String toString() { public String toString() {
return "ProtocolInfo{" + return "ProtocolInfo{" +

Datei anzeigen

@ -72,7 +72,6 @@ public class UserConnectionImpl implements UserConnection {
public UserConnectionImpl(@Nullable Channel channel, boolean clientSide) { public UserConnectionImpl(@Nullable Channel channel, boolean clientSide) {
this.channel = channel; this.channel = channel;
this.clientSide = clientSide; this.clientSide = clientSide;
storedObjects.put(ProtocolInfo.class, (StoredObject) protocolInfo);
} }
/** /**