Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-02-15 11:21:56 +01:00
Code Issues Projects Releases Wiki Activity

Hotfix: it was shit, sorry

Browse Source
This commit is contained in:
Gabriele C 2015-07-25 00:08:29 +02:00
parent a614d3e554
commit a7a4a511e7
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/fr/xephi/authme/settings/Messages.java
View File

@ -1,9 +1,12 @@
package fr.xephi.authme.settings; package fr.xephi.authme.settings;
import java.io.File; import java.io.File;
import java.io.InputStream;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import fr.xephi.authme.AuthMe;
import fr.xephi.authme.ConsoleLogger; import fr.xephi.authme.ConsoleLogger;
public class Messages extends CustomConfiguration { public class Messages extends CustomConfiguration {
@ -24,11 +27,13 @@ public class Messages extends CustomConfiguration {
* @param filename * @param filename
* The filename to open * The filename to open
*/ */
@SuppressWarnings("deprecation")
public final void loadDefaults(File file) { public final void loadDefaults(File file) {
if (!file.exists()) InputStream stream = AuthMe.getInstance().getResource(file.getName());
if (stream == null)
return; return;
setDefaults(YamlConfiguration.loadConfiguration(file)); setDefaults(YamlConfiguration.loadConfiguration(stream));
} }
/** /**

19
src/main/java/fr/xephi/authme/settings/Settings.java
View File

@ -7,6 +7,7 @@ import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -102,7 +103,7 @@ public final class Settings extends YamlConfiguration {
if (exists()) { if (exists()) {
load(); load();
} else { } else {
loadDefaults(file); loadDefaults(file.getName());
load(); load();
} }
configFile = (YamlConfiguration) plugin.getConfig(); configFile = (YamlConfiguration) plugin.getConfig();
@ -685,7 +686,7 @@ public final class Settings extends YamlConfiguration {
public final void reload() { public final void reload() {
load(); load();
loadDefaults(file); loadDefaults(file.getName());
} }
/** /**
@ -717,12 +718,14 @@ public final class Settings extends YamlConfiguration {
* @param filename * @param filename
* The filename to open * The filename to open
*/ */
public final void loadDefaults(File file) { @SuppressWarnings("deprecation")
if (!file.exists()) public final void loadDefaults(String filename) {
return; InputStream stream = plugin.getResource(filename);
if (stream == null)
setDefaults(YamlConfiguration.loadConfiguration(file)); return;
}
setDefaults(YamlConfiguration.loadConfiguration(stream));
}
/** /**
* Saves current configuration (plus defaults) to disk. * Saves current configuration (plus defaults) to disk.