diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java
index 70b5958..80ad5ca 100644
--- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java
+++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java
@@ -313,29 +313,20 @@
 
         if (meta != null && meta.getPersistentDataContainer().has(skipKey) || metaInHand != null && metaInHand.getPersistentDataContainer().has(skipKey)) {
             switch (e.getAction()) {
-                case NOTHING:
-                case PICKUP_ALL:
-                case PICKUP_HALF:
-                case PICKUP_ONE:
-                case PICKUP_SOME:
-                case PLACE_ALL:
-                case PLACE_ONE:
-                case PLACE_SOME:
-                case SWAP_WITH_CURSOR:
-                case COLLECT_TO_CURSOR:
-                case HOTBAR_SWAP:
+                case NOTHING, PICKUP_ALL, PICKUP_HALF, PICKUP_ONE, PICKUP_SOME, PLACE_ALL, PLACE_ONE, PLACE_SOME, SWAP_WITH_CURSOR, COLLECT_TO_CURSOR, HOTBAR_SWAP -> {
                     if (e.getClickedInventory() != player.getInventory()) {
                         e.setCancelled(true);
                     }
-                    break;
-                case MOVE_TO_OTHER_INVENTORY:
+                }
+                case MOVE_TO_OTHER_INVENTORY -> {
                     if (!(e.getInventory() instanceof CraftingInventory)) {
                         e.setCancelled(true);
                     }
-                    break;
-                default:
+                }
+                default -> {
                     e.setCancelled(true);
                     return;
+                }
             }
         }
 
@@ -464,7 +455,7 @@
     private void tick() {
         for (Player player : plugin.getVanish().getPlayerListWithoutVanishPlayers()) {
             if (player.getGameMode() == GameMode.SPECTATOR) {
-                return;
+                continue;
             }
 
             Location location = player.getLocation();