Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed minor bugs reported by SonarCloud

This commit is contained in:
tastybento 2024-01-05 11:27:59 +09:00
parent 3702870095
commit 7392e036d9
3 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCommand.java
View File

@ -9,6 +9,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
@ -403,13 +404,9 @@ public class IslandTeamCommand extends CompositeCommand {
if (slot.slot() > subOwnerCount + memberCount + trustedCount
&& slot.slot() < subOwnerCount + memberCount + trustedCount + coopCount + 1) {
// Show coops
PanelItem item = getMemberButton(RanksManager.COOP_RANK, slot.slot(), template.actions());
if (item != null) {
return item;
}
return getMemberButton(RanksManager.COOP_RANK, slot.slot(), template.actions());
}
return new PanelItemBuilder().icon(Material.BLACK_STAINED_GLASS_PANE).name("&b&r").build();
return this.getBlankBackground();
}
@ -426,8 +423,12 @@ public class IslandTeamCommand extends CompositeCommand {
return getMemberButton(RanksManager.OWNER_RANK, 1, actions);
}
String ref = RanksManager.getInstance().getRank(targetRank);
User member = island.getMemberSet(targetRank, false).stream().sorted().skip(slot - 1L).limit(1L)
.map(User::getInstance).findFirst().orElse(null);
Optional<User> opMember = island.getMemberSet(targetRank, false).stream().sorted().skip(slot - 1L).limit(1L)
.map(User::getInstance).findFirst();
if (opMember.isEmpty()) {
return this.getBlankBackground();
}
User member = opMember.get();
// Make button description depending on viewer
List<String> desc = new ArrayList<>();
int userRank = Objects.requireNonNull(island).getRank(user);
@ -457,26 +458,21 @@ public class IslandTeamCommand extends CompositeCommand {
+ " " + user.getTranslation(ar.tooltip()))
.findFirst().ifPresent(desc::add);
}
if (member != null) {
if (member.isOnline()) {
desc.add(0, user.getTranslation(ref));
return new PanelItemBuilder().icon(member.getName()).name(member.getDisplayName())
.description(desc)
.clickHandler((panel, user, clickType, i) -> clickListener(panel, user, clickType, i, member,
actions))
.build();
} else {
// Offline player
desc.add(0, user.getTranslation(ref));
return new PanelItemBuilder().icon(member.getName())
.name(offlinePlayerStatus(user, Bukkit.getOfflinePlayer(member.getUniqueId())))
.description(desc)
.clickHandler((panel, user, clickType, i) -> clickListener(panel, user, clickType, i, member,
actions))
.build();
}
if (member.isOnline()) {
desc.add(0, user.getTranslation(ref));
return new PanelItemBuilder().icon(member.getName()).name(member.getDisplayName()).description(desc)
.clickHandler(
(panel, user, clickType, i) -> clickListener(panel, user, clickType, i, member, actions))
.build();
} else {
// Offline player
desc.add(0, user.getTranslation(ref));
return new PanelItemBuilder().icon(member.getName())
.name(offlinePlayerStatus(user, Bukkit.getOfflinePlayer(member.getUniqueId()))).description(desc)
.clickHandler(
(panel, user, clickType, i) -> clickListener(panel, user, clickType, i, member, actions))
.build();
}
return null;
}
private boolean clickListener(Panel panel, User clicker, ClickType clickType, int i, User member,

4
src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java
View File

@ -40,8 +40,8 @@ public class IslandTeamInviteCommand extends CompositeCommand {
private @Nullable TemplateItem border;
private @Nullable TemplateItem background;
private User user;
private int page = 0; // This number by 35
private static final int PER_PAGE = 35;
private long page = 0; // This number by 35
private static final long PER_PAGE = 35;
public IslandTeamInviteCommand(IslandTeamCommand parent) {
super(parent, "invite");

3
src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamSetownerCommand.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Optional;
import java.util.UUID;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import world.bentobox.bentobox.api.commands.CompositeCommand;
@ -73,7 +74,7 @@ public class IslandTeamSetownerCommand extends CompositeCommand {
}
protected boolean setOwner(User user, @Nullable UUID targetUUID2) {
protected boolean setOwner(User user, @NonNull UUID targetUUID2) {
// Fire event so add-ons can run commands, etc.
Island island = getIslands().getPrimaryIsland(getWorld(), user.getUniqueId());
// Fire event so add-ons can run commands, etc.