Upstream
/
WorldGuard
mirror of https://github.com/EngineHub/WorldGuard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disable generic commands on fresh installs only

This commit is contained in:
Loki Rautio 2023-11-07 14:03:55 -06:00
parent 557476b5d6
commit 7c7edc7d5f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java
View File

@ -34,7 +34,7 @@ public class BukkitConfigurationManager extends YamlConfigurationManager {
@Unreported private WorldGuardPlugin plugin;
@Unreported private ConcurrentMap<String, BukkitWorldConfiguration> worlds = new ConcurrentHashMap<>();
private boolean isFreshInstall;
private boolean hasCommandBookGodMode;
boolean disableGeneralCommands;
boolean extraStats;
@ -57,7 +57,8 @@ public class BukkitConfigurationManager extends YamlConfigurationManager {
public void load() {
super.load();
this.extraStats = getConfig().getBoolean("custom-metrics-charts", true);
this.disableGeneralCommands = getConfig().getBoolean("disable-general-commands", false);
// Disable legacy commands for fresh installs
this.disableGeneralCommands = getConfig().getBoolean("disable-general-commands", isFreshInstall);
}
@Override
@ -68,7 +69,7 @@ public class BukkitConfigurationManager extends YamlConfigurationManager {
@Override
public void copyDefaults() {
// Create the default configuration file
plugin.createDefaultConfiguration(new File(plugin.getDataFolder(), "config.yml"), "config.yml");
isFreshInstall = plugin.createDefaultConfiguration(new File(plugin.getDataFolder(), "config.yml"), "config.yml");
}
@Override

6
worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
View File

@ -488,7 +488,7 @@ public class WorldGuardPlugin extends JavaPlugin {
* @param actual The destination file
* @param defaultName The name of the file inside the jar's defaults folder
*/
public void createDefaultConfiguration(File actual, String defaultName) {
public boolean createDefaultConfiguration(File actual, String defaultName) {
// Make parent directories
File parent = actual.getParentFile();
@ -497,7 +497,7 @@ public class WorldGuardPlugin extends JavaPlugin {
}
if (actual.exists()) {
return;
return false;
}
try (InputStream stream = getResource("defaults/" + defaultName)){
@ -506,7 +506,7 @@ public class WorldGuardPlugin extends JavaPlugin {
} catch (IOException e) {
getLogger().severe("Unable to read default configuration: " + defaultName);
}
return true;
}
private void copyDefaultConfig(InputStream input, File actual, String name) {