summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-16 12:06:06 +1000
committermd_5 <git@md-5.net>2018-07-16 12:06:06 +1000
commit8fbc72b714a5051c6df8f05ac97528d747f1bdeb (patch)
tree3bdccf40315f0904c84e004a148575fab9b703af /src/main
parent322f2f951855642a4af2ca539806e86be590cc6d (diff)
downloadcraftbukkit-8fbc72b714a5051c6df8f05ac97528d747f1bdeb.tar
craftbukkit-8fbc72b714a5051c6df8f05ac97528d747f1bdeb.tar.gz
craftbukkit-8fbc72b714a5051c6df8f05ac97528d747f1bdeb.tar.lz
craftbukkit-8fbc72b714a5051c6df8f05ac97528d747f1bdeb.tar.xz
craftbukkit-8fbc72b714a5051c6df8f05ac97528d747f1bdeb.zip
Add ignore-vanilla-permissions option to assist with disabling default commands
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java3
-rw-r--r--src/main/resources/configurations/commands.yml2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 93886407..df6d227f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -185,6 +185,7 @@ public final class CraftServer implements Server {
private boolean printSaveWarning;
private CraftIconCache icon;
private boolean overrideAllCommandBlockCommands = false;
+ public boolean ignoreVanillaPermissions = false;
private final List<CraftPlayer> playerView;
public int reloadCount;
@@ -261,6 +262,7 @@ public final class CraftServer implements Server {
saveCommandsConfig();
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
+ ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
pluginManager.useTimings(configuration.getBoolean("settings.plugin-profiling"));
monsterSpawn = configuration.getInt("spawn-limits.monsters");
animalSpawn = configuration.getInt("spawn-limits.animals");
@@ -741,6 +743,7 @@ public final class CraftServer implements Server {
resetRecipes();
reloadData();
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
+ ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
int pollCount = 0;
diff --git a/src/main/resources/configurations/commands.yml b/src/main/resources/configurations/commands.yml
index 0491a8bb..325c67e9 100644
--- a/src/main/resources/configurations/commands.yml
+++ b/src/main/resources/configurations/commands.yml
@@ -11,7 +11,7 @@
# Bug tracker: http://www.spigotmc.org/go/bugs
command-block-overrides: []
-unrestricted-advancements: false
+ignore-vanilla-permissions: false
aliases:
icanhasbukkit:
- "version $1-"