SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

Lazy-load the old and new configs for plugins .getConfig

Quellcode durchsuchen 
By: Nathan Adams <dinnerbone@dinnerbone.com>
Dieser Commit ist enthalten in:
Bukkit/Spigot 2011-10-10 23:04:01 +01:00
Ursprung 429eb80d6e
Commit 1ad373d9f6
1 geänderte Dateien mit 14 neuen und 10 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

24
paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
Datei anzeigen

@ -111,10 +111,24 @@ public abstract class JavaPlugin implements Plugin {
*/
@Deprecated
public Configuration getConfiguration() {
if (config == null) {
config = new Configuration(configFile);
config.load();
}
return config;
}
public FileConfiguration getConfig() {
if (newConfig == null) {
newConfig = YamlConfiguration.loadConfiguration(configFile);
InputStream defConfigStream = getResource("config.yml");
if (defConfigStream != null) {
YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
newConfig.setDefaults(defConfig);
}
}
return newConfig;
}
@ -184,16 +198,6 @@ public abstract class JavaPlugin implements Plugin {
this.dataFolder = dataFolder;
this.classLoader = classLoader;
this.configFile = new File(dataFolder, "config.yml");
this.config = new Configuration(configFile);
this.config.load();
this.newConfig = YamlConfiguration.loadConfiguration(configFile);
InputStream defConfigStream = getResource("config.yml");
if (defConfigStream != null) {
YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(defConfigStream);
newConfig.setDefaults(defConfig);
}
if (description.isDatabaseEnabled()) {
ServerConfig db = new ServerConfig();