Skip to content

Commit c413cf4

Browse files
committed
Remove pointless iterable.
1 parent 87162ac commit c413cf4

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.sk89q.worldedit.util.report.Unreported;
2727

2828
import java.io.File;
29+
import java.util.Collection;
2930
import java.util.concurrent.ConcurrentHashMap;
3031
import java.util.concurrent.ConcurrentMap;
3132

@@ -47,7 +48,7 @@ public BukkitConfigurationManager(WorldGuardPlugin plugin) {
4748
this.plugin = plugin;
4849
}
4950

50-
public Iterable<BukkitWorldConfiguration> getWorldConfigs() {
51+
public Collection<BukkitWorldConfiguration> getWorldConfigs() {
5152
return worlds.values();
5253
}
5354

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,12 @@ private void setupCustomCharts(Metrics metrics) {
232232
int whitelisted = 0;
233233
for (BukkitWorldConfiguration worldConfig : platform.getGlobalStateManager().getWorldConfigs()) {
234234
Blacklist blacklist = worldConfig.getBlacklist();
235-
if (blacklist == null || blacklist.isEmpty()) {
236-
continue;
237-
} else if (blacklist.isWhitelist()) {
238-
whitelisted += blacklist.getItemCount();
239-
} else {
240-
blacklisted += blacklist.getItemCount();
235+
if (blacklist != null && !blacklist.isEmpty()) {
236+
if (blacklist.isWhitelist()) {
237+
whitelisted += blacklist.getItemCount();
238+
} else {
239+
blacklisted += blacklist.getItemCount();
240+
}
241241
}
242242
}
243243
Map<String, Integer> blacklistCounts = new HashMap<>();
@@ -246,9 +246,9 @@ private void setupCustomCharts(Metrics metrics) {
246246
return blacklistCounts;
247247
}));
248248
metrics.addCustomChart(new Metrics.SimplePie("chest_protection", () ->
249-
"" + Streams.stream(platform.getGlobalStateManager().getWorldConfigs()).anyMatch(cfg -> cfg.signChestProtection)));
249+
"" + platform.getGlobalStateManager().getWorldConfigs().stream().anyMatch(cfg -> cfg.signChestProtection)));
250250
metrics.addCustomChart(new Metrics.SimplePie("build_permissions", () ->
251-
"" + Streams.stream(platform.getGlobalStateManager().getWorldConfigs()).anyMatch(cfg -> cfg.buildPermissions)));
251+
"" + platform.getGlobalStateManager().getWorldConfigs().stream().anyMatch(cfg -> cfg.buildPermissions)));
252252

253253
metrics.addCustomChart(new Metrics.SimplePie("custom_flags", () ->
254254
"" + (WorldGuard.getInstance().getFlagRegistry().size() > Flags.INBUILT_FLAGS.size())));

0 commit comments

Comments
 (0)