3
0
Mirror von https://github.com/GeyserMC/Geyser.git synchronisiert 2024-12-26 00:00:41 +01:00

Fixed loadFloodgate method (#31)

Upstream Commit 7cd3eb99ef broke it
Dieser Commit ist enthalten in:
byquanton 2021-10-09 18:47:10 +00:00 committet von GitHub
Ursprung cef3f5f1bd
Commit 6cc092cc8e

Datei anzeigen

@ -32,7 +32,6 @@ import org.geysermc.connector.FloodgateKeyLoader;
import org.geysermc.connector.configuration.GeyserJacksonConfiguration; import org.geysermc.connector.configuration.GeyserJacksonConfiguration;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Optional;
public class GeyserFabricConfiguration extends GeyserJacksonConfiguration { public class GeyserFabricConfiguration extends GeyserJacksonConfiguration {
@JsonIgnore @JsonIgnore
@ -40,9 +39,9 @@ public class GeyserFabricConfiguration extends GeyserJacksonConfiguration {
public void loadFloodgate(GeyserFabricMod geyser, ModContainer floodgate) { public void loadFloodgate(GeyserFabricMod geyser, ModContainer floodgate) {
Path geyserDataFolder = geyser.getConfigFolder(); Path geyserDataFolder = geyser.getConfigFolder();
Path floodgateDataFolder = FabricLoader.getInstance().getConfigDir().resolve("floodgate"); Path floodgateDataFolder = floodgate != null ? FabricLoader.getInstance().getConfigDir().resolve("floodgate") : null;
floodgateKeyPath = FloodgateKeyLoader.getKeyPath(this, floodgate, floodgateDataFolder, geyserDataFolder, geyser.getGeyserLogger()); floodgateKeyPath = FloodgateKeyLoader.getKeyPath(this, floodgateDataFolder, geyserDataFolder, geyser.getGeyserLogger());
} }
@Override @Override