Merge branch 'master' into plugin

This commit is contained in:
Redned 2020-01-25 23:03:47 -06:00 committed by RednedEpic
commit c4857c6a54
3 changed files with 8 additions and 2 deletions

View file

@ -30,6 +30,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import org.geysermc.common.IGeyserConfiguration;
import java.io.File;
import java.util.Map;
@JsonIgnoreProperties(ignoreUnknown = true)
@ -61,6 +62,11 @@ public class GeyserConfiguration implements IGeyserConfiguration {
private MetricsInfo metrics;
@Override
public File getFloodgateKeyFile() {
return new File(floodgateKeyFile);
}
@Getter
public static class BedrockConfiguration implements IBedrockConfiguration {