mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Fixed merge conflicts
This commit is contained in:
parent
107cd5bd5a
commit
4c6c397f37
3 changed files with 4 additions and 4 deletions
|
@ -195,7 +195,7 @@ public class GeyserConnector {
|
|||
|
||||
defaultAuthType = AuthType.getByName(config.getRemote().getAuthType());
|
||||
|
||||
if (authType == AuthType.FLOODGATE) {
|
||||
if (defaultAuthType == AuthType.FLOODGATE) {
|
||||
try {
|
||||
Key key = new AesKeyProducer().produceFrom(config.getFloodgateKeyPath());
|
||||
cipher = new AesCipher(new Base64Topping());
|
||||
|
|
|
@ -97,7 +97,7 @@ public class JavaJoinGameTranslator extends PacketTranslator<ServerJoinGamePacke
|
|||
session.sendDownstreamPacket(new ClientPluginMessagePacket("minecraft:brand", PluginMessageUtils.getGeyserBrandData()));
|
||||
|
||||
// register the plugin messaging channels used in Floodgate
|
||||
if (session.getConnector().getAuthType() == AuthType.FLOODGATE) {
|
||||
if (session.getConnector().getDefaultAuthType() == AuthType.FLOODGATE) {
|
||||
session.sendDownstreamPacket(new ClientPluginMessagePacket("minecraft:register", PluginMessageUtils.getFloodgateRegisterData()));
|
||||
}
|
||||
|
||||
|
|
|
@ -42,8 +42,8 @@ import java.nio.charset.StandardCharsets;
|
|||
public class JavaPluginMessageTranslator extends PacketTranslator<ServerPluginMessagePacket> {
|
||||
@Override
|
||||
public void translate(ServerPluginMessagePacket packet, GeyserSession session) {
|
||||
// The only plugin messages to listen for are Floodgate plugin messages
|
||||
if (session.getConnector().getAuthType() != AuthType.FLOODGATE) {
|
||||
// The only plugin messages it has to listen for are Floodgate plugin messages
|
||||
if (session.getConnector().getDefaultAuthType() != AuthType.FLOODGATE) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue