Merge remote-tracking branch 'origin/master'

RoinujNosde · Jun 16, 2022 · a1d069d · a1d069d
2 parents 5027f6a + 2ac83f0
commit a1d069d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/me/roinujnosde/titansbattle/BaseGame.java b/src/main/java/me/roinujnosde/titansbattle/BaseGame.java
@@ -305,7 +305,8 @@ protected void givePrizes(Prize prize, @Nullable Group group, @Nullable List<War
         if (warriors == null) {
             return;
         }
-        List<Player> players = getPlayerParticipantsStream().collect(Collectors.toList());
+        List<Player> players = warriors.stream().map(Warrior::toOnlinePlayer).filter(Objects::nonNull)
+                .collect(Collectors.toList());
         if (group != null) {
             for (Player p : players) {
                 if (group.isLeaderOrOfficer(p.getUniqueId())) {

diff --git a/src/main/java/me/roinujnosde/titansbattle/listeners/JoinGameListener.java b/src/main/java/me/roinujnosde/titansbattle/listeners/JoinGameListener.java
@@ -70,7 +70,7 @@ public void maximumGroups(PlayerJoinGameEvent event) {
 
     @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     public void groupMode(PlayerJoinGameEvent event) {
-        if (event.getWarrior().getGroup() == null) {
+        if (event.getGame().getConfig().isGroupMode() && event.getWarrior().getGroup() == null) {
             cancelWithMessage(event, "not_in_a_group");
         }
     }