diff --git a/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java b/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java index e6b2ee0cb..d1364826a 100644 --- a/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java +++ b/bootstrap/spigot/src/main/java/org/geysermc/platform/spigot/GeyserSpigotPlugin.java @@ -183,7 +183,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap { this.geyserInjector = new GeyserSpigotInjector(isViaVersion); this.geyserInjector.initializeLocalChannel(this); - if (connector.getConfig().isUseAdapters()) { + if (Boolean.parseBoolean(System.getProperty("Geyser.UseDirectAdapters", "true"))) { try { String name = Bukkit.getServer().getClass().getPackage().getName(); String nmsVersion = name.substring(name.lastIndexOf('.') + 1); @@ -208,7 +208,7 @@ public class GeyserSpigotPlugin extends JavaPlugin implements GeyserBootstrap { } } } else { - geyserLogger.debug("Not using NMS adapter as it is disabled in the config."); + geyserLogger.debug("Not using NMS adapter as it is disabled via system property."); } if (this.geyserWorldManager == null) { // No NMS adapter diff --git a/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java b/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java index a48ce030b..bf5b137b3 100644 --- a/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java +++ b/connector/src/main/java/org/geysermc/connector/configuration/GeyserConfiguration.java @@ -171,8 +171,6 @@ public interface GeyserConfiguration { int getMtu(); - boolean isUseAdapters(); - boolean isUseDirectConnection(); int getConfigVersion(); diff --git a/connector/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java b/connector/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java index b502d81ca..759652293 100644 --- a/connector/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java +++ b/connector/src/main/java/org/geysermc/connector/configuration/GeyserJacksonConfiguration.java @@ -247,9 +247,6 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration @JsonProperty("mtu") private int mtu = 1400; - @JsonProperty("use-adapters") - private boolean useAdapters = true; - @JsonProperty("use-direct-connection") private boolean useDirectConnection = true; diff --git a/connector/src/main/resources/config.yml b/connector/src/main/resources/config.yml index 0d87c0c02..c5698ad93 100644 --- a/connector/src/main/resources/config.yml +++ b/connector/src/main/resources/config.yml @@ -195,10 +195,6 @@ enable-proxy-connections: false # 1400 is the default. # mtu: 1400 -# Whether to use direct server methods to retrieve information such as block states. -# Turning this off for Spigot will stop NMS from being used but will have a performance impact. -use-adapters: true - # Whether to connect directly into the Java server without creating a TCP connection. # This should only be disabled if a plugin that interfaces with packets or the network does not work correctly with Geyser. # If enabled on plugin versions, the remote address and port sections are ignored