Mirrors/Geyser
3
0
Fork 0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-12-25 15:50:14 +01:00
Code Issues Projekte Releases Wiki Aktivität

Fixed merge conflicts

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Tim203 2021-03-23 01:46:33 +01:00
Ursprung 107cd5bd5a
Commit 4c6c397f37
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 064EE9F5BF7C3EE8
3 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
connector/src/main/java/org/geysermc/connector/GeyserConnector.java
Datei anzeigen

@ -195,7 +195,7 @@ public class GeyserConnector {
defaultAuthType = AuthType.getByName(config.getRemote().getAuthType()); defaultAuthType = AuthType.getByName(config.getRemote().getAuthType());
if (authType == AuthType.FLOODGATE) { if (defaultAuthType == AuthType.FLOODGATE) {
try { try {
Key key = new AesKeyProducer().produceFrom(config.getFloodgateKeyPath()); Key key = new AesKeyProducer().produceFrom(config.getFloodgateKeyPath());
cipher = new AesCipher(new Base64Topping()); cipher = new AesCipher(new Base64Topping());

2
connector/src/main/java/org/geysermc/connector/network/translators/java/JavaJoinGameTranslator.java
Datei anzeigen

@ -97,7 +97,7 @@ public class JavaJoinGameTranslator extends PacketTranslator<ServerJoinGamePacke
session.sendDownstreamPacket(new ClientPluginMessagePacket("minecraft:brand", PluginMessageUtils.getGeyserBrandData())); session.sendDownstreamPacket(new ClientPluginMessagePacket("minecraft:brand", PluginMessageUtils.getGeyserBrandData()));
// register the plugin messaging channels used in Floodgate // 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())); session.sendDownstreamPacket(new ClientPluginMessagePacket("minecraft:register", PluginMessageUtils.getFloodgateRegisterData()));
} }

4
connector/src/main/java/org/geysermc/connector/network/translators/java/JavaPluginMessageTranslator.java
Datei anzeigen

@ -42,8 +42,8 @@ import java.nio.charset.StandardCharsets;
public class JavaPluginMessageTranslator extends PacketTranslator<ServerPluginMessagePacket> { public class JavaPluginMessageTranslator extends PacketTranslator<ServerPluginMessagePacket> {
@Override @Override
public void translate(ServerPluginMessagePacket packet, GeyserSession session) { public void translate(ServerPluginMessagePacket packet, GeyserSession session) {
// The only plugin messages to listen for are Floodgate plugin messages // The only plugin messages it has to listen for are Floodgate plugin messages
if (session.getConnector().getAuthType() != AuthType.FLOODGATE) { if (session.getConnector().getDefaultAuthType() != AuthType.FLOODGATE) {
return; return;
} }