Apple/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Fix NPE if config was null in BungeeCord module

Browse source
This commit is contained in:
Redned 2019-12-02 08:27:45 -06:00 committed by GitHub
parent 3e7e34dfb9
commit 5552f34871
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bootstrap/bungeecord/src/main/java/org/geysermc/platform/bungeecord/GeyserBungeePlugin.java
View file

@ -57,13 +57,13 @@ public class GeyserBungeePlugin extends Plugin implements IGeyserBootstrap {
Files.copy(in, file.toPath()); Files.copy(in, file.toPath());
configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(new File(getDataFolder(), "config.yml")); configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(new File(getDataFolder(), "config.yml"));
} catch (IOException ex) { } catch (IOException ex) {
geyserLogger.severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex); getLogger().severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex);
return; return;
} }
} }
if (configuration == null) { if (configuration == null) {
geyserLogger.severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!"); getLogger().severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!");
return; return;
} }
@ -74,7 +74,7 @@ public class GeyserBungeePlugin extends Plugin implements IGeyserBootstrap {
try { try {
ConfigurationProvider.getProvider(YamlConfiguration.class).save(configuration, new File(getDataFolder(), "config.yml")); ConfigurationProvider.getProvider(YamlConfiguration.class).save(configuration, new File(getDataFolder(), "config.yml"));
} catch (IOException ex) { } catch (IOException ex) {
geyserLogger.severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex); getLogger().severe("Failed to read/create config.yml! Make sure it's up to date and/or readable+writable!", ex);
return; return;
} }
} }