Skip to content

Commit 4e4c4c8

Browse files
authored
Merge branch 'main' into dependabot/maven/com.zaxxer-HikariCP-7.0.2
2 parents 293620f + b6fc35e commit 4e4c4c8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/pro/cloudnode/smp/smpcore/command/NationCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,8 +615,8 @@ public static boolean addCitizen(
615615
if (target.get().nationID != null && !sender.hasPermission(Permission.NATION_CITIZEN_ADD_SWITCH))
616616
return sendMessage(sender, SMPCore.messages().errorOtherCitizen(target.get()));
617617

618-
final var currentNation = target.get().nation().orElseThrow(() -> new IllegalStateException("Could not find nation " + target.get().nationID + " of member " + target.get().uuid));
619-
if (currentNation.leaderUUID.equals(targetPlayer.getUniqueId()))
618+
final var currentNation = target.get().nation();
619+
if (currentNation.isPresent() && currentNation.get().leaderUUID.equals(targetPlayer.getUniqueId()))
620620
return sendMessage(sender, SMPCore.messages().errorKickLeadership());
621621

622622
nation.add(target.get());

0 commit comments

Comments
 (0)