Skip to content
This repository was archived by the owner on Jun 19, 2021. It is now read-only.

Commit 9c34bf8

Browse files
committed
Fix a special case with 0 plugins
1 parent 364bf54 commit 9c34bf8

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/main/java/org/yatopiamc/bot/timings/TimingsMessageListener.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,19 @@ private void checkServerConfigs(EmbedBuilder embedBuilder, JsonObject timingsMas
174174
LOGGER.warn(t.toString());
175175
}
176176
});
177+
}
178+
179+
private void checkPlugins(EmbedBuilder embedBuilder, JsonObject timingsMaster) {
180+
if(!timingsMaster.get("plugins").isJsonObject()) return;
177181
final JsonObject plugins = timingsMaster.getAsJsonObject("plugins");
182+
final JsonObject configs = timingsMaster.getAsJsonObject("config");
183+
TimingsSuggestions.SERVER_PLUGIN_SUGGESTIONS.entrySet().stream().flatMap(entry -> {
184+
if (configs.has(entry.getKey()))
185+
return entry.getValue().suggestions.entrySet().stream();
186+
return Stream.empty();
187+
}).sorted(Map.Entry.comparingByKey()).filter(entry -> plugins.has(entry.getKey())).forEach(entry -> {
188+
embedBuilder.addField(String.format("%s %s", entry.getKey(), entry.getValue().prefix), entry.getValue().warning, true);
189+
});
178190
try {
179191
if (plugins.has("TCPShield") && configs.has("purpur") && configs.getAsJsonObject("purpur").getAsJsonObject("settings").get("use-alternate-keepalive").getAsBoolean())
180192
embedBuilder.addField("settings.use-alternate-keepalive", "Disable this in [purpur.yml](http://bit.ly/purpurc). It can cause issues with TCPShield", true);
@@ -193,18 +205,6 @@ private void checkServerConfigs(EmbedBuilder embedBuilder, JsonObject timingsMas
193205
}
194206
}
195207

196-
private void checkPlugins(EmbedBuilder embedBuilder, JsonObject timingsMaster) {
197-
final JsonObject plugins = timingsMaster.getAsJsonObject("plugins");
198-
final JsonObject configs = timingsMaster.getAsJsonObject("config");
199-
TimingsSuggestions.SERVER_PLUGIN_SUGGESTIONS.entrySet().stream().flatMap(entry -> {
200-
if (configs.has(entry.getKey()))
201-
return entry.getValue().suggestions.entrySet().stream();
202-
return Stream.empty();
203-
}).sorted(Map.Entry.comparingByKey()).filter(entry -> plugins.has(entry.getKey())).forEach(entry -> {
204-
embedBuilder.addField(String.format("%s %s", entry.getKey(), entry.getValue().prefix), entry.getValue().warning, true);
205-
});
206-
}
207-
208208
private void checkDataPacks(EmbedBuilder embedBuilder, JsonObject timingsMaster) {
209209
final JsonObject handlerMap = timingsMaster.getAsJsonObject("idmap").getAsJsonObject("handlerMap");
210210
handlerMap.entrySet().stream().filter(entry -> {

0 commit comments

Comments
 (0)