diff --git a/paper-api/src/main/java/org/bukkit/Bukkit.java b/paper-api/src/main/java/org/bukkit/Bukkit.java index c9ea6559f8..3bde4ad79a 100644 --- a/paper-api/src/main/java/org/bukkit/Bukkit.java +++ b/paper-api/src/main/java/org/bukkit/Bukkit.java @@ -1730,6 +1730,15 @@ public final class Bukkit { public static void setDefaultGameMode(@NotNull GameMode mode) { server.setDefaultGameMode(mode); } + + /** + * Gets whether the default gamemode is being enforced. + * + * @return {@code true} if the default gamemode is being forced, {@code false} otherwise + */ + public static boolean forcesDefaultGameMode() { + return server.forcesDefaultGameMode(); + } /** * Gets a {@link ConsoleCommandSender} that may be used as an input source diff --git a/paper-api/src/main/java/org/bukkit/Server.java b/paper-api/src/main/java/org/bukkit/Server.java index ed899c4cb4..9bab00ab10 100644 --- a/paper-api/src/main/java/org/bukkit/Server.java +++ b/paper-api/src/main/java/org/bukkit/Server.java @@ -1514,15 +1514,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return the default game mode */ @NotNull - public GameMode getDefaultGameMode(); + GameMode getDefaultGameMode(); /** * Sets the default {@link GameMode} for new players. * * @param mode the new game mode */ - public void setDefaultGameMode(@NotNull GameMode mode); + void setDefaultGameMode(@NotNull GameMode mode); + /** + * Gets whether the default gamemode is being enforced. + * + * @return {@code true} if the default gamemode is being forced, {@code false} otherwise + */ + boolean forcesDefaultGameMode(); + /** * Gets a {@link ConsoleCommandSender} that may be used as an input source * for this server. diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 1da86b25e3..c1f1b757ca 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2295,6 +2295,11 @@ public final class CraftServer implements Server { } } + @Override + public boolean forcesDefaultGameMode() { + return this.console.getProperties().forceGameMode; + } + @Override public ConsoleCommandSender getConsoleSender() { return this.console.console;