Skip to content

Commit

Permalink
fix: isArena check if arena details A is null
Browse files Browse the repository at this point in the history
  • Loading branch information
@HappyAreaBean
HappyAreaBean committed Jan 27, 2023
1 parent 4d24cbc commit 25dfd90
Show file tree
Hide file tree
Showing 2 changed files with 81 additions and 79 deletions.
153 changes: 75 additions & 78 deletions src/main/java/cc/happyareabean/swmhook/commands/SWMHookCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;

import static cc.happyareabean.swmhook.constants.Constants.HELP_COMMAND_FORMAT;
Expand Down Expand Up @@ -259,93 +258,91 @@ public void worldList(BukkitCommandActor actor,
@Switch(value = "hideDup") boolean hideDuplicate,
@Optional String filter) {

CompletableFuture.runAsync(() -> {
int totalWorlds = 0;
int totalWorlds = 0;

List<Component> list = new ArrayList<>();
if (filter != null) {
list.add(text("Searching for: ", NamedTextColor.WHITE, TextDecoration.BOLD).append(text(filter, NamedTextColor.AQUA)).append(text("...")));
if (Bukkit.getWorlds().stream().noneMatch(w -> w.getName().contains(filter))) {
list.add(space());
list.add(text("No worlds match your search criteria.", NamedTextColor.RED));
}
List<Component> list = new ArrayList<>();
if (filter != null) {
list.add(text("Searching for: ", NamedTextColor.WHITE, TextDecoration.BOLD).append(text(filter, NamedTextColor.AQUA)).append(text("...")));
if (Bukkit.getWorlds().stream().noneMatch(w -> w.getName().contains(filter))) {
list.add(space());
list.add(text("No worlds match your search criteria.", NamedTextColor.RED));
}
}

if (hideDuplicate)
list.add(text("Duplicated are hidden", NamedTextColor.GRAY, TextDecoration.ITALIC));

List<Component> worldList = new ArrayList<>();
Bukkit.getWorlds().stream().filter(w -> {
switch (type) {
case NORMAL:
return SWMPlugin.getInstance().getNms().getSlimeWorld(w) == null;
case SLIME_ONLY:
return SWMPlugin.getInstance().getNms().getSlimeWorld(w) != null;
case SWMH_ONLY:
return SWMHook.getInstance().getWorldsList().getFromWorld(w) != null;
case PROVIDER:
return SWMHook.getInstance().getArenaProviderManager().getProvider().isArena(w);
case ALL:
default:
return true;
}
}).filter(w -> filter == null || w.getName().contains(filter))
.filter(w -> {
if (!hideDuplicate) return true;
SWMHWorld swmhWorld = SWMHook.getInstance().getWorldsList().getFromWorld(w);
if (swmhWorld != null) {
if (w.getName().equals(swmhWorld.getTemplateName()))
return true;

if (w.getName().contains(swmhWorld.getWorldName()))
return false;
}
return true;
}).sorted(Comparator.comparing(World::getName)).forEachOrdered(w -> {
TextComponent.Builder c = text();
c.append(text(" - ", NamedTextColor.GRAY));

c.append(text(w.getName(), NamedTextColor.GREEN)
.hoverEvent(text("Click here to teleport to world ", NamedTextColor.RED, TextDecoration.BOLD).append(text(w.getName(), NamedTextColor.GOLD)))
.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND, "/swmhook tp " + w.getName())));

if (type != SWMWorldSearchType.SLIME_ONLY) {
c.append(SWMPlugin.getInstance().getNms().getSlimeWorld(w) != null ? Tags.SLIME : empty());
} else {
c.append(Tags.SLIME);
}
if (hideDuplicate)
list.add(text("Duplicated are hidden", NamedTextColor.GRAY, TextDecoration.ITALIC));

List<Component> worldList = new ArrayList<>();
Bukkit.getWorlds().stream().filter(w -> {
switch (type) {
case NORMAL:
return SWMPlugin.getInstance().getNms().getSlimeWorld(w) == null;
case SLIME_ONLY:
return SWMPlugin.getInstance().getNms().getSlimeWorld(w) != null;
case SWMH_ONLY:
return SWMHook.getInstance().getWorldsList().getFromWorld(w) != null;
case PROVIDER:
return SWMHook.getInstance().getArenaProviderManager().getProvider().isArena(w);
case ALL:
default:
return true;
}
}).filter(w -> filter == null || w.getName().contains(filter))
.filter(w -> {
if (!hideDuplicate) return true;
SWMHWorld swmhWorld = SWMHook.getInstance().getWorldsList().getFromWorld(w);
if (swmhWorld != null) {
if (w.getName().equals(swmhWorld.getTemplateName()))
return true;

if (w.getName().contains(swmhWorld.getWorldName()))
return false;
}
return true;
}).sorted(Comparator.comparing(World::getName)).forEachOrdered(w -> {
TextComponent.Builder c = text();
c.append(text(" - ", NamedTextColor.GRAY));

c.append(text(w.getName(), NamedTextColor.GREEN)
.hoverEvent(text("Click here to teleport to world ", NamedTextColor.RED, TextDecoration.BOLD).append(text(w.getName(), NamedTextColor.GOLD)))
.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.RUN_COMMAND, "/swmhook tp " + w.getName())));

if (type != SWMWorldSearchType.SLIME_ONLY) {
c.append(SWMPlugin.getInstance().getNms().getSlimeWorld(w) != null ? Tags.SLIME : empty());
} else {
c.append(Tags.SLIME);
}

if (type != SWMWorldSearchType.SWMH_ONLY) {
c.append(SWMHook.getInstance().getWorldsList().getFromWorld(w) != null ? Tags.SWMH : empty());
} else {
c.append(Tags.SWMH);
}
if (type != SWMWorldSearchType.SWMH_ONLY) {
c.append(SWMHook.getInstance().getWorldsList().getFromWorld(w) != null ? Tags.SWMH : empty());
} else {
c.append(Tags.SWMH);
}

ArenaProvider arenaProvider = SWMHook.getInstance().getArenaProviderManager().getProvider();
if (type != SWMWorldSearchType.PROVIDER) {
if (arenaProvider.isArena(w)) {
c.append(Tags.fromProvider(arenaProvider.getProviderName()));
}
} else {
ArenaProvider arenaProvider = SWMHook.getInstance().getArenaProviderManager().getProvider();
if (type != SWMWorldSearchType.PROVIDER) {
if (arenaProvider.isArena(w)) {
c.append(Tags.fromProvider(arenaProvider.getProviderName()));
}
} else {
c.append(Tags.fromProvider(arenaProvider.getProviderName()));
}


worldList.add(c.build());
});

totalWorlds = worldList.size();
if (totalWorlds > 0) list.add(space());
list.addAll(worldList);

List<Component> finalList = new ArrayList<>();
finalList.add(text("----------------------------------------").color(NamedTextColor.DARK_GRAY).decorate(TextDecoration.STRIKETHROUGH));
finalList.add(LEGACY_SERIALIZER.deserialize(String.format("&c&lSWMHook World %s &7- &fTotal of &9%s &fworld%s &7- &6[%s]",
filter != null ? "Search" : "List", totalWorlds, totalWorlds > 1 ? "s" : "", type)));
finalList.addAll(list);
finalList.add(text("----------------------------------------").color(NamedTextColor.DARK_GRAY).decorate(TextDecoration.STRIKETHROUGH));
finalList.forEach(actor::reply);
worldList.add(c.build());
});

totalWorlds = worldList.size();
if (totalWorlds > 0) list.add(space());
list.addAll(worldList);

List<Component> finalList = new ArrayList<>();
finalList.add(text("----------------------------------------").color(NamedTextColor.DARK_GRAY).decorate(TextDecoration.STRIKETHROUGH));
finalList.add(LEGACY_SERIALIZER.deserialize(String.format("&c&lSWMHook World %s &7- &fTotal of &9%s &fworld%s &7- &6[%s]",
filter != null ? "Search" : "List", totalWorlds, totalWorlds > 1 ? "s" : "", type)));
finalList.addAll(list);
finalList.add(text("----------------------------------------").color(NamedTextColor.DARK_GRAY).decorate(TextDecoration.STRIKETHROUGH));
finalList.forEach(actor::reply);
}

public static List<Component> buildCommandHelp(CommandHelp<String> helpEntries, int page, String subCommand) {
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/cc/happyareabean/swmhook/hook/impl/EdenArenaProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@ public boolean isArena(World world) {

Arena arena = Arena.getArena(swmhWorld.getTemplateName());

return arena.getArenaDetails().stream().anyMatch(a -> a.getA().getWorld().getName().equalsIgnoreCase(world.getName()));
return arena.getArenaDetails().stream().anyMatch(a -> {
if (a.getA() == null)
return false;

return a.getA().getWorld().getName().equalsIgnoreCase(world.getName());
});
}

@Override
Expand Down

0 comments on commit 25dfd90

Please sign in to comment.