From f31b87d1f310dd79eb791243662850fc3d713bc8 Mon Sep 17 00:00:00 2001
From: ItzKatze <136186750+ItzKatze@users.noreply.github.com>
Date: Sat, 11 Oct 2025 10:13:09 +0200
Subject: [PATCH] feat: team objective

---
 .../forcebattle/bossbar/BossbarManager.java   | 124 +++++++++----
 .../fameless/forcebattle/caption/Caption.java |  16 --
 .../forcebattle/command/JokerCommand.java     |  12 +-
 .../forcebattle/command/SkipCommand.java      |  54 ++++--
 .../forcebattle/command/TimerCommand.java     |   5 +
 .../configuration/SettingsFile.java           |  16 +-
 .../configuration/SettingsManager.java        | 138 +++++++-------
 .../event/ObjectiveUpdateEvent.java           |  24 ++-
 .../forcebattle/game/GameListener.java        | 170 ++++++++++++++----
 .../fameless/forcebattle/game/Objective.java  |   5 +-
 .../forcebattle/game/ObjectiveManager.java    | 121 ++++++++-----
 .../net/fameless/forcebattle/game/Team.java   |  40 +++++
 .../game/data/BiomeSimplified.java            |   1 -
 .../game/data/StructureSimplified.java        |   3 +-
 .../game/tasks/AdvancementTask.java           |  98 ++++++----
 .../forcebattle/game/tasks/BiomeTask.java     | 101 +++++++----
 .../forcebattle/game/tasks/CoordsTask.java    | 104 +++++++----
 .../forcebattle/game/tasks/HeightTask.java    |  84 ++++++---
 .../forcebattle/game/tasks/ItemTask.java      |  78 ++++++--
 .../forcebattle/game/tasks/StructureTask.java | 111 +++++++-----
 .../fameless/forcebattle/gui/ResultGUI.java   |   6 +-
 .../fameless/forcebattle/gui/SettingsGUI.java | 129 +++++++------
 .../forcebattle/player/BattlePlayer.java      |  22 ++-
 .../fameless/forcebattle/util/BattleType.java |  24 ++-
 .../fameless/forcebattle/util/BukkitUtil.java |  18 ++
 .../fameless/forcebattle/util/ItemUtils.java  |  45 +++--
 src/main/resources/config.yml                 | 114 ++++++------
 src/main/resources/languages/en_US.json       |  81 ++++-----
 28 files changed, 1149 insertions(+), 595 deletions(-)

diff --git a/src/main/java/net/fameless/forcebattle/bossbar/BossbarManager.java b/src/main/java/net/fameless/forcebattle/bossbar/BossbarManager.java
index 75bb358..492df64 100644
--- a/src/main/java/net/fameless/forcebattle/bossbar/BossbarManager.java
+++ b/src/main/java/net/fameless/forcebattle/bossbar/BossbarManager.java
@@ -3,6 +3,8 @@
 import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
+import net.fameless.forcebattle.game.Objective;
+import net.fameless.forcebattle.game.Team;
 import net.fameless.forcebattle.player.BattlePlayer;
 import net.fameless.forcebattle.util.Format;
 import net.kyori.adventure.bossbar.BossBar;
@@ -17,66 +19,122 @@
 
 public class BossbarManager {
 
-    private static final HashMap<BattlePlayer, BossBar> lastBossbarMap = new HashMap<>();
+    private static final HashMap<BattlePlayer, BossBar> lastPlayerBarMap = new HashMap<>();
+    private static final HashMap<BattlePlayer, BossBar> lastTeamBarMap = new HashMap<>();
 
     public static void runTask() {
         TimerTask task = new TimerTask() {
             @Override
             public void run() {
+                boolean timerRunning = ForceBattle.getTimer().isRunning();
+
                 for (BattlePlayer battlePlayer : BattlePlayer.getOnlinePlayers()) {
                     if (battlePlayer.isExcluded()) {
-                        hideBossBar(battlePlayer);
+                        hideBossBars(battlePlayer);
+                        continue;
+                    }
+
+                    BossBar playerBar = BossBar.bossBar(
+                            getPlayerObjectiveTitle(battlePlayer),
+                            1,
+                            BossBar.Color.BLUE,
+                            BossBar.Overlay.PROGRESS
+                    );
+                    updateBossBar(battlePlayer, playerBar, lastPlayerBarMap);
+
+                    if (!timerRunning) {
+                        hideBossBar(battlePlayer, lastTeamBarMap);
                         continue;
                     }
 
-                    Component bossbarTitle = getBossbarTitle(battlePlayer);
-                    BossBar bossBar = BossBar.bossBar(bossbarTitle, 1, BossBar.Color.BLUE, BossBar.Overlay.PROGRESS);
+                    if (battlePlayer.isInTeam()) {
+                        Team team = battlePlayer.getTeam();
+                        Objective teamObjective = team.getObjective();
 
-                    updateBossBar(battlePlayer, bossBar);
+                        if (teamObjective != null) {
+                            BossBar teamBar = BossBar.bossBar(
+                                    getTeamObjectiveTitle(team),
+                                    1,
+                                    BossBar.Color.PURPLE,
+                                    BossBar.Overlay.PROGRESS
+                            );
+                            updateBossBar(battlePlayer, teamBar, lastTeamBarMap);
+                        } else {
+                            hideBossBar(battlePlayer, lastTeamBarMap);
+                        }
+                    } else {
+                        hideBossBar(battlePlayer, lastTeamBarMap);
+                    }
                 }
             }
         };
         new Timer("forcebattle/bossbar").scheduleAtFixedRate(task, 150, 150);
     }
 
-    private static void hideBossBar(BattlePlayer battlePlayer) {
-        if (lastBossbarMap.containsKey(battlePlayer)) {
-            battlePlayer.getAudience().hideBossBar(lastBossbarMap.get(battlePlayer));
-            lastBossbarMap.remove(battlePlayer);
+    private static void hideBossBars(BattlePlayer battlePlayer) {
+        hideBossBar(battlePlayer, lastPlayerBarMap);
+        hideBossBar(battlePlayer, lastTeamBarMap);
+    }
+
+    private static void hideBossBar(BattlePlayer battlePlayer, HashMap<BattlePlayer, BossBar> map) {
+        if (map.containsKey(battlePlayer)) {
+            battlePlayer.getAudience().hideBossBar(map.get(battlePlayer));
+            map.remove(battlePlayer);
         }
     }
 
-    private static @NotNull Component getBossbarTitle(BattlePlayer battlePlayer) {
-        if (ForceBattle.getTimer().isRunning()) {
-            boolean isPlayerInTeam = battlePlayer.isInTeam();
-            int points = isPlayerInTeam ? battlePlayer.getTeam().getPoints() : battlePlayer.getPoints();
-
-            if (SettingsManager.isEnabled(SettingsManager.Setting.HIDE_POINTS)) {
-                return Caption.of(
-                        "bossbar.format_hide_points",
-                        TagResolver.resolver("battletype", Tag.inserting(Component.text(battlePlayer.getObjective().getBattleType().getPrefix()))),
-                        TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(battlePlayer.getObjective().getObjectiveString()))))
-                );
-            }
+    private static @NotNull Component getPlayerObjectiveTitle(BattlePlayer battlePlayer) {
+        if (!ForceBattle.getTimer().isRunning()) return Caption.of("waiting");
+
+        Objective playerObjective = battlePlayer.getObjective();
+        if (playerObjective == null) return Caption.of("waiting");
 
+        boolean isPlayerInTeam = battlePlayer.isInTeam();
+        int points = isPlayerInTeam ? battlePlayer.getTeam().getPoints() : battlePlayer.getPoints();
+
+        if (SettingsManager.isEnabled(SettingsManager.Setting.HIDE_POINTS)) {
+            return Caption.of(
+                    "bossbar.format_hide_points",
+                    TagResolver.resolver("battletype", Tag.inserting(Component.text(playerObjective.getBattleType().getPrefix()))),
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(playerObjective.getObjectiveString()))))
+            );
+        }
+
+        return Caption.of(
+                "bossbar.format",
+                TagResolver.resolver("battletype", Tag.inserting(Component.text(playerObjective.getBattleType().getPrefix()))),
+                TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(playerObjective.getObjectiveString())))),
+                TagResolver.resolver("pointstype", Tag.inserting(Component.text(isPlayerInTeam ? "Team-Points" : "Points"))),
+                TagResolver.resolver("points", Tag.inserting(Component.text(points)))
+        );
+    }
+
+    private static @NotNull Component getTeamObjectiveTitle(Team team) {
+        Objective teamObjective = team.getObjective();
+        if (teamObjective == null) return Component.empty();
+
+        if (SettingsManager.isEnabled(SettingsManager.Setting.HIDE_POINTS)) {
             return Caption.of(
-                    "bossbar.format",
-                    TagResolver.resolver("battletype", Tag.inserting(Component.text(battlePlayer.getObjective().getBattleType().getPrefix()))),
-                    TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(battlePlayer.getObjective().getObjectiveString())))),
-                    TagResolver.resolver("pointstype", Tag.inserting(Component.text(isPlayerInTeam ? "Team-Points" : "Points"))),
-                    TagResolver.resolver("points", Tag.inserting(Component.text(points)))
+                    "bossbar.team_format_hide_points",
+                    TagResolver.resolver("battletype", Tag.inserting(Component.text(teamObjective.getBattleType().getPrefix()))),
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(teamObjective.getObjectiveString()))))
             );
-        } else {
-            return Caption.of("waiting");
         }
+
+        return Caption.of(
+                "bossbar.team_format",
+                TagResolver.resolver("battletype", Tag.inserting(Component.text(teamObjective.getBattleType().getPrefix()))),
+                TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(teamObjective.getObjectiveString())))),
+                TagResolver.resolver("pointstype", Tag.inserting(Component.text("Team-Points"))),
+                TagResolver.resolver("points", Tag.inserting(Component.text(team.getPoints())))
+        );
     }
 
-    private static void updateBossBar(BattlePlayer battlePlayer, BossBar bossBar) {
-        if (lastBossbarMap.containsKey(battlePlayer)) {
-            battlePlayer.getAudience().hideBossBar(lastBossbarMap.get(battlePlayer));
+    private static void updateBossBar(BattlePlayer battlePlayer, BossBar bossBar, HashMap<BattlePlayer, BossBar> map) {
+        if (map.containsKey(battlePlayer)) {
+            battlePlayer.getAudience().hideBossBar(map.get(battlePlayer));
         }
         battlePlayer.getAudience().showBossBar(bossBar);
-        lastBossbarMap.put(battlePlayer, bossBar);
+        map.put(battlePlayer, bossBar);
     }
-
 }
diff --git a/src/main/java/net/fameless/forcebattle/caption/Caption.java b/src/main/java/net/fameless/forcebattle/caption/Caption.java
index 44e73c0..34f00b3 100644
--- a/src/main/java/net/fameless/forcebattle/caption/Caption.java
+++ b/src/main/java/net/fameless/forcebattle/caption/Caption.java
@@ -3,7 +3,6 @@
 import com.google.gson.JsonObject;
 import lombok.Getter;
 import net.fameless.forcebattle.ForceBattle;
-import net.fameless.forcebattle.configuration.SettingsManager;
 import net.fameless.forcebattle.event.LanguageChangeEvent;
 import net.fameless.forcebattle.util.Format;
 import net.kyori.adventure.text.Component;
@@ -47,21 +46,6 @@ private Caption() {
     private static @NotNull String replaceDefaults(String input) {
         input = input.replace("<prefix>", getString("prefix"))
                 .replace("<time>", Format.formatTime(ForceBattle.getTimer().getTime()))
-                .replace("<force-item-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.FORCE_ITEM) ? "active.true" : "active.false"))
-                .replace("<force-mob-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.FORCE_MOB) ? "active.true" : "active.false"))
-                .replace("<force-biome-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.FORCE_BIOME) ? "active.true" : "active.false"))
-                .replace("<force-advancement-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.FORCE_ADVANCEMENT) ? "active.true" : "active.false"))
-                .replace("<force-height-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.FORCE_HEIGHT) ? "active.true" : "active.false"))
-                .replace("<force-coords-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.FORCE_COORDS) ? "active.true" : "active.false"))
-                .replace("<force-structure-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.FORCE_STRUCTURE) ? "active.true" : "active.false"))
-                .replace("<chain-mode-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.CHAIN_MODE) ? "active.true" : "active.false"))
-                .replace("<backpacks-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.BACKPACK) ? "active.true" : "active.false"))
-                .replace("<hide-points-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.HIDE_POINTS) ? "active.true" : "active.false"))
-                .replace("<hide-objectives-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.HIDE_OBJECTIVES) ? "active.true" : "active.false"))
-                .replace("<no-duplicate-objectives-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.NO_DUPLICATE_OBJECTIVES) ? "active.true" :
-                        "active.false"))
-                .replace("<no-simplified-objectives-active>", getString(SettingsManager.isEnabled(SettingsManager.Setting.SIMPLIFIED_OBJECTIVES) ? "active.true" :
-                        "active.false"))
         ;
         return input;
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/JokerCommand.java b/src/main/java/net/fameless/forcebattle/command/JokerCommand.java
index 47a0277..061bed4 100644
--- a/src/main/java/net/fameless/forcebattle/command/JokerCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/JokerCommand.java
@@ -58,13 +58,15 @@ protected void executeCommand(final CommandCaller caller, final String[] args) {
         switch (args[0]) {
             case "add" -> {
                 switch (jokerType) {
-                    case SKIP -> target.addSkip(amount);
+                    case PLAYERSKIP -> target.addPlayerSkip(amount);
+                    case TEAMSKIP -> target.addTeamSkip(amount);
                     case SWAP -> target.addSwap(amount);
                 }
             }
             case "remove" -> {
                 switch (jokerType) {
-                    case SKIP -> target.removeSkip(amount);
+                    case PLAYERSKIP -> target.removePlayerSkip(amount);
+                    case TEAMSKIP -> target.removeTeamSkip(amount);
                     case SWAP -> target.removeSwap(amount);
                 }
             }
@@ -80,7 +82,8 @@ protected List<String> tabComplete(final CommandCaller caller, final String[] ar
             return StringUtil.copyPartialMatches(args[1], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
         }
         if (args.length == 3) {
-            return StringUtil.copyPartialMatches(args[2], List.of(JokerType.SKIP.getIdentifier(), JokerType.SWAP.getIdentifier()), new ArrayList<>());
+            return StringUtil.copyPartialMatches(args[2], List.of(JokerType.PLAYERSKIP.getIdentifier(), JokerType.SWAP.getIdentifier(),
+                    JokerType.TEAMSKIP.getIdentifier()), new ArrayList<>());
         }
         if (args.length == 4) {
             return StringUtil.copyPartialMatches(args[3], List.of("amount"), new ArrayList<>());
@@ -89,7 +92,8 @@ protected List<String> tabComplete(final CommandCaller caller, final String[] ar
     }
 
     private enum JokerType {
-        SKIP,
+        PLAYERSKIP,
+        TEAMSKIP,
         SWAP;
 
         private final String IDENTIFIER = name().toLowerCase();
diff --git a/src/main/java/net/fameless/forcebattle/command/SkipCommand.java b/src/main/java/net/fameless/forcebattle/command/SkipCommand.java
index 8858b23..33f8c30 100644
--- a/src/main/java/net/fameless/forcebattle/command/SkipCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/SkipCommand.java
@@ -4,6 +4,7 @@
 import net.fameless.forcebattle.command.framework.CallerType;
 import net.fameless.forcebattle.command.framework.Command;
 import net.fameless.forcebattle.command.framework.CommandCaller;
+import net.fameless.forcebattle.game.Team;
 import net.fameless.forcebattle.player.BattlePlayer;
 import net.fameless.forcebattle.util.StringUtil;
 import net.fameless.forcebattle.util.TabCompletions;
@@ -32,20 +33,37 @@ public SkipCommand() {
     @Override
     public void executeCommand(CommandCaller caller, String[] args) {
         if (args.length > 0) {
-            @NotNull Optional<BattlePlayer> battlePlayerOpt = BattlePlayer.adapt(args[0]);
-            battlePlayerOpt.ifPresentOrElse(
-                    battlePlayer -> {
-                        if (battlePlayer.isOffline()) {
-                            return;
-                        }
-                        battlePlayer.updateObjective(false, false);
-                        battlePlayer.sendMessage(Caption.of("notification.skip_by_admin_target"));
-                        caller.sendMessage(Caption.of(
-                                "notification.skip_by_admin_player",
-                                TagResolver.resolver("player", Tag.inserting(Component.text(battlePlayer.getName())))
-                        ));
-                    }, () -> caller.sendMessage(Caption.of("command.no_such_player"))
-            );
+            switch (args[0]) {
+                case "player" -> {
+                    @NotNull Optional<BattlePlayer> battlePlayerOpt = BattlePlayer.adapt(args[1]);
+                    battlePlayerOpt.ifPresentOrElse(
+                            battlePlayer -> {
+                                if (battlePlayer.isOffline()) {
+                                    return;
+                                }
+                                battlePlayer.updateObjective(false, false);
+                                battlePlayer.sendMessage(Caption.of("notification.skip_by_admin_target"));
+                                caller.sendMessage(Caption.of(
+                                        "notification.skip_by_admin_player",
+                                        TagResolver.resolver("player", Tag.inserting(Component.text(battlePlayer.getName())))
+                                ));
+                            }, () -> caller.sendMessage(Caption.of("command.no_such_player"))
+                    );
+                }
+                case "team" -> {
+                    @NotNull Optional<Team> teamOpt = Team.ofId(Integer.parseInt(args[1]));
+                    teamOpt.ifPresentOrElse(
+                            team -> {
+                                team.updateObjective(null, false, false);
+                                team.getPlayers().forEach(player -> player.sendMessage(Caption.of("notification.skip_by_admin_target")));
+                                caller.sendMessage(Caption.of(
+                                        "notification.skip_by_admin_player",
+                                        TagResolver.resolver("player", Tag.inserting(Component.text(team.getId())))
+                                ));
+                            }, () -> caller.sendMessage(Caption.of("command.no_such_team"))
+                    );
+                }
+            }
         } else {
             sendUsage(caller);
         }
@@ -54,7 +72,13 @@ public void executeCommand(CommandCaller caller, String[] args) {
     @Override
     public List<String> tabComplete(CommandCaller caller, String @NotNull [] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
+            return StringUtil.copyPartialMatches(args[0], List.of("player", "team"), new ArrayList<>());
+        } else if (args.length == 2) {
+            return switch (args[0]) {
+                case "player" -> StringUtil.copyPartialMatches(args[1], TabCompletions.getPlayerNamesTabCompletions(), new ArrayList<>());
+                case "team" -> StringUtil.copyPartialMatches(args[1], TabCompletions.getTeamIdTabCompletions(), new ArrayList<>());
+                default -> List.of();
+            };
         }
         return List.of();
     }
diff --git a/src/main/java/net/fameless/forcebattle/command/TimerCommand.java b/src/main/java/net/fameless/forcebattle/command/TimerCommand.java
index fa76c3e..906d86b 100644
--- a/src/main/java/net/fameless/forcebattle/command/TimerCommand.java
+++ b/src/main/java/net/fameless/forcebattle/command/TimerCommand.java
@@ -5,6 +5,7 @@
 import net.fameless.forcebattle.command.framework.CallerType;
 import net.fameless.forcebattle.command.framework.Command;
 import net.fameless.forcebattle.command.framework.CommandCaller;
+import net.fameless.forcebattle.configuration.SettingsManager;
 import net.fameless.forcebattle.game.Timer;
 import net.fameless.forcebattle.util.Format;
 import net.fameless.forcebattle.util.StringUtil;
@@ -43,6 +44,10 @@ public void executeCommand(CommandCaller caller, String[] args) {
                     timer.pause();
                     caller.sendMessage(Caption.of("command.timer_paused"));
                 } else {
+                    if (SettingsManager.getActiveChallenges().isEmpty()) {
+                        caller.sendMessage(Caption.of("error.no_battletype_selected"));
+                        return;
+                    }
                     timer.start();
                     caller.sendMessage(Caption.of("command.timer_started"));
                 }
diff --git a/src/main/java/net/fameless/forcebattle/configuration/SettingsFile.java b/src/main/java/net/fameless/forcebattle/configuration/SettingsFile.java
index 2bad439..a250aad 100644
--- a/src/main/java/net/fameless/forcebattle/configuration/SettingsFile.java
+++ b/src/main/java/net/fameless/forcebattle/configuration/SettingsFile.java
@@ -29,10 +29,17 @@ public static void loadSettingsFromFile(File jsonFile) throws IOException {
             // Load and enable settings
             for (SettingsManager.Setting setting : SettingsManager.Setting.values()) {
                 if (settingsObject.has(setting.name())) {
-                    boolean isEnabled = settingsObject.get(setting.name()).getAsBoolean();
-                    SettingsManager.setEnabled(setting, isEnabled);
+                    String stateStr = settingsObject.get(setting.name()).getAsString();
+                    try {
+                        SettingsManager.SettingState state = SettingsManager.SettingState.valueOf(stateStr);
+                        SettingsManager.setState(setting, state);
+                    } catch (IllegalArgumentException e) {
+                        logger.warn("Invalid state '{}' for setting {} in settings file, defaulting to OFF", stateStr, setting.name());
+                        SettingsManager.setState(setting, SettingsManager.SettingState.OFF);
+                    }
                 }
             }
+
             SettingsManager.applyMinimum();
 
             if (settingsObject.has("language")) {
@@ -40,7 +47,7 @@ public static void loadSettingsFromFile(File jsonFile) throws IOException {
                     Language language = Language.valueOf(settingsObject.get("language").getAsString());
                     Caption.setCurrentLanguage(language);
                 } catch (IllegalArgumentException e) {
-                    logger.warn("Failed to load language from Settings file. No such language.");
+                    logger.warn("Failed to load language from settings file. No such language.");
                 }
             }
         }
@@ -50,7 +57,8 @@ public static void saveToFile(File jsonFile) throws IOException {
         JsonObject settingsObject = new JsonObject();
 
         for (SettingsManager.Setting setting : SettingsManager.Setting.values()) {
-            settingsObject.addProperty(setting.name(), SettingsManager.isEnabled(setting));
+            SettingsManager.SettingState state = SettingsManager.getState(setting);
+            settingsObject.addProperty(setting.name(), state.name());
         }
 
         if (Caption.getCurrentLanguage() != null) {
diff --git a/src/main/java/net/fameless/forcebattle/configuration/SettingsManager.java b/src/main/java/net/fameless/forcebattle/configuration/SettingsManager.java
index dd627f5..f4a839f 100644
--- a/src/main/java/net/fameless/forcebattle/configuration/SettingsManager.java
+++ b/src/main/java/net/fameless/forcebattle/configuration/SettingsManager.java
@@ -3,6 +3,7 @@
 import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.player.BattlePlayer;
 import net.fameless.forcebattle.util.BattleType;
+import org.bukkit.ChatColor;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -11,99 +12,70 @@
 
 public class SettingsManager {
 
-    private static final EnumMap<Setting, Boolean> settingsMap = new EnumMap<>(Setting.class);
+    private static final EnumMap<Setting, SettingState> STATES = new EnumMap<>(Setting.class);
 
-    private SettingsManager() {
+    private SettingsManager() {}
+
+    static {
+        for (Setting setting : Setting.values()) {
+            STATES.put(setting, SettingState.OFF);
+        }
     }
 
     public static @NotNull List<BattleType> getActiveChallenges() {
         List<BattleType> activeChallenges = new ArrayList<>();
         for (BattleType battleType : BattleType.values()) {
-            Setting setting = Setting.valueOf(battleType.name());
-            if (isEnabled(setting)) {
+            if (isEnabled(battleType.getLinkedSetting())) {
                 activeChallenges.add(battleType);
             }
         }
         return activeChallenges;
     }
 
-    public static boolean isEnabled(Setting setting) {
-        return settingsMap.getOrDefault(setting, false);
+    public static SettingState getState(Setting setting) {
+        return STATES.getOrDefault(setting, SettingState.OFF);
     }
 
-    public static void setEnabled(Setting setting, boolean enabled) {
-        updateSetting(setting, enabled, false);
+    public static void setState(Setting setting, SettingState state) {
+        if (state == null) state = SettingState.OFF;
+        STATES.put(setting, state);
+        updateSetting(setting);
     }
 
-    public static void applyMinimum() {
-        if (getActiveChallenges().isEmpty()) {
-            updateSetting(Setting.FORCE_ITEM, true, true);
-        }
+    public static boolean isEnabled(Setting setting) {
+        return getState(setting) != SettingState.OFF;
     }
 
-    private static void updateSetting(Setting setting, boolean enabled, boolean skipObjectiveUpdate) {
-        if (settingsMap.getOrDefault(setting, false) == enabled) {
-            return;
-        }
-        settingsMap.put(setting, enabled);
-
-        if (!skipObjectiveUpdate) {
-            if (setting == Setting.CHAIN_MODE || setting.name().startsWith("FORCE")) {
-                ForceBattle.getObjectiveManager().updateChainList();
-            }
-            BattlePlayer.BATTLE_PLAYERS.forEach(player -> player.updateObjective(false, false));
+    public static void applyMinimum() {
+        boolean hasForceActive = STATES.entrySet().stream()
+                .anyMatch(entry -> entry.getKey().name().startsWith("FORCE_") && entry.getValue() != SettingState.OFF);
+        if (!hasForceActive) {
+            setState(Setting.FORCE_ITEM, SettingState.PLAYER);
         }
     }
 
-    // Challenge Settings
-    public static void setForceItemEnabled(boolean enabled) {
-        updateSetting(Setting.FORCE_ITEM, enabled, false);
-    }
-
-    public static void setForceMobEnabled(boolean enabled) {
-        updateSetting(Setting.FORCE_MOB, enabled, false);
-    }
-
-    public static void setForceBiomeEnabled(boolean enabled) {
-        updateSetting(Setting.FORCE_BIOME, enabled, false);
-    }
-
-    public static void setForceAdvancementEnabled(boolean enabled) {
-        updateSetting(Setting.FORCE_ADVANCEMENT, enabled, false);
-    }
-
-    public static void setForceHeightEnabled(boolean enabled) {
-        updateSetting(Setting.FORCE_HEIGHT, enabled, false);
-    }
-
-    public static void setForceCoordsEnabled(boolean enabled) {
-        updateSetting(Setting.FORCE_COORDS, enabled, false);
-    }
-
-    public static void setForceStructureEnabled(boolean enabled) {
-        updateSetting(Setting.FORCE_STRUCTURE, enabled, false);
-    }
-
-    // Miscellaneous Settings
-    public static void setChainModeEnabled(boolean enabled) {
-        updateSetting(Setting.CHAIN_MODE, enabled, false);
-    }
-
-    public static void setBackpackEnabled(boolean enabled) {
-        updateSetting(Setting.BACKPACK, enabled, true);
-    }
-
-    public static void setHidePointsEnabled(boolean enabled) {
-        updateSetting(Setting.HIDE_POINTS, enabled, true);
-    }
-
-    public static void setHideObjectivesEnabled(boolean enabled) {
-        updateSetting(Setting.HIDE_OBJECTIVES, enabled, true);
+    private static void updateSetting(Setting setting) {
+        if (setting == Setting.CHAIN_MODE || setting.name().startsWith("FORCE_")) {
+            ForceBattle.getObjectiveManager().updateChainList();
+        }
+        BattlePlayer.BATTLE_PLAYERS.forEach(player -> player.updateObjective(false, false));
     }
 
-    public static void setNoDuplicateObjectivesEnabled(boolean enabled) { updateSetting(Setting.NO_DUPLICATE_OBJECTIVES, enabled, false); }
+    public static void setForceItemEnabled(boolean enabled) { setState(Setting.FORCE_ITEM, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setForceMobEnabled(boolean enabled) { setState(Setting.FORCE_MOB, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setForceBiomeEnabled(boolean enabled) { setState(Setting.FORCE_BIOME, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setForceAdvancementEnabled(boolean enabled) { setState(Setting.FORCE_ADVANCEMENT, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setForceHeightEnabled(boolean enabled) { setState(Setting.FORCE_HEIGHT, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setForceCoordsEnabled(boolean enabled) { setState(Setting.FORCE_COORDS, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setForceStructureEnabled(boolean enabled) { setState(Setting.FORCE_STRUCTURE, enabled ? SettingState.PLAYER : SettingState.OFF); }
 
-    public static void setSimplifiedObjectivesEnabled(boolean enabled) { updateSetting(Setting.SIMPLIFIED_OBJECTIVES, enabled, false); }
+    public static void setChainModeEnabled(boolean enabled) { setState(Setting.CHAIN_MODE, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setBackpackEnabled(boolean enabled) { setState(Setting.BACKPACK, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setHidePointsEnabled(boolean enabled) { setState(Setting.HIDE_POINTS, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setHideObjectivesEnabled(boolean enabled) { setState(Setting.HIDE_OBJECTIVES, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setNoDuplicateObjectivesEnabled(boolean enabled) { setState(Setting.NO_DUPLICATE_OBJECTIVES, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setSimplifiedObjectivesEnabled(boolean enabled) { setState(Setting.SIMPLIFIED_OBJECTIVES, enabled ? SettingState.PLAYER : SettingState.OFF); }
+    public static void setExtraTeamObjectivesEnabled(boolean enabled) { setState(Setting.EXTRA_TEAM_OBJECTIVE, enabled ? SettingState.TEAM : SettingState.OFF); }
 
     public enum Setting {
         FORCE_ITEM,
@@ -118,7 +90,33 @@ public enum Setting {
         HIDE_POINTS,
         HIDE_OBJECTIVES,
         NO_DUPLICATE_OBJECTIVES,
-        SIMPLIFIED_OBJECTIVES
+        SIMPLIFIED_OBJECTIVES,
+        EXTRA_TEAM_OBJECTIVE
     }
 
+    public enum SettingState {
+        OFF(ChatColor.RED + "Off"),
+        PLAYER(ChatColor.GREEN + "Player"),
+        TEAM(ChatColor.AQUA + "Team"),
+        BOTH(ChatColor.GOLD + "Both");
+
+        private final String displayName;
+
+        SettingState(String displayName) {
+            this.displayName = displayName;
+        }
+
+        public String getDisplayName() {
+            return displayName;
+        }
+
+        public SettingState next() {
+            return switch (this) {
+                case OFF -> PLAYER;
+                case PLAYER -> TEAM;
+                case TEAM -> BOTH;
+                case BOTH -> OFF;
+            };
+        }
+    }
 }
diff --git a/src/main/java/net/fameless/forcebattle/event/ObjectiveUpdateEvent.java b/src/main/java/net/fameless/forcebattle/event/ObjectiveUpdateEvent.java
index 10160e6..44f9940 100644
--- a/src/main/java/net/fameless/forcebattle/event/ObjectiveUpdateEvent.java
+++ b/src/main/java/net/fameless/forcebattle/event/ObjectiveUpdateEvent.java
@@ -2,6 +2,7 @@
 
 import lombok.Getter;
 import net.fameless.forcebattle.game.Objective;
+import net.fameless.forcebattle.game.Team;
 import net.fameless.forcebattle.player.BattlePlayer;
 import net.fameless.forcebattle.util.EventLogger;
 import org.bukkit.event.Cancellable;
@@ -12,25 +13,42 @@
 public class ObjectiveUpdateEvent extends Event implements Cancellable {
 
     private static final HandlerList HANDLERS = new HandlerList();
-    private boolean cancelled;
 
     @Getter
     private final BattlePlayer battlePlayer;
     @Getter
+    private final Team team;
+    @Getter
     private Objective newObjective;
+    private boolean cancelled;
 
-    public ObjectiveUpdateEvent(BattlePlayer battlePlayer, Objective newObjective) {
+    public ObjectiveUpdateEvent(@NotNull BattlePlayer battlePlayer, @NotNull Objective newObjective) {
         this.battlePlayer = battlePlayer;
+        this.team = null;
+        this.newObjective = newObjective;
+    }
+
+    public ObjectiveUpdateEvent(@NotNull Team team, @NotNull Objective newObjective) {
+        this.battlePlayer = null;
+        this.team = team;
         this.newObjective = newObjective;
     }
 
     public void setNewObjective(Objective newObjective) {
         if (this.newObjective != newObjective) {
-            EventLogger.LOGGER.info("ObjectiveUpdateEvent: value newObjective has been changed to {}.", newObjective.getObjectiveString());
+            EventLogger.LOGGER.info("ObjectiveUpdateEvent: newObjective changed to {}.", newObjective.getObjectiveString());
             this.newObjective = newObjective;
         }
     }
 
+    public boolean isTeamEvent() {
+        return team != null;
+    }
+
+    public boolean isPlayerEvent() {
+        return battlePlayer != null;
+    }
+
     @Override
     public boolean isCancelled() {
         return cancelled;
diff --git a/src/main/java/net/fameless/forcebattle/game/GameListener.java b/src/main/java/net/fameless/forcebattle/game/GameListener.java
index 402037b..99cae02 100644
--- a/src/main/java/net/fameless/forcebattle/game/GameListener.java
+++ b/src/main/java/net/fameless/forcebattle/game/GameListener.java
@@ -73,6 +73,13 @@ public GameListener() {
         TaskManager.startAll();
     }
 
+    //TODO bp nach dem battle aufmachen
+    //TODO prüfen ob ruined portals gehen
+    //TODO /displayresults auf gleiche Plätze setzen wenn Punkte gleich => nächstes team dementsprechend abstufen
+    //TODO evtl dupe obj fix for both player/team idk
+    //TODO better tablist
+    //TODO scoreboard which shows teammate obj
+
     @EventHandler
     public void onPlayerLogin(AsyncPlayerPreLoginEvent event) {
         if (ForceBattle.getTimer().isRunning()) {
@@ -115,9 +122,6 @@ public void onPlayerLogin(AsyncPlayerPreLoginEvent event) {
     @EventHandler(ignoreCancelled = true)
     public void onPlayerJoin(@NotNull PlayerJoinEvent event) {
         BattlePlayer battlePlayer = BattlePlayer.adapt(event.getPlayer());
-        if (battlePlayer.getObjective() == null) {
-            battlePlayer.updateObjective(false, false);
-        }
 
         if (!ForceBattle.getTimer().isRunning() && startPhase) {
             if (!spawnCreated) {
@@ -162,6 +166,12 @@ public void onGameStart(TimerStartEvent event) throws IOException {
         }
 
         for (BattlePlayer player : BattlePlayer.getOnlinePlayers()) {
+            if (player.getObjective() == null) {
+                player.updateObjective(false, false);
+            }
+            if (player.isInTeam() && player.getTeam().getObjective() == null) {
+                player.getTeam().updateObjective(player, false, false);
+            }
             player.getPlayer().playSound(player.getPlayer(), Sound.EVENT_RAID_HORN, SoundCategory.MASTER, 100, 1);
             player.getPlayer().setGameMode(GameMode.SURVIVAL);
             player.getInventory().clear();
@@ -170,9 +180,13 @@ public void onGameStart(TimerStartEvent event) throws IOException {
             player.getPlayer().setFoodLevel(20);
             player.getPlayer().setFireTicks(0);
 
-            player.getPlayer().getInventory().addItem(ItemUtils.SpecialItems.getSkipItem(ForceBattle.get().getConfig().getInt("skips", 3)));
+            player.getPlayer().getInventory().addItem(ItemUtils.SpecialItems.getPlayerSkipItem(ForceBattle.get().getConfig().getInt("playerSkips", 3)));
             player.getPlayer().getInventory().addItem(ItemUtils.SpecialItems.getSwapItem(ForceBattle.get().getConfig().getInt("swaps", 1)));
 
+            if (SettingsManager.isEnabled(SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE)) {
+                player.getPlayer().getInventory().addItem(ItemUtils.SpecialItems.getTeamSkipItem(ForceBattle.get().getConfig().getInt("teamSkips", 1)));
+            }
+
             player.getPlayer().teleport(world.getSpawnLocation());
         }
     }
@@ -188,55 +202,86 @@ public void onGameEnd(TimerEndEvent event) {
         }
     }
 
-    @EventHandler()
-    public void onEntityDamageByEntity(EntityDamageByEntityEvent damageEvent) {
-        if (!ForceBattle.getTimer().isRunning() && damageEvent.getEntity() instanceof Player) {
-            damageEvent.setCancelled(true);
+    @EventHandler
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
+        if (!ForceBattle.getTimer().isRunning() && event.getEntity() instanceof Player) {
+            event.setCancelled(true);
             return;
         }
+
         if (!SettingsManager.isEnabled(SettingsManager.Setting.FORCE_MOB)) return;
-        if (!(damageEvent.getDamager() instanceof Player player)) return;
 
-        if (!damageEvent.getEntity().isDead()) {
-            LivingEntity entity = (LivingEntity) damageEvent.getEntity();
-            if (entity.getHealth() - damageEvent.getDamage() > 0) {
-                return;
-            }
-        }
+        if (!(event.getDamager() instanceof Player damager)) return;
+        if (!(event.getEntity() instanceof LivingEntity target)) return;
 
-        BattlePlayer battlePlayer = BattlePlayer.adapt(player);
+        BattlePlayer battlePlayer = BattlePlayer.adapt(damager);
         if (battlePlayer.isExcluded()) return;
 
-        String objectiveString = battlePlayer.getObjective().getObjectiveString();
-        if (!(BukkitUtil.convertObjective(BattleType.FORCE_MOB, objectiveString) instanceof EntityType requiredEntity)) return;
+        if (target.getHealth() - event.getDamage() > 0) return;
 
-        if (damageEvent.getEntity().getType().equals(requiredEntity)) {
-            if (!damageEvent.getEntity().isDead()) {
-                LivingEntity entity = (LivingEntity) damageEvent.getEntity();
-                if (entity.getHealth() - damageEvent.getDamage() > 0) {
-                    return;
-                }
-            }
-            battlePlayer.sendMessage(Caption.of(
-                    "notification.objective_finished",
-                    TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(objectiveString))))
-            ));
-            Toast.display(
-                    player,
-                    Material.DIAMOND_SWORD,
-                    ChatColor.BLUE + Format.formatName(objectiveString),
-                    Toast.Style.GOAL,
-                    ForceBattle.get()
-            );
+        checkPlayerObjective(battlePlayer, target);
+        checkTeamObjective(battlePlayer, target);
+    }
+
+    private void checkPlayerObjective(BattlePlayer battlePlayer, LivingEntity target) {
+        if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_MOB) return;
+
+        String objective = battlePlayer.getObjective().getObjectiveString();
+        if (isTargetMatch(target, objective)) {
+            completeObjective(battlePlayer, objective);
             battlePlayer.updateObjective(true, false);
         }
     }
 
+    private void checkTeamObjective(BattlePlayer battlePlayer, LivingEntity target) {
+        if (!battlePlayer.isInTeam()) return;
+        if (battlePlayer.getTeam().getObjective() == null) return;
+        if (battlePlayer.getTeam().getObjective().getBattleType() != BattleType.FORCE_MOB) return;
+
+        String objective = battlePlayer.getTeam().getObjective().getObjectiveString();
+        if (isTargetMatch(target, objective)) {
+            completeObjective(battlePlayer, objective);
+            battlePlayer.getTeam().updateObjective(battlePlayer, true, false);
+        }
+    }
+
+    private boolean isTargetMatch(LivingEntity target, String objectiveString) {
+        Object converted = BukkitUtil.convertObjective(BattleType.FORCE_MOB, objectiveString);
+        return converted instanceof EntityType required && target.getType() == required;
+    }
+
+    private void completeObjective(BattlePlayer player, String objective) {
+        String formattedObjective = Format.formatName(objective);
+        Material toastIcon = Material.DIAMOND_SWORD;
+        ForceBattle plugin = ForceBattle.get();
+
+        if (player.isInTeam() && SettingsManager.isEnabled(SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE)) {
+            Component teammateMsg = Caption.of(
+                    "notification.objective_finished_by_teammate",
+                    TagResolver.resolver("player", Tag.inserting(Component.text(player.getName()))),
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(formattedObjective)))
+            );
+
+            player.getTeam().getPlayers().stream()
+                    .filter(teammate -> teammate != player)
+                    .forEach(teammate -> {
+                        teammate.sendMessage(teammateMsg);
+                        Toast.display(teammate.getPlayer(), toastIcon, ChatColor.BLUE + formattedObjective, Toast.Style.GOAL, plugin);
+                    });
+        }
+
+        player.sendMessage(Caption.of(
+                "notification.objective_finished",
+                TagResolver.resolver("objective", Tag.inserting(Component.text(formattedObjective)))
+        ));
+        Toast.display(player.getPlayer(), toastIcon, ChatColor.BLUE + formattedObjective, Toast.Style.GOAL, plugin);
+    }
+
     @EventHandler
     public void onPlayerSkip(@NotNull PlayerInteractEvent event) {
         if (event.getHand() == null || !event.getHand().equals(EquipmentSlot.HAND)) {return;}
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR) {return;}
-        if (event.getItem() == null || !ItemUtils.isSkipItem(event.getItem())) {return;}
+        if (event.getItem() == null || !ItemUtils.isPlayerSkipItem(event.getItem())) {return;}
 
         BattlePlayer battlePlayer = BattlePlayer.adapt(event.getPlayer());
         if (battlePlayer.isExcluded()) return;
@@ -271,6 +316,57 @@ public void onPlayerSkip(@NotNull PlayerInteractEvent event) {
         Bukkit.getScheduler().runTaskLater(ForceBattle.get(), () -> skipCooldown.remove(battlePlayer), 20);
     }
 
+    @EventHandler
+    public void onTeamSkip(@NotNull PlayerInteractEvent event) {
+        if (event.getHand() == null || !event.getHand().equals(EquipmentSlot.HAND)) {return;}
+        if (event.getAction() != Action.RIGHT_CLICK_BLOCK && event.getAction() != Action.RIGHT_CLICK_AIR) {return;}
+        if (event.getItem() == null || !ItemUtils.isTeamSkipItem(event.getItem())) {return;}
+
+        BattlePlayer battlePlayer = BattlePlayer.adapt(event.getPlayer());
+        Team team = battlePlayer.getTeam();
+        if (battlePlayer.isExcluded()) return;
+        if (skipCooldown.contains(battlePlayer)) return;
+
+        event.setCancelled(true);
+
+        if (!ForceBattle.getTimer().isRunning()) {
+            battlePlayer.sendMessage(Caption.of("notification.skip_timer_paused"));
+            return;
+        }
+        if (team.getObjective() == null) {
+            battlePlayer.sendMessage(Caption.of("notification.skip_no_objective"));
+            return;
+        }
+
+        Objective oldObjective = team.getObjective();
+
+        team.getPlayers().forEach(player -> {
+            if (player != battlePlayer) {
+                player.sendMessage(Caption.of(
+                        "notification.objective_skipped_by_teammate",
+                        TagResolver.resolver("player", Tag.inserting(Component.text(player.getName()))),
+                        TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(oldObjective.getObjectiveString()))))
+                ));
+            }
+        });
+
+        battlePlayer.sendMessage(Caption.of(
+                "notification.objective_skipped",
+                TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(oldObjective.getObjectiveString()))))
+        ));
+
+        team.updateObjective(battlePlayer, true, true);
+
+        decreaseItemAmount(event);
+
+        if (oldObjective.getBattleType() == BattleType.FORCE_ITEM) {
+            ItemStack itemStack = new ItemStack(Material.valueOf(oldObjective.getObjectiveString()));
+            battlePlayer.getPlayer().getWorld().dropItemNaturally(battlePlayer.getPlayer().getLocation(), itemStack);
+        }
+        skipCooldown.add(battlePlayer);
+        Bukkit.getScheduler().runTaskLater(ForceBattle.get(), () -> skipCooldown.remove(battlePlayer), 20);
+    }
+
     @EventHandler
     public void onPlayerSwap(@NotNull PlayerInteractEvent event) {
         if (event.getHand() == null || !event.getHand().equals(EquipmentSlot.HAND)) return;
diff --git a/src/main/java/net/fameless/forcebattle/game/Objective.java b/src/main/java/net/fameless/forcebattle/game/Objective.java
index 0f3b503..68f4477 100644
--- a/src/main/java/net/fameless/forcebattle/game/Objective.java
+++ b/src/main/java/net/fameless/forcebattle/game/Objective.java
@@ -55,7 +55,9 @@ public void delete() {
         objectives.remove(this);
     }
 
-    public boolean hasBeenSkipped() { return hasBeenSkipped; }
+    public boolean hasBeenSkipped() {
+        return hasBeenSkipped;
+    }
 
     public int getTime() {
         if (!isFinished()) {
@@ -72,5 +74,4 @@ public void setFinished(BattlePlayer whoFinished) {
         this.whoFinished = whoFinished;
         this.time = ForceBattle.getTimer().getTime();
     }
-
 }
diff --git a/src/main/java/net/fameless/forcebattle/game/ObjectiveManager.java b/src/main/java/net/fameless/forcebattle/game/ObjectiveManager.java
index 5dc4254..631cb2a 100644
--- a/src/main/java/net/fameless/forcebattle/game/ObjectiveManager.java
+++ b/src/main/java/net/fameless/forcebattle/game/ObjectiveManager.java
@@ -19,16 +19,39 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class ObjectiveManager {
 
     private final List<String> chainList = new ArrayList<>();
 
+    public Objective getNewObjective(Team team) {
+        List<BattlePlayer> players = team.getPlayers();
+        if (players.isEmpty()) return null;
+
+        Random random = new Random();
+        BattlePlayer player = players.get(random.nextInt(players.size()));
+
+        List<BattleType> availableBattleTypes = new ArrayList<>();
+        for (BattleType type : BattleType.values()) {
+            SettingsManager.SettingState state = type.getSettingState();
+            if (state == SettingsManager.SettingState.TEAM || state == SettingsManager.SettingState.BOTH) {
+                availableBattleTypes.add(type);
+            }
+        }
+
+        if (availableBattleTypes.isEmpty()) return null;
+
+        BattleType battleType = availableBattleTypes.get(random.nextInt(availableBattleTypes.size()));
+        return generateObjective(battleType, player, team);
+    }
+
     public Objective getNewObjective(BattlePlayer battlePlayer) {
         if (SettingsManager.isEnabled(SettingsManager.Setting.CHAIN_MODE)) {
             int progress = battlePlayer.getChainProgress();
@@ -43,68 +66,67 @@ public Objective getNewObjective(BattlePlayer battlePlayer) {
         }
 
         List<BattleType> availableBattleTypes = new ArrayList<>();
-        if (SettingsManager.isEnabled(SettingsManager.Setting.FORCE_ITEM)) availableBattleTypes.add(BattleType.FORCE_ITEM);
-        if (SettingsManager.isEnabled(SettingsManager.Setting.FORCE_MOB)) availableBattleTypes.add(BattleType.FORCE_MOB);
-        if (SettingsManager.isEnabled(SettingsManager.Setting.FORCE_BIOME)) availableBattleTypes.add(BattleType.FORCE_BIOME);
-        if (SettingsManager.isEnabled(SettingsManager.Setting.FORCE_ADVANCEMENT)) availableBattleTypes.add(BattleType.FORCE_ADVANCEMENT);
-        if (SettingsManager.isEnabled(SettingsManager.Setting.FORCE_HEIGHT)) availableBattleTypes.add(BattleType.FORCE_HEIGHT);
-        if (SettingsManager.isEnabled(SettingsManager.Setting.FORCE_COORDS)) availableBattleTypes.add(BattleType.FORCE_COORDS);
-        if (SettingsManager.isEnabled(SettingsManager.Setting.FORCE_STRUCTURE)) availableBattleTypes.add(BattleType.FORCE_STRUCTURE);
+        for (BattleType type : BattleType.values()) {
+            SettingsManager.SettingState state = type.getSettingState();
+            if (state == SettingsManager.SettingState.PLAYER || state == SettingsManager.SettingState.BOTH) {
+                availableBattleTypes.add(type);
+            }
+        }
+
+        if (availableBattleTypes.isEmpty()) return null;
 
         Random random = new Random();
         BattleType battleType = availableBattleTypes.get(random.nextInt(availableBattleTypes.size()));
-        String objectiveString;
 
+        return generateObjective(battleType, battlePlayer, null);
+    }
+
+    private Objective generateObjective(BattleType battleType, BattlePlayer battlePlayer, Team team) {
+        Random random = new Random();
+        List<String> allPossible = getAllPossibleObjectives(battleType, battlePlayer);
+        if (allPossible.isEmpty()) return null;
+
+        if (SettingsManager.isEnabled(SettingsManager.Setting.NO_DUPLICATE_OBJECTIVES)) {
+            Set<String> finished = new HashSet<>();
+            if (team == null || !battlePlayer.isInTeam()) {
+                Objective.finishedBy(battlePlayer).forEach(obj -> finished.add(obj.getObjectiveString()));
+            } else {
+                team.getPlayers().forEach(p -> Objective.finishedBy(p).forEach(obj -> finished.add(obj.getObjectiveString())));
+            }
+            allPossible.removeIf(finished::contains);
+        }
+
+        if (allPossible.isEmpty()) return null;
+
+        String objectiveString = allPossible.get(random.nextInt(allPossible.size()));
+        return new Objective(battleType, objectiveString);
+    }
+
+    private List<String> getAllPossibleObjectives(BattleType battleType, BattlePlayer battlePlayer) {
+        List<String> list = new ArrayList<>();
         switch (battleType) {
-            case FORCE_ITEM -> objectiveString = getAvailableItems().get(random.nextInt(getAvailableItems().size())).name();
-            case FORCE_MOB -> objectiveString = getAvailableMobs().get(random.nextInt(getAvailableMobs().size())).name();
+            case FORCE_ITEM -> getAvailableItems().forEach(i -> list.add(i.name()));
+            case FORCE_MOB -> getAvailableMobs().forEach(m -> list.add(m.name()));
             case FORCE_BIOME -> {
-                if (SettingsManager.isEnabled(SettingsManager.Setting.SIMPLIFIED_OBJECTIVES)) {
-                    List<BiomeSimplified> list = getAvailableBiomesSimplified();
-                    objectiveString = list.get(random.nextInt(list.size())).getName();
-                } else {
-                    List<Biome> list = getAvailableBiomes();
-                    objectiveString = list.get(random.nextInt(list.size())).name();
-                }
+                if (SettingsManager.isEnabled(SettingsManager.Setting.SIMPLIFIED_OBJECTIVES))
+                    getAvailableBiomesSimplified().forEach(b -> list.add(b.getName()));
+                else
+                    getAvailableBiomes().forEach(b -> list.add(b.name()));
             }
-            case FORCE_ADVANCEMENT -> objectiveString = getAvailableAdvancements().get(random.nextInt(getAvailableAdvancements().size())).toString();
-            case FORCE_HEIGHT -> objectiveString = String.valueOf(getAvailableHeights().get(random.nextInt(getAvailableHeights().size())));
+            case FORCE_ADVANCEMENT -> getAvailableAdvancements().forEach(a -> list.add(a.toString()));
+            case FORCE_HEIGHT -> getAvailableHeights().forEach(h -> list.add(String.valueOf(h)));
             case FORCE_COORDS -> {
                 Location coords = getRandomLocation(battlePlayer);
-                objectiveString = coords.getX() + "," + coords.getZ();
+                list.add(coords.getX() + "," + coords.getZ());
             }
             case FORCE_STRUCTURE -> {
-                if (SettingsManager.isEnabled(SettingsManager.Setting.SIMPLIFIED_OBJECTIVES)) {
-                    List<StructureSimplified> list = getAvailableStructuresSimplified();
-                    objectiveString = list.get(random.nextInt(list.size())).getName();
-                } else {
-                    List<Structure> list = getAvailableStructures();
-                    objectiveString = list.get(random.nextInt(list.size())).toString();
-                }
-            }
-            default -> {
-                return null;
+                if (SettingsManager.isEnabled(SettingsManager.Setting.SIMPLIFIED_OBJECTIVES))
+                    getAvailableStructuresSimplified().forEach(s -> list.add(s.getName()));
+                else
+                    getAvailableStructures().forEach(s -> list.add(s.toString()));
             }
         }
-
-        if (SettingsManager.isEnabled(SettingsManager.Setting.NO_DUPLICATE_OBJECTIVES)) {
-            List<Objective> objectives = new ArrayList<>();
-
-            if (!battlePlayer.isInTeam()) {
-                objectives.addAll(Objective.finishedBy(battlePlayer));
-            } else {
-                battlePlayer.getTeam().getPlayers().forEach(teamPlayer -> objectives.addAll(Objective.finishedBy(teamPlayer)));
-            }
-
-            for (Objective objective : objectives) {
-                if (Objects.equals(objective.getObjectiveString(), objectiveString)) {
-                    return getNewObjective(battlePlayer);
-                }
-            }
-        }
-
-        System.out.println(objectiveString);
-        return new Objective(battleType, objectiveString);
+        return list;
     }
 
     public List<Material> getAvailableItems() {
@@ -139,6 +161,7 @@ public List<Material> getAvailableItems() {
             if (material.name().contains("WALL") && material.name().contains("BANNER")) continue;
             if (material.name().contains("WALL") && material.name().contains("SKULL")) continue;
             if (material.name().endsWith("STEM")) continue;
+            if (material.name().startsWith("INFESTED")) continue;
 
             availableItems.add(material);
         }
diff --git a/src/main/java/net/fameless/forcebattle/game/Team.java b/src/main/java/net/fameless/forcebattle/game/Team.java
index acc65d1..cc7fbbc 100644
--- a/src/main/java/net/fameless/forcebattle/game/Team.java
+++ b/src/main/java/net/fameless/forcebattle/game/Team.java
@@ -1,10 +1,14 @@
 package net.fameless.forcebattle.game;
 
 import lombok.Getter;
+import lombok.Setter;
+import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.caption.Caption;
+import net.fameless.forcebattle.event.ObjectiveUpdateEvent;
 import net.fameless.forcebattle.event.PlayerTeamJoinEvent;
 import net.fameless.forcebattle.event.PlayerTeamLeaveEvent;
 import net.fameless.forcebattle.player.BattlePlayer;
+import net.fameless.forcebattle.util.Format;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -28,6 +32,9 @@ public class Team {
     private final int ID;
     private boolean privateTeam = false;
     @Getter
+    @Setter
+    private Objective objective;
+    @Getter
     private JoinRequest lastJoinRequest = null;
 
     public Team(List<BattlePlayer> players) {
@@ -175,6 +182,39 @@ public static int getPlace(Team team) {
                 .orElse(-1);
     }
 
+    public void updateObjective(BattlePlayer finisher, boolean finishLast, boolean hasBeenSkipped) {
+        Objective newObjective = ForceBattle.getObjectiveManager().getNewObjective(this);
+        ObjectiveUpdateEvent updateEvent = new ObjectiveUpdateEvent(this, newObjective);
+        Bukkit.getPluginManager().callEvent(updateEvent);
+        if (updateEvent.isCancelled()) {
+            logger.info("ObjectiveUpdateEvent has been denied by an external plugin.");
+            return;
+        }
+
+        setCurrentObjective(updateEvent.getNewObjective(), finisher, finishLast, hasBeenSkipped);
+    }
+
+    public void setCurrentObjective(Objective newObjective, BattlePlayer finisher, boolean finishLast, boolean hasBeenSkipped) {
+        if (finishLast && this.objective != null) {
+            this.objective.setFinished(finisher);
+            this.objective.setHasBeenSkipped(hasBeenSkipped);
+
+            finisher.setPoints(finisher.getPoints() + 1);
+        }
+
+        if (ForceBattle.getTimer().isRunning()) {
+            for (BattlePlayer member : players) {
+                member.sendMessage(Caption.of(
+                        "notification.next_objective",
+                        TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(newObjective.getObjectiveString())))),
+                        TagResolver.resolver("objective_type", Tag.inserting(Component.text(newObjective.getBattleType().getPrefix())))
+                ));
+            }
+        }
+
+        this.objective = newObjective;
+    }
+
     @Getter
     public static class JoinRequest {
 
diff --git a/src/main/java/net/fameless/forcebattle/game/data/BiomeSimplified.java b/src/main/java/net/fameless/forcebattle/game/data/BiomeSimplified.java
index 2e0af9c..f8dba36 100644
--- a/src/main/java/net/fameless/forcebattle/game/data/BiomeSimplified.java
+++ b/src/main/java/net/fameless/forcebattle/game/data/BiomeSimplified.java
@@ -28,7 +28,6 @@ public enum BiomeSimplified {
     END("The End", List.of(Biome.THE_END, Biome.SMALL_END_ISLANDS, Biome.END_MIDLANDS, Biome.END_HIGHLANDS, Biome.END_BARRENS)),
     FROZEN("Frozen", List.of(Biome.ICE_SPIKES, Biome.FROZEN_OCEAN, Biome.DEEP_FROZEN_OCEAN, Biome.FROZEN_PEAKS, Biome.FROZEN_RIVER)),
     MUSHROOM_FIELDS("Mushroom Fields", List.of(Biome.MUSHROOM_FIELDS)),
-
     ;
 
     private final String name;
diff --git a/src/main/java/net/fameless/forcebattle/game/data/StructureSimplified.java b/src/main/java/net/fameless/forcebattle/game/data/StructureSimplified.java
index 8026c9e..8a7845a 100644
--- a/src/main/java/net/fameless/forcebattle/game/data/StructureSimplified.java
+++ b/src/main/java/net/fameless/forcebattle/game/data/StructureSimplified.java
@@ -7,7 +7,8 @@
 public enum StructureSimplified {
     VILLAGE("Village", List.of(Structure.VILLAGE_PLAINS, Structure.VILLAGE_SAVANNA, Structure.VILLAGE_SNOWY, Structure.VILLAGE_TAIGA, Structure.VILLAGE_DESERT)),
     PILLAGER_OUTPOST("Pillager Outpost", List.of(Structure.PILLAGER_OUTPOST)),
-    RUINED_PORTAL("Ruined Portal", List.of(Structure.RUINED_PORTAL_MOUNTAIN, Structure.RUINED_PORTAL_DESERT, Structure.RUINED_PORTAL_JUNGLE, Structure.RUINED_PORTAL_OCEAN, Structure.RUINED_PORTAL_SWAMP, Structure.RUINED_PORTAL_NETHER)),
+    //RUINED_PORTAL("Ruined Portal", List.of(Structure.RUINED_PORTAL_MOUNTAIN, Structure.RUINED_PORTAL_DESERT, Structure.RUINED_PORTAL_JUNGLE,
+    //               Structure.RUINED_PORTAL_OCEAN, Structure.RUINED_PORTAL_SWAMP, Structure.RUINED_PORTAL_NETHER)),
     OCEAN_RUIN("Ocean Ruin", List.of(Structure.OCEAN_RUIN_COLD, Structure.OCEAN_RUIN_WARM)),
     TRIAL_CHAMBERS("Trial Chambers", List.of(Structure.TRIAL_CHAMBERS)),
     SHIPWRECK("Shipwreck", List.of(Structure.SHIPWRECK, Structure.SHIPWRECK_BEACHED)),
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/AdvancementTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/AdvancementTask.java
index 6a0791b..3bd65c4 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/AdvancementTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/AdvancementTask.java
@@ -4,9 +4,7 @@
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.BattleType;
-import net.fameless.forcebattle.util.BukkitUtil;
-import net.fameless.forcebattle.util.Toast;
+import net.fameless.forcebattle.util.*;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -32,37 +30,76 @@ public void runTick() {
         for (Player player : Bukkit.getOnlinePlayers()) {
             BattlePlayer battlePlayer = BattlePlayer.adapt(player);
             if (battlePlayer.isExcluded()) continue;
-            if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_ADVANCEMENT) continue;
-
-            String objectiveString = battlePlayer.getObjective().getObjectiveString();
-            if (BukkitUtil.convertObjective(BattleType.FORCE_ADVANCEMENT, objectiveString) instanceof net.fameless.forcebattle.game.data.Advancement advancement) {
-                if (hasAdvancement(player, advancement.getKey())) {
-                    battlePlayer.sendMessage(Caption.of(
-                            "notification.objective_finished",
-                            TagResolver.resolver("objective", Tag.inserting(Component.text(advancement.getName())))
-                    ));
-                    if (ForceBattle.get().getConfig().getBoolean("reset-advancements-on-finish", true)) {resetAdvancements(player);}
-
-                    Toast.display(
-                            player,
-                            Material.BREWING_STAND,
-                            ChatColor.BLUE + advancement.getName(),
-                            Toast.Style.GOAL,
-                            ForceBattle.get()
-                    );
-                    battlePlayer.updateObjective(true, false);
-                }
+
+            checkPlayerObjective(battlePlayer, player);
+            checkTeamObjective(battlePlayer, player);
+        }
+    }
+
+    private void checkPlayerObjective(BattlePlayer battlePlayer, Player player) {
+        if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_ADVANCEMENT) return;
+
+        String objective = battlePlayer.getObjective().getObjectiveString();
+        if (hasCompletedAdvancement(player, objective)) {
+            completeObjective(battlePlayer, objective);
+            if (ForceBattle.get().getConfig().getBoolean("reset-advancements-on-finish", true)) {
+                resetAdvancements(player);
+            }
+            battlePlayer.updateObjective(true, false);
+        }
+    }
+
+    private void checkTeamObjective(BattlePlayer battlePlayer, Player player) {
+        if (!battlePlayer.isInTeam()) return;
+        if (battlePlayer.getTeam().getObjective() == null) return;
+        if (battlePlayer.getTeam().getObjective().getBattleType() != BattleType.FORCE_ADVANCEMENT) return;
+
+        String objective = battlePlayer.getTeam().getObjective().getObjectiveString();
+        if (hasCompletedAdvancement(player, objective)) {
+            completeObjective(battlePlayer, objective);
+            if (ForceBattle.get().getConfig().getBoolean("reset-advancements-on-finish", true)) {
+                resetAdvancements(player);
             }
+            battlePlayer.getTeam().updateObjective(battlePlayer, true, false);
         }
     }
 
-    private boolean hasAdvancement(Player player, NamespacedKey key) {
-        @NotNull Optional<Advancement> advancementOptional = getAdvancement(key);
-        if (advancementOptional.isPresent()) {
-            AdvancementProgress progress = player.getAdvancementProgress(advancementOptional.get());
-            return progress.isDone();
+    private boolean hasCompletedAdvancement(Player player, String objectiveString) {
+        Object obj = BukkitUtil.convertObjective(BattleType.FORCE_ADVANCEMENT, objectiveString);
+        if (!(obj instanceof net.fameless.forcebattle.game.data.Advancement adv)) return false;
+
+        Optional<Advancement> advancementOpt = getAdvancement(adv.getKey());
+        if (advancementOpt.isEmpty()) return false;
+
+        AdvancementProgress progress = player.getAdvancementProgress(advancementOpt.get());
+        return progress.isDone();
+    }
+
+    private void completeObjective(BattlePlayer player, String objective) {
+        String formattedObjective = Format.formatName(objective);
+        Material toastIcon = Material.BREWING_STAND;
+        ForceBattle plugin = ForceBattle.get();
+
+        if (player.isInTeam() && SettingsManager.isEnabled(SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE)) {
+            Component teammateMsg = Caption.of(
+                    "notification.objective_finished_by_teammate",
+                    TagResolver.resolver("player", Tag.inserting(Component.text(player.getName()))),
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(formattedObjective)))
+            );
+
+            player.getTeam().getPlayers().stream()
+                    .filter(teammate -> teammate != player)
+                    .forEach(teammate -> {
+                        teammate.sendMessage(teammateMsg);
+                        Toast.display(teammate.getPlayer(), toastIcon, ChatColor.BLUE + formattedObjective, Toast.Style.GOAL, plugin);
+                    });
         }
-        return false;
+
+        player.sendMessage(Caption.of(
+                "notification.objective_finished",
+                TagResolver.resolver("objective", Tag.inserting(Component.text(formattedObjective)))
+        ));
+        Toast.display(player.getPlayer(), toastIcon, ChatColor.BLUE + formattedObjective, Toast.Style.GOAL, plugin);
     }
 
     private @NotNull Optional<Advancement> getAdvancement(NamespacedKey key) {
@@ -76,7 +113,7 @@ private boolean hasAdvancement(Player player, NamespacedKey key) {
         return Optional.empty();
     }
 
-    public void resetAdvancements(Player player) {
+    private void resetAdvancements(Player player) {
         Iterator<Advancement> iterator = Bukkit.getServer().advancementIterator();
         while (iterator.hasNext()) {
             AdvancementProgress progress = player.getAdvancementProgress(iterator.next());
@@ -85,5 +122,4 @@ public void resetAdvancements(Player player) {
             }
         }
     }
-
 }
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/BiomeTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/BiomeTask.java
index accf602..371e14c 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/BiomeTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/BiomeTask.java
@@ -3,9 +3,9 @@
 import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
+import net.fameless.forcebattle.game.data.BiomeSimplified;
 import net.fameless.forcebattle.player.BattlePlayer;
 import net.fameless.forcebattle.util.*;
-import net.fameless.forcebattle.game.data.BiomeSimplified;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -25,44 +25,73 @@ public void runTick() {
         for (Player player : Bukkit.getOnlinePlayers()) {
             BattlePlayer battlePlayer = BattlePlayer.adapt(player);
             if (battlePlayer.isExcluded()) continue;
-            if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_BIOME) continue;
 
-            String objectiveString = battlePlayer.getObjective().getObjectiveString();
             Biome currentBiome = player.getWorld().getBiome(player.getLocation());
+            checkPlayerObjective(battlePlayer, currentBiome);
+            checkTeamObjective(battlePlayer, currentBiome);
+        }
+    }
+
+    private void checkPlayerObjective(BattlePlayer battlePlayer, Biome currentBiome) {
+        if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_BIOME) return;
+
+        String objectiveString = battlePlayer.getObjective().getObjectiveString();
+        if (isBiomeMatch(objectiveString, currentBiome)) {
+            completeObjective(battlePlayer, objectiveString);
+            battlePlayer.updateObjective(true, false);
+        }
+    }
+
+    private void checkTeamObjective(BattlePlayer battlePlayer, Biome currentBiome) {
+        if (!battlePlayer.isInTeam()) return;
+        if (battlePlayer.getTeam().getObjective() == null) return;
+        if (battlePlayer.getTeam().getObjective().getBattleType() != BattleType.FORCE_BIOME) return;
+
+        String objectiveString = battlePlayer.getTeam().getObjective().getObjectiveString();
+        if (isBiomeMatch(objectiveString, currentBiome)) {
+            completeObjective(battlePlayer, objectiveString);
+            battlePlayer.getTeam().updateObjective(battlePlayer, true, false);
+        }
+    }
+
+    private boolean isBiomeMatch(String objectiveString, Biome currentBiome) {
+        Object parsed = BukkitUtil.convertObjective(BattleType.FORCE_BIOME, objectiveString);
+
+        if (parsed instanceof BiomeSimplified simplified) {
+            return simplified.getBiomes().contains(currentBiome);
+        }
 
-            boolean completed = false;
-
-            if (SettingsManager.isEnabled(SettingsManager.Setting.SIMPLIFIED_OBJECTIVES)) {
-                for (BiomeSimplified simplified : BiomeSimplified.values()) {
-                    if (simplified.getName().equalsIgnoreCase(objectiveString)) {
-                        if (simplified.getBiomes().contains(currentBiome)) {
-                            completed = true;
-                            break;
-                        }
-                    }
-                }
-            } else {
-                if (BukkitUtil.convertObjective(BattleType.FORCE_BIOME, objectiveString) instanceof Biome biome) {
-                    if (currentBiome.equals(biome)) {
-                        completed = true;
-                    }
-                }
-            }
-
-            if (completed) {
-                battlePlayer.sendMessage(Caption.of(
-                        "notification.objective_finished",
-                        TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(objectiveString))))
-                ));
-                Toast.display(
-                        player,
-                        Material.GRASS_BLOCK,
-                        ChatColor.BLUE + Format.formatName(objectiveString),
-                        Toast.Style.GOAL,
-                        ForceBattle.get()
-                );
-                battlePlayer.updateObjective(true, false);
-            }
+        if (parsed instanceof Biome biome) {
+            return biome == currentBiome;
         }
+
+        return false;
+    }
+
+    private void completeObjective(BattlePlayer player, String objective) {
+        String formattedObjective = Format.formatName(objective);
+        Material toastIcon = Material.GRASS_BLOCK;
+        ForceBattle plugin = ForceBattle.get();
+
+        if (player.isInTeam() && SettingsManager.isEnabled(SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE)) {
+            Component teammateMsg = Caption.of(
+                    "notification.objective_finished_by_teammate",
+                    TagResolver.resolver("player", Tag.inserting(Component.text(player.getName()))),
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(formattedObjective)))
+            );
+
+            player.getTeam().getPlayers().stream()
+                    .filter(teammate -> teammate != player)
+                    .forEach(teammate -> {
+                        teammate.sendMessage(teammateMsg);
+                        Toast.display(teammate.getPlayer(), toastIcon, ChatColor.BLUE + formattedObjective, Toast.Style.GOAL, plugin);
+                    });
+        }
+
+        player.sendMessage(Caption.of(
+                "notification.objective_finished",
+                TagResolver.resolver("objective", Tag.inserting(Component.text(formattedObjective)))
+        ));
+        Toast.display(player.getPlayer(), toastIcon, ChatColor.BLUE + formattedObjective, Toast.Style.GOAL, plugin);
     }
 }
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/CoordsTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/CoordsTask.java
index 5aac6fa..cd3a213 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/CoordsTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/CoordsTask.java
@@ -4,10 +4,7 @@
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.BattleType;
-import net.fameless.forcebattle.util.BukkitUtil;
-import net.fameless.forcebattle.util.Format;
-import net.fameless.forcebattle.util.Toast;
+import net.fameless.forcebattle.util.*;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -19,6 +16,8 @@
 
 public class CoordsTask implements ForceTask {
 
+    private static final double COMPLETION_RADIUS = 2.0;
+
     @Override
     public void runTick() {
         if (!SettingsManager.isEnabled(SettingsManager.Setting.FORCE_COORDS)) return;
@@ -27,34 +26,77 @@ public void runTick() {
         for (Player player : Bukkit.getOnlinePlayers()) {
             BattlePlayer battlePlayer = BattlePlayer.adapt(player);
             if (battlePlayer.isExcluded()) continue;
-            if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_COORDS) continue;
-
-            String objectiveString = battlePlayer.getObjective().getObjectiveString();
-
-            if (BukkitUtil.convertObjective(BattleType.FORCE_COORDS, objectiveString) instanceof Location coords) {
-                double targetX = coords.getX();
-                double targetZ = coords.getZ();
-
-                double distance = player.getLocation().distance(
-                        new Location(player.getWorld(), targetX, player.getLocation().getY(), targetZ)
-                );
-
-                if (distance <= 2.0) {
-                    battlePlayer.sendMessage(Caption.of(
-                            "notification.objective_finished",
-                            TagResolver.resolver("objective", Tag.inserting(Component.text(targetX + ", " + targetZ)))
-                    ));
-                    Toast.display(
-                            player,
-                            Material.COMPASS,
-                            ChatColor.BLUE + Format.formatName(objectiveString),
-                            Toast.Style.GOAL,
-                            ForceBattle.get()
-                    );
-                    battlePlayer.updateObjective(true, false);
-                }
-            }
+
+            checkPlayerObjective(battlePlayer, player);
+            checkTeamObjective(battlePlayer, player);
+        }
+    }
+
+    private void checkPlayerObjective(BattlePlayer battlePlayer, Player player) {
+        if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_COORDS) return;
+
+        String objective = battlePlayer.getObjective().getObjectiveString();
+        if (isAtCoordinates(player, objective)) {
+            completeObjective(battlePlayer, objective);
+            battlePlayer.updateObjective(true, false);
         }
     }
 
+    private void checkTeamObjective(BattlePlayer battlePlayer, Player player) {
+        if (!battlePlayer.isInTeam()) return;
+        if (battlePlayer.getTeam().getObjective() == null) return;
+        if (battlePlayer.getTeam().getObjective().getBattleType() != BattleType.FORCE_COORDS) return;
+
+        String objective = battlePlayer.getTeam().getObjective().getObjectiveString();
+        if (isAtCoordinates(player, objective)) {
+            completeObjective(battlePlayer, objective);
+            battlePlayer.getTeam().updateObjective(battlePlayer, true, false);
+        }
+    }
+
+    private boolean isAtCoordinates(Player player, String objectiveString) {
+        Object obj = BukkitUtil.convertObjective(BattleType.FORCE_COORDS, objectiveString);
+        if (!(obj instanceof Location target)) return false;
+
+        Location playerLoc = player.getLocation();
+        Location targetLoc = new Location(player.getWorld(), target.getX(), playerLoc.getY(), target.getZ());
+        double distance = playerLoc.distance(targetLoc);
+
+        return distance <= COMPLETION_RADIUS;
+    }
+
+    private void completeObjective(BattlePlayer player, String objective) {
+        Object obj = BukkitUtil.convertObjective(BattleType.FORCE_COORDS, objective);
+        String coordsDisplay;
+
+        if (obj instanceof Location loc) {
+            coordsDisplay = String.format("%.0f, %.0f", loc.getX(), loc.getZ());
+        } else {
+            coordsDisplay = Format.formatName(objective);
+        }
+
+        Material toastIcon = Material.COMPASS;
+        ForceBattle plugin = ForceBattle.get();
+
+        if (player.isInTeam() && SettingsManager.isEnabled(SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE)) {
+            Component teammateMsg = Caption.of(
+                    "notification.objective_finished_by_teammate",
+                    TagResolver.resolver("player", Tag.inserting(Component.text(player.getName()))),
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(coordsDisplay)))
+            );
+
+            player.getTeam().getPlayers().stream()
+                    .filter(teammate -> teammate != player)
+                    .forEach(teammate -> {
+                        teammate.sendMessage(teammateMsg);
+                        Toast.display(teammate.getPlayer(), toastIcon, ChatColor.BLUE + coordsDisplay, Toast.Style.GOAL, plugin);
+                    });
+        }
+
+        player.sendMessage(Caption.of(
+                "notification.objective_finished",
+                TagResolver.resolver("objective", Tag.inserting(Component.text(coordsDisplay)))
+        ));
+        Toast.display(player.getPlayer(), toastIcon, ChatColor.BLUE + coordsDisplay, Toast.Style.GOAL, plugin);
+    }
 }
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/HeightTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/HeightTask.java
index 0010191..a65bb4a 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/HeightTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/HeightTask.java
@@ -4,10 +4,7 @@
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.configuration.SettingsManager;
 import net.fameless.forcebattle.player.BattlePlayer;
-import net.fameless.forcebattle.util.BattleType;
-import net.fameless.forcebattle.util.BukkitUtil;
-import net.fameless.forcebattle.util.Format;
-import net.fameless.forcebattle.util.Toast;
+import net.fameless.forcebattle.util.*;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -26,26 +23,67 @@ public void runTick() {
         for (Player player : Bukkit.getOnlinePlayers()) {
             BattlePlayer battlePlayer = BattlePlayer.adapt(player);
             if (battlePlayer.isExcluded()) continue;
-            if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_HEIGHT) continue;
-
-            String objectiveString = battlePlayer.getObjective().getObjectiveString();
-            if (BukkitUtil.convertObjective(BattleType.FORCE_HEIGHT, objectiveString) instanceof Integer height) {
-                if (player.getLocation().getBlockY() == height) {
-                    battlePlayer.sendMessage(Caption.of(
-                            "notification.objective_finished",
-                            TagResolver.resolver("objective", Tag.inserting(Component.text(height)))
-                    ));
-                    Toast.display(
-                            player,
-                            Material.SCAFFOLDING,
-                            ChatColor.BLUE + Format.formatName(objectiveString),
-                            Toast.Style.GOAL,
-                            ForceBattle.get()
-                    );
-                    battlePlayer.updateObjective(true, false);
-                }
-            }
+
+            checkPlayerObjective(battlePlayer, player);
+            checkTeamObjective(battlePlayer, player);
+        }
+    }
+
+    private void checkPlayerObjective(BattlePlayer battlePlayer, Player player) {
+        if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_HEIGHT) return;
+
+        String objective = battlePlayer.getObjective().getObjectiveString();
+        if (isAtTargetHeight(player, objective)) {
+            completeObjective(battlePlayer, objective);
+            battlePlayer.updateObjective(true, false);
+        }
+    }
+
+    private void checkTeamObjective(BattlePlayer battlePlayer, Player player) {
+        if (!battlePlayer.isInTeam()) return;
+        if (battlePlayer.getTeam().getObjective() == null) return;
+        if (battlePlayer.getTeam().getObjective().getBattleType() != BattleType.FORCE_HEIGHT) return;
+
+        String objective = battlePlayer.getTeam().getObjective().getObjectiveString();
+        if (isAtTargetHeight(player, objective)) {
+            completeObjective(battlePlayer, objective);
+            battlePlayer.getTeam().updateObjective(battlePlayer, true, false);
         }
     }
 
+    private boolean isAtTargetHeight(Player player, String objectiveString) {
+        Object obj = BukkitUtil.convertObjective(BattleType.FORCE_HEIGHT, objectiveString);
+        if (!(obj instanceof Integer height)) return false;
+
+        return player.getLocation().getBlockY() == height;
+    }
+
+    private void completeObjective(BattlePlayer player, String objective) {
+        Object obj = BukkitUtil.convertObjective(BattleType.FORCE_HEIGHT, objective);
+        String heightDisplay = obj instanceof Integer height ? String.valueOf(height) : Format.formatName(objective);
+
+        Material toastIcon = Material.SCAFFOLDING;
+        ForceBattle plugin = ForceBattle.get();
+
+        if (player.isInTeam() && SettingsManager.isEnabled(SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE)) {
+            Component teammateMsg = Caption.of(
+                    "notification.objective_finished_by_teammate",
+                    TagResolver.resolver("player", Tag.inserting(Component.text(player.getName()))),
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(heightDisplay)))
+            );
+
+            player.getTeam().getPlayers().stream()
+                    .filter(teammate -> teammate != player)
+                    .forEach(teammate -> {
+                        teammate.sendMessage(teammateMsg);
+                        Toast.display(teammate.getPlayer(), toastIcon, ChatColor.BLUE + heightDisplay, Toast.Style.GOAL, plugin);
+                    });
+        }
+
+        player.sendMessage(Caption.of(
+                "notification.objective_finished",
+                TagResolver.resolver("objective", Tag.inserting(Component.text(heightDisplay)))
+        ));
+        Toast.display(player.getPlayer(), toastIcon, ChatColor.BLUE + heightDisplay, Toast.Style.GOAL, plugin);
+    }
 }
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/ItemTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/ItemTask.java
index 79f30d7..4cb25ab 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/ItemTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/ItemTask.java
@@ -23,25 +23,65 @@ public void runTick() {
         for (Player player : Bukkit.getOnlinePlayers()) {
             BattlePlayer battlePlayer = BattlePlayer.adapt(player);
             if (battlePlayer.isExcluded()) continue;
-            if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_ITEM) continue;
-
-            String objectiveString = battlePlayer.getObjective().getObjectiveString();
-            if (BukkitUtil.convertObjective(BattleType.FORCE_ITEM, objectiveString) instanceof Material objective) {
-                if (player.getInventory().contains(objective)) {
-                    battlePlayer.sendMessage(Caption.of(
-                            "notification.objective_finished",
-                            TagResolver.resolver("objective", Tag.inserting(Component.text(Format.formatName(objectiveString))))
-                    ));
-                    Toast.display(
-                            player,
-                            objective,
-                            ChatColor.BLUE + Format.formatName(objectiveString),
-                            Toast.Style.GOAL,
-                            ForceBattle.get()
-                    );
-                    battlePlayer.updateObjective(true, false);
-                }
-            }
+
+            checkPlayerObjective(battlePlayer, player);
+            checkTeamObjective(battlePlayer, player);
+        }
+    }
+
+    private void checkPlayerObjective(BattlePlayer battlePlayer, Player player) {
+        if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_ITEM) return;
+
+        String objective = battlePlayer.getObjective().getObjectiveString();
+        if (hasRequiredItem(player, objective)) {
+            completeObjective(battlePlayer, objective);
+            battlePlayer.updateObjective(true, false);
+        }
+    }
+
+    private void checkTeamObjective(BattlePlayer battlePlayer, Player player) {
+        if (!battlePlayer.isInTeam()) return;
+        if (battlePlayer.getTeam().getObjective() == null) return;
+        if (battlePlayer.getTeam().getObjective().getBattleType() != BattleType.FORCE_ITEM) return;
+
+        String objective = battlePlayer.getTeam().getObjective().getObjectiveString();
+        if (hasRequiredItem(player, objective)) {
+            completeObjective(battlePlayer, objective);
+            battlePlayer.getTeam().updateObjective(battlePlayer, true, false);
         }
     }
+
+    private boolean hasRequiredItem(Player player, String objectiveString) {
+        Object obj = BukkitUtil.convertObjective(BattleType.FORCE_ITEM, objectiveString);
+        if (!(obj instanceof Material material)) return false;
+        return player.getInventory().contains(material);
+    }
+
+    private void completeObjective(BattlePlayer player, String objective) {
+        String formattedObjective = Format.formatName(objective);
+        Object obj = BukkitUtil.convertObjective(BattleType.FORCE_ITEM, objective);
+        Material toastIcon = obj instanceof Material mat ? mat : Material.BOOK;
+        ForceBattle plugin = ForceBattle.get();
+
+        if (player.isInTeam() && SettingsManager.isEnabled(SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE)) {
+            Component teammateMsg = Caption.of(
+                    "notification.objective_finished_by_teammate",
+                    TagResolver.resolver("player", Tag.inserting(Component.text(player.getName()))),
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(formattedObjective)))
+            );
+
+            player.getTeam().getPlayers().stream()
+                    .filter(teammate -> teammate != player)
+                    .forEach(teammate -> {
+                        teammate.sendMessage(teammateMsg);
+                        Toast.display(teammate.getPlayer(), toastIcon, ChatColor.BLUE + formattedObjective, Toast.Style.GOAL, plugin);
+                    });
+        }
+
+        player.sendMessage(Caption.of(
+                "notification.objective_finished",
+                TagResolver.resolver("objective", Tag.inserting(Component.text(formattedObjective)))
+        ));
+        Toast.display(player.getPlayer(), toastIcon, ChatColor.BLUE + formattedObjective, Toast.Style.GOAL, plugin);
+    }
 }
diff --git a/src/main/java/net/fameless/forcebattle/game/tasks/StructureTask.java b/src/main/java/net/fameless/forcebattle/game/tasks/StructureTask.java
index 0526fad..fe4ba80 100644
--- a/src/main/java/net/fameless/forcebattle/game/tasks/StructureTask.java
+++ b/src/main/java/net/fameless/forcebattle/game/tasks/StructureTask.java
@@ -32,49 +32,56 @@ public void runTick() {
         for (Player player : Bukkit.getOnlinePlayers()) {
             BattlePlayer battlePlayer = BattlePlayer.adapt(player);
             if (battlePlayer.isExcluded()) continue;
-            if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_STRUCTURE) continue;
 
-            String objectiveString = battlePlayer.getObjective().getObjectiveString();
+            checkPlayerObjective(battlePlayer, player, registry);
+            checkTeamObjective(battlePlayer, player, registry);
+        }
+    }
 
-            if (SettingsManager.isEnabled(SettingsManager.Setting.SIMPLIFIED_OBJECTIVES)) {
-                handleSimplifiedObjective(player, battlePlayer, registry, objectiveString);
-            } else {
-                handleNormalObjective(player, battlePlayer, registry, objectiveString);
-            }
+    private void checkPlayerObjective(BattlePlayer battlePlayer, Player player, Registry<org.bukkit.generator.structure.Structure> registry) {
+        if (battlePlayer.getObjective().getBattleType() != BattleType.FORCE_STRUCTURE) return;
+
+        String objectiveString = battlePlayer.getObjective().getObjectiveString();
+        if (isInsideStructure(player, objectiveString, registry)) {
+            completeObjective(battlePlayer, objectiveString);
+            battlePlayer.updateObjective(true, false);
         }
     }
 
-    private void handleSimplifiedObjective(Player player, BattlePlayer battlePlayer, Registry<org.bukkit.generator.structure.Structure> registry, String objectiveString) {
-        for (StructureSimplified simplified : StructureSimplified.values()) {
-            if (simplified.getName().equalsIgnoreCase(objectiveString)) {
-                for (Structure structure : simplified.getStructures()) {
-                    org.bukkit.generator.structure.Structure bukkitStruct = registry.get(structure.getKey());
-                    if (bukkitStruct == null) continue;
-
-                    if (isPlayerInsideStructure(player, bukkitStruct)) {
-                        sendCompletionMessage(battlePlayer, player, simplified.getName());
-                        battlePlayer.updateObjective(true, false);
-                        return;
-                    }
-                }
-            }
+    private void checkTeamObjective(BattlePlayer battlePlayer, Player player, Registry<org.bukkit.generator.structure.Structure> registry) {
+        if (!battlePlayer.isInTeam()) return;
+        if (battlePlayer.getTeam().getObjective() == null) return;
+        if (battlePlayer.getTeam().getObjective().getBattleType() != BattleType.FORCE_STRUCTURE) return;
+
+        String objectiveString = battlePlayer.getTeam().getObjective().getObjectiveString();
+        if (isInsideStructure(player, objectiveString, registry)) {
+            completeObjective(battlePlayer, objectiveString);
+            battlePlayer.getTeam().updateObjective(battlePlayer, true, false);
         }
     }
 
-    private void handleNormalObjective(Player player, BattlePlayer battlePlayer, Registry<org.bukkit.generator.structure.Structure> registry, String objectiveString) {
-        Object converted = BukkitUtil.convertObjective(BattleType.FORCE_STRUCTURE, objectiveString);
-        if (!(converted instanceof Structure structure)) return;
+    private boolean isInsideStructure(Player player, String objectiveString, Registry<org.bukkit.generator.structure.Structure> registry) {
+        Object parsed = BukkitUtil.convertObjective(BattleType.FORCE_STRUCTURE, objectiveString);
 
-        org.bukkit.generator.structure.Structure bukkitStruct = registry.get(structure.getKey());
-        if (bukkitStruct == null) return;
+        if (parsed instanceof StructureSimplified simplified) {
+            for (Structure structure : simplified.getStructures()) {
+                org.bukkit.generator.structure.Structure bukkitStruct = registry.get(structure.getKey());
+                if (bukkitStruct != null && checkPlayerLocationInStructure(player, bukkitStruct)) {
+                    return true;
+                }
+            }
+            return false;
+        }
 
-        if (isPlayerInsideStructure(player, bukkitStruct)) {
-            sendCompletionMessage(battlePlayer, player, structure.getName());
-            battlePlayer.updateObjective(true, false);
+        if (parsed instanceof Structure structure) {
+            org.bukkit.generator.structure.Structure bukkitStruct = registry.get(structure.getKey());
+            return bukkitStruct != null && checkPlayerLocationInStructure(player, bukkitStruct);
         }
+
+        return false;
     }
 
-    private boolean isPlayerInsideStructure(Player player, org.bukkit.generator.structure.Structure bukkitStruct) {
+    private boolean checkPlayerLocationInStructure(Player player, org.bukkit.generator.structure.Structure bukkitStruct) {
         StructureSearchResult result = player.getWorld().locateNearestStructure(player.getLocation(), bukkitStruct, 10, false);
         if (result == null) return false;
 
@@ -84,30 +91,42 @@ private boolean isPlayerInsideStructure(Player player, org.bukkit.generator.stru
 
         Location playerLoc = player.getLocation();
         for (StructurePiece piece : generated.get().getPieces()) {
-            if (isInside(playerLoc, piece.getBoundingBox())) return true;
+            if (isInsideBoundingBox(playerLoc, piece.getBoundingBox())) return true;
         }
         return false;
     }
 
-    private boolean isInside(Location loc, BoundingBox box) {
+    private boolean isInsideBoundingBox(Location loc, BoundingBox box) {
         double x = loc.getX(), y = loc.getY(), z = loc.getZ();
-        return x <= box.getMaxX() && x >= box.getMinX()
-                && y <= box.getMaxY() && y >= box.getMinY()
-                && z <= box.getMaxZ() && z >= box.getMinZ();
+        return x >= box.getMinX() && x <= box.getMaxX()
+                && y >= box.getMinY() && y <= box.getMaxY()
+                && z >= box.getMinZ() && z <= box.getMaxZ();
     }
 
-    private void sendCompletionMessage(BattlePlayer battlePlayer, Player player, String structureName) {
-        String formatted = Format.formatName(structureName);
-        battlePlayer.sendMessage(Caption.of(
+    private void completeObjective(BattlePlayer player, String objective) {
+        String formattedObjective = Format.formatName(objective);
+        Material toastIcon = Material.STRUCTURE_BLOCK;
+        ForceBattle plugin = ForceBattle.get();
+
+        if (player.isInTeam() && SettingsManager.isEnabled(SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE)) {
+            Component teammateMsg = Caption.of(
+                    "notification.objective_finished_by_teammate",
+                    TagResolver.resolver("player", Tag.inserting(Component.text(player.getName()))),
+                    TagResolver.resolver("objective", Tag.inserting(Component.text(formattedObjective)))
+            );
+
+            player.getTeam().getPlayers().stream()
+                    .filter(teammate -> teammate != player)
+                    .forEach(teammate -> {
+                        teammate.sendMessage(teammateMsg);
+                        Toast.display(teammate.getPlayer(), toastIcon, ChatColor.BLUE + formattedObjective, Toast.Style.GOAL, plugin);
+                    });
+        }
+
+        player.sendMessage(Caption.of(
                 "notification.objective_finished",
-                TagResolver.resolver("objective", Tag.inserting(Component.text(formatted)))
+                TagResolver.resolver("objective", Tag.inserting(Component.text(formattedObjective)))
         ));
-        Toast.display(
-                player,
-                Material.STRUCTURE_BLOCK,
-                ChatColor.BLUE + formatted,
-                Toast.Style.GOAL,
-                ForceBattle.get()
-        );
+        Toast.display(player.getPlayer(), toastIcon, ChatColor.BLUE + formattedObjective, Toast.Style.GOAL, plugin);
     }
 }
diff --git a/src/main/java/net/fameless/forcebattle/gui/ResultGUI.java b/src/main/java/net/fameless/forcebattle/gui/ResultGUI.java
index 09403f5..32f7d40 100644
--- a/src/main/java/net/fameless/forcebattle/gui/ResultGUI.java
+++ b/src/main/java/net/fameless/forcebattle/gui/ResultGUI.java
@@ -5,6 +5,8 @@
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.game.Objective;
 import net.fameless.forcebattle.game.Team;
+import net.fameless.forcebattle.game.data.BiomeSimplified;
+import net.fameless.forcebattle.game.data.StructureSimplified;
 import net.fameless.forcebattle.player.BattlePlayer;
 import net.fameless.forcebattle.game.data.Advancement;
 import net.fameless.forcebattle.util.BukkitUtil;
@@ -506,7 +508,7 @@ public static Material getTypeFromObjective(@NotNull Objective objective) {
             if (objectiveObject instanceof EntityType) {
                 return Material.SPIDER_SPAWN_EGG;
             }
-            if (objectiveObject instanceof Biome) {
+            if (objectiveObject instanceof Biome || objectiveObject instanceof BiomeSimplified) {
                 return Material.GRASS_BLOCK;
             }
             if (objectiveObject instanceof Advancement) {
@@ -518,7 +520,7 @@ public static Material getTypeFromObjective(@NotNull Objective objective) {
             if (objectiveObject instanceof Location) {
                 return Material.DIAMOND_BOOTS;
             }
-            if (objectiveObject instanceof Structure) {
+            if (objectiveObject instanceof Structure || objectiveObject instanceof StructureSimplified) {
                 return Material.STRUCTURE_BLOCK;
             }
             throw new RuntimeException("Corrupt/Invalid objective type: " + objective.getObjectiveString() + ". battleType: " + objective.getBattleType());
diff --git a/src/main/java/net/fameless/forcebattle/gui/SettingsGUI.java b/src/main/java/net/fameless/forcebattle/gui/SettingsGUI.java
index 3f8cc4d..731e232 100644
--- a/src/main/java/net/fameless/forcebattle/gui/SettingsGUI.java
+++ b/src/main/java/net/fameless/forcebattle/gui/SettingsGUI.java
@@ -7,6 +7,10 @@
 import net.fameless.forcebattle.player.BattlePlayer;
 import net.fameless.forcebattle.util.Format;
 import net.fameless.forcebattle.util.ItemUtils;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -19,6 +23,10 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+
 public class SettingsGUI implements Listener, InventoryHolder {
 
     private static SettingsGUI holderInstance;
@@ -27,61 +35,67 @@ public SettingsGUI() {
         holderInstance = this;
     }
 
-    // TODO everyone has their own objective + a harder team objective => make each force setting toggleable for player/team/both objective => multiple setting option
-    //  needed
-
-    // TODO simplified option for biome and structure => groups multiple into a category which is the objective (multiple structures/biomes count)
+    private static final EnumSet<SettingsManager.Setting> MULTI_STATE_SETTINGS = EnumSet.of(
+            SettingsManager.Setting.FORCE_ITEM,
+            SettingsManager.Setting.FORCE_MOB,
+            SettingsManager.Setting.FORCE_BIOME,
+            SettingsManager.Setting.FORCE_ADVANCEMENT,
+            SettingsManager.Setting.FORCE_HEIGHT,
+            SettingsManager.Setting.FORCE_COORDS,
+            SettingsManager.Setting.FORCE_STRUCTURE
+    );
 
     @Getter
     private enum SettingButton {
-        FORCE_ITEM(0, Material.ITEM_FRAME, SettingsManager.Setting.FORCE_ITEM, "gui.force_item_name", "gui.force_item_lore",
-                "notification.force_item_enabled", "notification.force_item_disabled"),
-        FORCE_MOB(1, Material.DIAMOND_SWORD, SettingsManager.Setting.FORCE_MOB, "gui.force_mob_name", "gui.force_mob_lore",
-                "notification.force_mob_enabled", "notification.force_mob_disabled"),
-        FORCE_BIOME(2, Material.GRASS_BLOCK, SettingsManager.Setting.FORCE_BIOME, "gui.force_biome_name", "gui.force_biome_lore",
-                "notification.force_biome_enabled", "notification.force_biome_disabled"),
-        FORCE_ADVANCEMENT(9, Material.BREWING_STAND, SettingsManager.Setting.FORCE_ADVANCEMENT, "gui.force_advancement_name",
-                "gui.force_advancement_lore", "notification.force_advancement_enabled", "notification.force_advancement_disabled"),
-        FORCE_HEIGHT(10, Material.SCAFFOLDING, SettingsManager.Setting.FORCE_HEIGHT, "gui.force_height_name",
-                "gui.force_height_lore", "notification.force_height_enabled", "notification.force_height_disabled"),
-        FORCE_COORDS(11, Material.FILLED_MAP, SettingsManager.Setting.FORCE_COORDS, "gui.force_coords_name",
-                "gui.force_coords_lore", "notification.force_coords_enabled", "notification.force_coords_disabled"),
-        FORCE_STRUCTURE(18, Material.STRUCTURE_BLOCK, SettingsManager.Setting.FORCE_STRUCTURE, "gui.force_structure_name",
-                "gui.force_structure_lore", "notification.force_structure_enabled", "notification.force_structure_disabled"),
-
-        CHAIN_MODE(6, Material.CHAIN, SettingsManager.Setting.CHAIN_MODE, "gui.chain_mode_name",
-                "gui.chain_mode_lore", "notification.chain_mode_enabled", "notification.chain_mode_disabled"),
-        BACKPACK(7, Material.CHEST, SettingsManager.Setting.BACKPACK, ChatColor.BLUE + "Backpacks",
-                "gui.backpack_lore", "notification.backpack_enabled", "notification.backpack_disabled"),
-        HIDE_POINTS(15, Material.IRON_TRAPDOOR, SettingsManager.Setting.HIDE_POINTS, "gui.hide_points_name",
-                "gui.hide_points_lore", "notification.hide_points_enabled", "notification.hide_points_disabled"),
-        HIDE_OBJECTIVES(16, Material.DARK_OAK_DOOR, SettingsManager.Setting.HIDE_OBJECTIVES, "gui.hide_objectives_name",
-                "gui.hide_objectives_lore", "notification.hide_objectives_enabled", "notification.hide_objectives_disabled"),
-        NO_DUPLICATE_OBJECTIVES(17, Material.NAME_TAG, SettingsManager.Setting.NO_DUPLICATE_OBJECTIVES, "gui.no_duplicate_objectives_name",
-                "gui.no_duplicate_objectives_lore", "notification.no_duplicate_objectives_enabled", "notification.no_duplicate_objectives_disabled"),
-        SIMPLIFIED_OBJECTIVES(26, Material.DIRT, SettingsManager.Setting.SIMPLIFIED_OBJECTIVES, "gui.simplified_objectives_name",
-                "gui.simplified_objectives_lore", "notification.simplified_objectives_enabled", "notification.simplified_objectives_disabled"),
-
-        RESET(8, Material.BARRIER, null, ChatColor.RED + "RESET", null, null, null);
+        FORCE_ITEM(0, Material.ITEM_FRAME, SettingsManager.Setting.FORCE_ITEM, "gui.force_item_name",
+                "gui.force_item_lore", "notification.force_item_changed"),
+        FORCE_MOB(1, Material.DIAMOND_SWORD, SettingsManager.Setting.FORCE_MOB, "gui.force_mob_name",
+                "gui.force_mob_lore", "notification.force_mob_changed"),
+        FORCE_BIOME(2, Material.GRASS_BLOCK, SettingsManager.Setting.FORCE_BIOME, "gui.force_biome_name",
+                "gui.force_biome_lore", "notification.force_biome_changed"),
+        FORCE_ADVANCEMENT(3, Material.BREWING_STAND, SettingsManager.Setting.FORCE_ADVANCEMENT, "gui.force_advancement_name",
+                "gui.force_advancement_lore", "notification.force_advancement_changed"),
+        FORCE_HEIGHT(4, Material.SCAFFOLDING, SettingsManager.Setting.FORCE_HEIGHT, "gui.force_height_name",
+                "gui.force_height_lore", "notification.force_height_changed"),
+        FORCE_COORDS(5, Material.FILLED_MAP, SettingsManager.Setting.FORCE_COORDS, "gui.force_coords_name",
+                "gui.force_coords_lore", "notification.force_coords_changed"),
+        FORCE_STRUCTURE(6, Material.STRUCTURE_BLOCK, SettingsManager.Setting.FORCE_STRUCTURE, "gui.force_structure_name",
+                "gui.force_structure_lore", "notification.force_structure_changed"),
+
+        CHAIN_MODE(27, Material.CHAIN, SettingsManager.Setting.CHAIN_MODE, "gui.chain_mode_name",
+                "gui.chain_mode_lore", "notification.chain_mode_changed"),
+        BACKPACK(28, Material.CHEST, SettingsManager.Setting.BACKPACK, ChatColor.BLUE + "Backpacks",
+                "gui.backpack_lore", "notification.backpack_changed"),
+        HIDE_POINTS(29, Material.IRON_TRAPDOOR, SettingsManager.Setting.HIDE_POINTS, "gui.hide_points_name",
+                "gui.hide_points_lore", "notification.hide_points_changed"),
+        HIDE_OBJECTIVES(30, Material.DARK_OAK_DOOR, SettingsManager.Setting.HIDE_OBJECTIVES, "gui.hide_objectives_name",
+                "gui.hide_objectives_lore", "notification.hide_objectives_changed"),
+        NO_DUPLICATE_OBJECTIVES(31, Material.NAME_TAG, SettingsManager.Setting.NO_DUPLICATE_OBJECTIVES, "gui.no_duplicate_objectives_name",
+                "gui.no_duplicate_objectives_lore", "notification.no_duplicate_objectives_changed"),
+        SIMPLIFIED_OBJECTIVES(32, Material.DIRT, SettingsManager.Setting.SIMPLIFIED_OBJECTIVES, "gui.simplified_objectives_name",
+                "gui.simplified_objectives_lore", "notification.simplified_objectives_changed"),
+        EXTRA_TEAM_OBJECTIVE(33, Material.ALLAY_SPAWN_EGG, SettingsManager.Setting.EXTRA_TEAM_OBJECTIVE, "gui.extra_team_objective_name",
+                "gui.extra_team_objective_lore", "notification.extra_team_objective_changed"),
+
+        RESET(8, Material.BARRIER, null, ChatColor.RED + "RESET", null, null);
 
         private final int slot;
         private final Material material;
         private final SettingsManager.Setting setting;
         private final String name;
         private final String lore;
-        private final String enabledMsg;
-        private final String disabledMsg;
+        private final String changedMsg;
 
-        SettingButton(int slot, Material material, SettingsManager.Setting setting, String name, String lore, String enabledMsg, String disabledMsg) {
+        SettingButton(int slot, Material material, SettingsManager.Setting setting, String name, String lore, String changedMsg) {
             this.slot = slot;
             this.material = material;
             this.setting = setting;
             this.name = name;
             this.lore = lore;
-            this.enabledMsg = enabledMsg;
-            this.disabledMsg = disabledMsg;
+            this.changedMsg = changedMsg;
         }
 
+
         public static SettingButton fromSlot(int slot) {
             for (SettingButton button : values()) {
                 if (button.slot == slot) return button;
@@ -92,11 +106,19 @@ public static SettingButton fromSlot(int slot) {
         public ItemStack toItem() {
             ItemUtils.ItemBuilder builder = new ItemUtils.ItemBuilder().type(material);
 
-            if (name.startsWith("gui.")) builder.name(Caption.getAsLegacy(name));
-            else builder.name(name);
+            if (name.startsWith("gui.")) {
+                builder.name(Caption.getAsLegacy(name));
+            } else {
+                builder.name(name);
+            }
+
+            List<String> loreLines = lore != null ? new ArrayList<>(Format.formatLineBreaks(
+                    LegacyComponentSerializer.legacySection().serialize(
+                            Caption.of(lore, TagResolver.resolver("state", Tag.inserting(Component.text(SettingsManager.getState(setting).getDisplayName()))))
+                    )
+            )) : new ArrayList<>();
 
-            if (lore != null)
-                builder.lore(Format.formatLineBreaks(Caption.getAsLegacy(lore)));
+            if (!loreLines.isEmpty()) builder.lore(loreLines);
 
             return builder.build();
         }
@@ -113,22 +135,19 @@ public void handleClick(BattlePlayer whoClicked) {
 
             if (setting == null) return;
 
-            boolean newStatus = !SettingsManager.isEnabled(setting);
+            SettingsManager.SettingState current = SettingsManager.getState(setting);
+            SettingsManager.SettingState next;
 
-            if (!canToggle(whoClicked, setting, newStatus)) return;
+            if (MULTI_STATE_SETTINGS.contains(setting)) {
+                next = current.next();
+            } else {
+                next = (current == SettingsManager.SettingState.OFF) ? SettingsManager.SettingState.PLAYER : SettingsManager.SettingState.OFF;
+            }
 
-            SettingsManager.setEnabled(setting, newStatus);
-            ForceBattle.broadcast(Caption.of(newStatus ? enabledMsg : disabledMsg));
-        }
+            SettingsManager.setState(setting, next);
 
-        private boolean canToggle(BattlePlayer player, SettingsManager.Setting setting, boolean newStatus) {
-            if (setting.name().startsWith("FORCE_")) {
-                if (SettingsManager.isEnabled(setting) && !newStatus && SettingsManager.getActiveChallenges().size() == 1) {
-                    player.sendMessage(Caption.of("error.no_challenge_selected"));
-                    return false;
-                }
-            }
-            return true;
+            ForceBattle.broadcast(Caption.of(changedMsg, TagResolver.resolver("state",
+                    Tag.inserting(Component.text(SettingsManager.getState(setting).getDisplayName())))));
         }
     }
 
diff --git a/src/main/java/net/fameless/forcebattle/player/BattlePlayer.java b/src/main/java/net/fameless/forcebattle/player/BattlePlayer.java
index 32a0723..79abb3a 100644
--- a/src/main/java/net/fameless/forcebattle/player/BattlePlayer.java
+++ b/src/main/java/net/fameless/forcebattle/player/BattlePlayer.java
@@ -300,11 +300,18 @@ public boolean hasPermission(@NonNull String permission) {
         return getPlayer().hasPermission(permission);
     }
 
-    public void addSkip(final int amount) {
+    public void addPlayerSkip(final int amount) {
         if (getPlayer() == null) {
             return;
         }
-        getPlayer().getInventory().addItem(ItemUtils.SpecialItems.getSkipItem(amount));
+        getPlayer().getInventory().addItem(ItemUtils.SpecialItems.getPlayerSkipItem(amount));
+    }
+
+    public void addTeamSkip(final int amount) {
+        if (getPlayer() == null) {
+            return;
+        }
+        getPlayer().getInventory().addItem(ItemUtils.SpecialItems.getTeamSkipItem(amount));
     }
 
     public void addSwap(final int amount) {
@@ -314,11 +321,18 @@ public void addSwap(final int amount) {
         getPlayer().getInventory().addItem(ItemUtils.SpecialItems.getSwapItem(amount));
     }
 
-    public void removeSkip(final int amount) {
+    public void removePlayerSkip(final int amount) {
+        if (getPlayer() == null) {
+            return;
+        }
+        getPlayer().getInventory().removeItem(ItemUtils.SpecialItems.getPlayerSkipItem(amount));
+    }
+
+    public void removeTeamSkip(final int amount) {
         if (getPlayer() == null) {
             return;
         }
-        getPlayer().getInventory().removeItem(ItemUtils.SpecialItems.getSkipItem(amount));
+        getPlayer().getInventory().removeItem(ItemUtils.SpecialItems.getTeamSkipItem(amount));
     }
 
     public void removeSwap(final int amount) {
diff --git a/src/main/java/net/fameless/forcebattle/util/BattleType.java b/src/main/java/net/fameless/forcebattle/util/BattleType.java
index ce666f5..6eed5ab 100644
--- a/src/main/java/net/fameless/forcebattle/util/BattleType.java
+++ b/src/main/java/net/fameless/forcebattle/util/BattleType.java
@@ -1,28 +1,36 @@
 package net.fameless.forcebattle.util;
 
+import lombok.Getter;
 import net.fameless.forcebattle.caption.Caption;
 import net.fameless.forcebattle.caption.Language;
+import net.fameless.forcebattle.configuration.SettingsManager;
 
+@Getter
 public enum BattleType {
 
-    FORCE_ITEM("Item", "Item"),
-    FORCE_MOB("Mob", "Mob"),
-    FORCE_BIOME("Biome", "Biom"),
-    FORCE_ADVANCEMENT("Advancement", "Advancement"),
-    FORCE_HEIGHT("Height", "Höhe"),
-    FORCE_COORDS("Coords", "Koordinaten"),
-    FORCE_STRUCTURE("Structure", "Struktur");
+    FORCE_ITEM("Item", "Item", SettingsManager.Setting.FORCE_ITEM),
+    FORCE_MOB("Mob", "Mob", SettingsManager.Setting.FORCE_MOB),
+    FORCE_BIOME("Biome", "Biom", SettingsManager.Setting.FORCE_BIOME),
+    FORCE_ADVANCEMENT("Advancement", "Advancement", SettingsManager.Setting.FORCE_ADVANCEMENT),
+    FORCE_HEIGHT("Height", "Höhe", SettingsManager.Setting.FORCE_HEIGHT),
+    FORCE_COORDS("Coords", "Koordinaten", SettingsManager.Setting.FORCE_COORDS),
+    FORCE_STRUCTURE("Structure", "Struktur", SettingsManager.Setting.FORCE_STRUCTURE);
 
     private final String englishPrefix;
     private final String germanPrefix;
+    private final SettingsManager.Setting linkedSetting;
 
-    BattleType(String englishPrefix, String germanPrefix) {
+    BattleType(String englishPrefix, String germanPrefix, SettingsManager.Setting linkedSetting) {
         this.englishPrefix = englishPrefix;
         this.germanPrefix = germanPrefix;
+        this.linkedSetting = linkedSetting;
     }
 
     public String getPrefix() {
         return Caption.getCurrentLanguage() == Language.ENGLISH ? englishPrefix : germanPrefix;
     }
 
+    public SettingsManager.SettingState getSettingState() {
+        return SettingsManager.getState(linkedSetting);
+    }
 }
diff --git a/src/main/java/net/fameless/forcebattle/util/BukkitUtil.java b/src/main/java/net/fameless/forcebattle/util/BukkitUtil.java
index 8655482..2e02a3a 100644
--- a/src/main/java/net/fameless/forcebattle/util/BukkitUtil.java
+++ b/src/main/java/net/fameless/forcebattle/util/BukkitUtil.java
@@ -2,7 +2,9 @@
 
 import net.fameless.forcebattle.ForceBattle;
 import net.fameless.forcebattle.game.data.Advancement;
+import net.fameless.forcebattle.game.data.BiomeSimplified;
 import net.fameless.forcebattle.game.data.Structure;
+import net.fameless.forcebattle.game.data.StructureSimplified;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -64,6 +66,14 @@ public final class BukkitUtil {
     }
 
     private static @Nullable Object tryBiome(String value) {
+        if (value == null || value.isEmpty()) return null;
+
+        for (BiomeSimplified simplified : BiomeSimplified.values()) {
+            if (simplified.getName().equalsIgnoreCase(value)) {
+                return simplified;
+            }
+        }
+
         try {
             return Biome.valueOf(value);
         } catch (IllegalArgumentException e) {
@@ -102,6 +112,14 @@ public final class BukkitUtil {
     }
 
     private static @Nullable Object tryStructure(String value) {
+        if (value == null || value.isEmpty()) return null;
+
+        for (StructureSimplified simplified : StructureSimplified.values()) {
+            if (simplified.getName().equalsIgnoreCase(value)) {
+                return simplified;
+            }
+        }
+
         try {
             return Structure.valueOf(value);
         } catch (IllegalArgumentException e) {
diff --git a/src/main/java/net/fameless/forcebattle/util/ItemUtils.java b/src/main/java/net/fameless/forcebattle/util/ItemUtils.java
index 7bde135..81aadde 100644
--- a/src/main/java/net/fameless/forcebattle/util/ItemUtils.java
+++ b/src/main/java/net/fameless/forcebattle/util/ItemUtils.java
@@ -23,7 +23,8 @@
  */
 public final class ItemUtils {
 
-    private static final NamespacedKey SKIP_KEY = new NamespacedKey(ForceBattle.get(), "skipItem");
+    private static final NamespacedKey PLAYER_SKIP_KEY = new NamespacedKey(ForceBattle.get(), "playerSkipItem");
+    private static final NamespacedKey TEAM_SKIP_KEY = new NamespacedKey(ForceBattle.get(), "teamSkipItem");
     private static final NamespacedKey SWAP_KEY = new NamespacedKey(ForceBattle.get(), "swapItem");
 
     private ItemUtils() {
@@ -40,13 +41,23 @@ public static boolean isSwapItem(@NotNull ItemStack stack) {
     }
 
     /**
-     * Checks if the given ItemStack is a skip item.
+     * Checks if the given ItemStack is a playerSkip item.
      *
      * @param stack the ItemStack to check
-     * @return true if the ItemStack is a skip item, false otherwise
+     * @return true if the ItemStack is a playerSkip item, false otherwise
      */
-    public static boolean isSkipItem(@NotNull ItemStack stack) {
-        return hasData(stack, SKIP_KEY);
+    public static boolean isPlayerSkipItem(@NotNull ItemStack stack) {
+        return hasData(stack, PLAYER_SKIP_KEY);
+    }
+
+    /**
+     * Checks if the given ItemStack is a teamSkip item.
+     *
+     * @param stack the ItemStack to check
+     * @return true if the ItemStack is a teamSkip item, false otherwise
+     */
+    public static boolean isTeamSkipItem(@NotNull ItemStack stack) {
+        return hasData(stack, TEAM_SKIP_KEY);
     }
 
     public static boolean hasData(@NotNull ItemStack stack, NamespacedKey key) {
@@ -234,12 +245,22 @@ public static class SpecialItems {
             );
         }
 
-        public static @NotNull ItemStack getSkipItem(int amount) {
+        public static @NotNull ItemStack getPlayerSkipItem(int amount) {
             return createSpecialItem(
                     Material.BARRIER,
-                    Caption.getAsLegacy("item.skip_item_name"),
-                    Caption.getAsLegacy("item.skip_item_lore"),
-                    SKIP_KEY,
+                    Caption.getAsLegacy("item.player_skip_item_name"),
+                    Caption.getAsLegacy("item.player_skip_item_lore"),
+                    PLAYER_SKIP_KEY,
+                    amount
+            );
+        }
+
+        public static @NotNull ItemStack getTeamSkipItem(int amount) {
+            return createSpecialItem(
+                    Material.NETHER_STAR,
+                    Caption.getAsLegacy("item.team_skip_item_name"),
+                    Caption.getAsLegacy("item.team_skip_item_lore"),
+                    TEAM_SKIP_KEY,
                     amount
             );
         }
@@ -248,10 +269,12 @@ public static class SpecialItems {
             return getSwapItem(1);
         }
 
-        public static @NotNull ItemStack getSkipItem() {
-            return getSkipItem(1);
+        public static @NotNull ItemStack getPlayerSkipItem() {
+            return getPlayerSkipItem(1);
         }
 
+        public static @NotNull ItemStack getTeamSkipItem() { return getTeamSkipItem(1); }
+
         public static @NotNull ItemStack getFillerItem() {
             return new ItemBuilder()
                     .type(Material.GRAY_STAINED_GLASS_PANE)
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 751a3f7..30ec363 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,5 +1,6 @@
 game-duration: 5400
-skips: 3
+playerSkips: 3
+teamSkips : 1
 swaps: 1
 reset-advancements-on-finish: true
 first-startup: true
@@ -50,13 +51,6 @@ exclude:
         - REINFORCED_DEEPSLATE
         - BUDDING_AMETHYST
         - CHORUS_PLANT
-        - INFESTED_CHISELED_STONE_BRICKS
-        - INFESTED_CRACKED_STONE_BRICKS
-        - INFESTED_COBBLESTONE
-        - INFESTED_DEEPSLATE
-        - INFESTED_MOSSY_STONE_BRICKS
-        - INFESTED_STONE
-        - INFESTED_STONE_BRICKS
         - MOB_SPAWNER
         - SPAWNER
         - LEASH_KNOT
@@ -67,62 +61,78 @@ exclude:
         - OMINOUS_TRIAL_SPAWNER
         - TRIAL_SPAWNER
         - SUSPICIOUS_GRAVEL
+        - SUSPICIOUS_SAND
         - FROGSPAWN
     mobs:
-        - MINECART_COMMAND
-        - ARMOR_STAND
-        - ENDER_SIGNAL
-        - LAMA_SPIT
-        - ENDER_PEARL
-        - PRIMED_TNT
+        - EXPERIENCE_ORB
+        - AREA_EFFECT_CLOUD
+        - EGG
+        - LEASH_KNOT
         - PAINTING
-        - EVOKER_FANGS
-        - GLOW_ITEM_FRAME
-        - MINECART_CHEST
         - ARROW
-        - MINECART_FURNACE
-        - MARKER
-        - MINECART_TNT
-        - ITEM_FRAME
-        - SHULKER_BULLET
-        - ITEM_DISPLAY
-        - MINECART_COMMAND
-        - PRIMED_TNT
-        - MINECART_MOB_SPAWNER
-        - AREA_EFFECT_CLOUD
-        - BOAT
         - SNOWBALL
-        - DROPPED_ITEM
-        - THROWN_EXP_BOTTLE
-        - BLOCK_DISPLAY
-        - CHEST_BOAT
-        - SMALL_FIREBALL
-        - UNKNOWN
-        - TEXT_DISPLAY
-        - INTERACTION
-        - SPLASH_POTION
         - FIREBALL
-        - SPECTRAL_ARROW
-        - ENDER_SIGNAL
-        - FISHING_HOOK
-        - FISHING_BOBBER
-        - FIREWORK
-        - EXPERIENCE_ORB
+        - SMALL_FIREBALL
+        - ENDER_PEARL
+        - EYE_OF_ENDER
+        - POTION
+        - EXPERIENCE_BOTTLE
+        - ITEM_FRAME
+        - WITHER_SKULL
+        - TNT
         - FALLING_BLOCK
+        - FIREWORK_ROCKET
+        - SPECTRAL_ARROW
+        - SHULKER_BULLET
         - DRAGON_FIREBALL
-        - EGG
-        - LEASH_HITCH
-        - MINECART
-        - LIGHTNING
-        - MINECART_HOPPER
+        - ZOMBIE_HORSE
+        - ARMOR_STAND
+        - EVOKER_FANGS
         - ILLUSIONER
+        - COMMAND_BLOCK_MINECART
+        - MINECART
+        - CHEST_MINECART
+        - FURNACE_MINECART
+        - TNT_MINECART
+        - HOPPER_MINECART
+        - SPAWNER_MINECART
         - GIANT
-        - WITHER_SKULL
+        - LLAMA_SPIT
+        - END_CRYSTAL
         - TRIDENT
-        - ENDER_CRYSTAL
-        - ITEM_FRAME
-        - TNT
+        - GLOW_ITEM_FRAME
+        - MARKER
+        - BLOCK_DISPLAY
+        - INTERACTION
+        - ITEM_DISPLAY
+        - TEXT_DISPLAY
+        - WIND_CHARGE
+        - BREEZE_WIND_CHARGE
+        - OMINOUS_ITEM_SPAWNER
+        - ACACIA_BOAT
+        - ACACIA_CHEST_BOAT
+        - BAMBOO_RAFT
+        - BAMBOO_CHEST_RAFT
+        - BIRCH_BOAT
+        - BIRCH_CHEST_BOAT
+        - CHERRY_BOAT
+        - CHERRY_CHEST_BOAT
+        - DARK_OAK_BOAT
+        - DARK_OAK_CHEST_BOAT
+        - JUNGLE_BOAT
+        - JUNGLE_CHEST_BOAT
+        - MANGROVE_BOAT
+        - MANGROVE_CHEST_BOAT
+        - OAK_BOAT
+        - OAK_CHEST_BOAT
+        - PALE_OAK_BOAT
+        - PALE_OAK_CHEST_BOAT
+        - SPRUCE_BOAT
+        - SPRUCE_CHEST_BOAT
+        - FISHING_BOBBER
         - LIGHTNING_BOLT
+        - UNKNOWN
+        - ITEM
     biomes:
         - THE_VOID
 
diff --git a/src/main/resources/languages/en_US.json b/src/main/resources/languages/en_US.json
index e31e85e..9382b1f 100644
--- a/src/main/resources/languages/en_US.json
+++ b/src/main/resources/languages/en_US.json
@@ -10,61 +10,55 @@
   "gui.reset_title" : "Reset",
   "gui.language_title" : "Choose a language",
   "gui.force_item_name" : "<blue>Force Item",
-  "gui.force_item_lore" : " <br><gray>Click to toggle ForceItem.<br><br><blue>Current Status<dark_gray>: <force-item-active>",
+  "gui.force_item_lore" : " <br><gray>Click to toggle ForceItem.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.force_mob_name" : "<blue>Force Mob",
-  "gui.force_mob_lore" : " <br><gray>Click to toggle ForceMob.<br><br><blue>Current Status<dark_gray>: <force-mob-active>",
+  "gui.force_mob_lore" : " <br><gray>Click to toggle ForceMob.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.force_biome_name" : "<blue>Force Biome",
-  "gui.force_biome_lore" : " <br><gray>Click to toggle ForceBiome.<br><br><blue>Current Status<dark_gray>: <force-biome-active>",
+  "gui.force_biome_lore" : " <br><gray>Click to toggle ForceBiome.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.force_advancement_name" : "<blue>Force Advancement",
-  "gui.force_advancement_lore" : " <br><gray>Click to toggle ForceAdvancement.<br><br><blue>Current Status<dark_gray>: <force-advancement-active>",
+  "gui.force_advancement_lore" : " <br><gray>Click to toggle ForceAdvancement.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.force_height_name" : "<blue>Force Height",
-  "gui.force_height_lore" : " <br><gray>Click to toggle ForceHeight.<br><br><blue>Current Status<dark_gray>: <force-height-active>",
+  "gui.force_height_lore" : " <br><gray>Click to toggle ForceHeight.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.force_coords_name" : "<blue>Force Coords",
-  "gui.force_coords_lore" : " <br><gray>Click to toggle ForceCoords.<br><br><blue>Current Status<dark_gray>: <force-coords-active>",
+  "gui.force_coords_lore" : " <br><gray>Click to toggle ForceCoords.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.force_structure_name" : "<blue>Force Structure",
-  "gui.force_structure_lore" : " <br><gray>Click to toggle ForceStructure.<br><br><blue>Current Status<dark_gray>: <force-structure-active>",
+  "gui.force_structure_lore" : " <br><gray>Click to toggle ForceStructure.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.chain_mode_name" : "<blue>Chain Mode",
-  "gui.chain_mode_lore" : " <br><gray>Click to toggle Chain Mode.<br><br><blue>Current Status<dark_gray>: <chain-mode-active>",
+  "gui.chain_mode_lore" : " <br><gray>Click to toggle Chain Mode.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.result_title_all" : "Results | All Players",
   "gui.result_title_player" : "Results | <player-name>",
   "gui.result_title_team" : "Results | Team <team-id>",
   "gui.backpack_title" : "<player>'s Backpack",
-  "gui.backpack_lore" : " <br><gray>Click to toggle Backpacks.<br><br><blue>Current Status<dark_gray>: <backpacks-active>",
+  "gui.backpack_lore" : " <br><gray>Click to toggle Backpacks.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.hide_points_name" : "<blue>Hide Points",
-  "gui.hide_points_lore" : " <br><gray>Click to toggle Hide Points.<br><br><blue>Current Status<dark_gray>: <hide-points-active>",
+  "gui.hide_points_lore" : " <br><gray>Click to toggle Hide Points.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.hide_objectives_name" : "<blue>Hide Objectives",
-  "gui.hide_objectives_lore" : "<br><gray>Click to toggle Hide Objectives.<br><br><blue>Current Status<dark_gray>: <hide-objectives-active>",
+  "gui.hide_objectives_lore" : "<br><gray>Click to toggle Hide Objectives.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.no_duplicate_objectives_name" : "<blue>No Duplicate Objectives",
-  "gui.no_duplicate_objectives_lore" : "<br><gray>Click to toggle no duplicate objectives.<br><br><blue>Current Status<dark_gray>: <no-duplicate-objectives-active>",
+  "gui.no_duplicate_objectives_lore" : "<br><gray>Click to toggle no duplicate objectives.<br><br><blue>Current Status<dark_gray>: <state>",
   "gui.simplified_objectives_name" : "<blue>Simplified Objectives",
-  "gui.simplified_objectives_lore" : "<br><gray>Click to toggle simplified objectives.<br><br><blue>Current Status<dark_gray>: <no-simplified-objectives-active>",
-  "notification.hide_points_enabled" : "<prefix><blue>Hide Points <gray>has been <green>enabled<gray>!",
-  "notification.hide_points_disabled" : "<prefix><blue>Hide Points <gray>has been <blue>disabled<gray>!",
-  "notification.hide_objectives_enabled" : "<prefix><blue>Hide Objectives <gray>has been <green>enabled<gray>!",
-  "notification.hide_objectives_disabled" : "<prefix><blue>Hide Objectives <gray>has been <blue>disabled<gray>!",
+  "gui.simplified_objectives_lore" : "<br><gray>Click to toggle simplified objectives.<br><br><blue>Current Status<dark_gray>: <state>",
+  "gui.extra_team_objective_name" : "<blue>Extra Team Objective",
+  "gui.extra_team_objective_lore" : "<br><gray>Click to toggle the extra team objective.<br><br><blue>Current Status<dark_gray>: <state>",
   "notification.objective_finished" : "<prefix><gray>You finished <blue><objective><gray>.",
+  "notification.objective_finished_by_teammate" : "<prefix><gray><player> has finished <blue><objective><gray>.",
   "notification.objective_skipped" : "<prefix><gray>You skipped <blue><objective><gray>.",
+  "notification.objective_skipped_by_teammate" : "<prefix><gray><player> has skipped <blue><objective><gray>.",
   "notification.next_objective" : "<prefix><gray>Next objective: <blue><objective><gray> (<objective_type>).",
-  "notification.force_item_enabled" : "<prefix><blue>ForceItem <gray>has been <green>enabled<gray>!",
-  "notification.force_item_disabled" : "<prefix><blue>ForceItem <gray>has been <blue>disabled<gray>!",
-  "notification.force_mob_enabled" : "<prefix><blue>ForceMob <gray>has been <green>enabled<gray>!",
-  "notification.force_mob_disabled" : "<prefix><blue>ForceMob <gray>has been <blue>disabled<gray>!",
-  "notification.force_biome_enabled" : "<prefix><blue>ForceBiome <gray>has been <green>enabled<gray>!",
-  "notification.force_biome_disabled" : "<prefix><blue>ForceBiome <gray>has been <blue>disabled<gray>!",
-  "notification.force_advancement_enabled" : "<prefix><blue>ForceAdvancement <gray>has been <green>enabled<gray>!",
-  "notification.force_advancement_disabled" : "<prefix><blue>ForceAdvancement <gray>has been <blue>disabled<gray>!",
-  "notification.force_height_enabled" : "<prefix><blue>ForceHeight <gray>has been <green>enabled<gray>!",
-  "notification.force_height_disabled" : "<prefix><blue>ForceHeight <gray>has been <blue>disabled<gray>!",
-  "notification.force_coords_enabled" : "<prefix><blue>ForceCoords <gray>has been <green>enabled<gray>!",
-  "notification.force_coords_disabled" : "<prefix><blue>ForceCoords <gray>has been <blue>disabled<gray>!",
-  "notification.force_structure_enabled" : "<prefix><blue>ForceStructure <gray>has been <green>enabled<gray>!",
-  "notification.force_structure_disabled" : "<prefix><blue>ForceStructure <gray>has been <blue>disabled<gray>!",
-  "notification.chain_mode_enabled" : "<prefix><blue>Chain Mode <gray>has been <green>enabled<gray>!",
-  "notification.chain_mode_disabled" : "<prefix><blue>Chain Mode <gray>has been <blue>disabled<gray>!",
-  "notification.no_duplicate_objectives_enabled" : "<prefix><blue>No duplicate objectives <gray>has been <green>enabled<gray>!",
-  "notification.no_duplicate_objectives_disabled" : "<prefix><blue>No duplicate objectives <gray>has been <blue>disabled<gray>!",
-  "notification.simplified_objectives_enabled" : "<prefix><blue>Simplified objectives <gray>have been <green>enabled<gray>!",
-  "notification.simplified_objectives_disabled" : "<prefix><blue>Simplified objectives <gray>have been <blue>disabled<gray>!",
+  "notification.hide_points_changed" : "<prefix><blue>Hide Points <gray>has been set to <blue><state>!",
+  "notification.backpack_changed" : "<prefix><blue>Backpacks <gray>have been set to <blue><state>!",
+  "notification.hide_objectives_changed" : "<prefix><blue>Hide Objectives <gray>has been set to <blue><state>!",
+  "notification.force_item_changed" : "<prefix><blue>ForceItem <gray>has been set to <blue><state>!",
+  "notification.force_mob_changed" : "<prefix><blue>ForceMob <gray>has been set to <blue><state>!",
+  "notification.force_biome_changed" : "<prefix><blue>ForceBiome <gray>has been set to <blue><state>!",
+  "notification.force_advancement_changed" : "<prefix><blue>ForceAdvancement <gray>has been set to <blue><state>!",
+  "notification.force_height_changed" : "<prefix><blue>ForceHeight <gray>has been set to <blue><state>!",
+  "notification.force_coords_changed" : "<prefix><blue>ForceCoords <gray>has been set to <blue><state>!",
+  "notification.force_structure_changed" : "<prefix><blue>ForceStructure <gray>has been set to <blue><state>!",
+  "notification.chain_mode_changed" : "<prefix><blue>Chain Mode <gray>has been set to <blue><state>!",
+  "notification.no_duplicate_objectives_changed" : "<prefix><blue>No duplicate objectives <gray>has been set to <blue><state>!",
+  "notification.simplified_objectives_changed" : "<prefix><blue>Simplified objectives <gray>have been set to <blue><state>!",
+  "notification.extra_team_objective_changed" : "<prefix><blue>Extra team objective <gray>has been set to <blue><state>!",
   "notification.team_registered" : "<prefix><gray>New team has been created. Team ID: <team-id>",
   "notification.team_join_request" : "<prefix><blue><player> <gray>has requested to join your team. /team accept|reject.",
   "notification.join_request_sent" : "<prefix><green>A join request has been sent.",
@@ -73,8 +67,6 @@
   "notification.player_left" : "<prefix><blue><player> <gray>has left your team.",
   "notification.player_rejected" : "<prefix><gray>Your join request has been rejected.",
   "notification.randomteams_successfully_created" : "<prefix><green> Successfully created <amount> Teams.",
-  "notification.backpack_enabled" : "<prefix><blue>Backpacks <gray>have been <green>enabled<gray>.",
-  "notification.backpack_disabled" : "<prefix><blue>Backpacks <gray>have been <red>disabled<gray>.",
   "notification.skip_timer_paused" : "<prefix><red>Can't skip while timer is paused.",
   "notification.skip_no_objective" : "<prefix><red>You don't have an objective to skip.",
   "notification.swap_timer_paused" : "<prefix><red>Can't swap while timer is paused.",
@@ -112,11 +104,16 @@
   "error.game_not_started" : "<prefix><red>The game hasn't started yet.",
   "error.game_already_started" : "<prefix><red>The game has already started.",
   "error.no_equal_teams" : "<prefix><red>No equal teams can be created.",
+  "error.no_battletype_selected" : "<prefix><red>No battletype is selected, game can not be started!",
   "permission.no_permission" : "<prefix><red>Insufficient permission: <permission>.",
-  "item.skip_item_name" : "<red>Skip",
-  "item.skip_item_lore" : "<gray>Click to skip your current objective.",
+  "item.player_skip_item_name" : "<red>Skip",
+  "item.player_skip_item_lore" : "<gray>Click to skip your current objective.",
+  "item.team_skip_item_name" : "<red>Skip",
+  "item.team_skip_item_lore" : "<gray>Click to skip your team's current objective.",
   "item.swap_item_name" : "<red>Swap",
   "item.swap_item_lore" : "<gray>Click to swap your objective with another player.",
   "bossbar.format" : "<gray><battletype><dark_gray>: <blue><objective> <dark_gray>| <gray><pointstype><dark_gray>: <blue><points>",
-  "bossbar.format_hide_points" : "<gray><battletype><dark_gray>: <blue><objective>"
+  "bossbar.format_hide_points" : "<gray><battletype><dark_gray>: <blue><objective>",
+  "bossbar.team_format" : "<gray><battletype><dark_gray>: <blue><objective> <dark_gray>| <gray><pointstype><dark_gray>: <blue><points>",
+  "bossbar.team_format_hide_points" : "<gray><battletype><dark_gray>: <blue><objective>"
 }