diff --git a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java index 7f61468..f05abbc 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/BingoChallengeEvent.java @@ -204,6 +204,16 @@ for (Player pp : Bukkit.getOnlinePlayers()) { pp.setGameMode(GameMode.SPECTATOR); } + return; + } + } + + if (!items.isEmpty()) { + for (ItemStack stack : player.getInventory().getContents()) { + if (stack != null && items.contains(stack.getType())) { + addDiscoveredItem(player, stack); + break; + } } } } else { @@ -242,6 +252,16 @@ for (Player allplayers : Bukkit.getOnlinePlayers()) { allplayers.setGameMode(GameMode.SPECTATOR); } + return; + } + + if (!items.isEmpty()) { + for (ItemStack stack : player.getInventory().getContents()) { + if (stack != null && items.contains(stack.getType())) { + addDiscoveredItem(player, stack); + break; + } + } } } } 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 d838f0c..8cadd33 100644 --- a/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java +++ b/src/main/java/de/fanta/challenges/challenges/ChallengeEvents/ForceItemChallengeEvent.java @@ -25,6 +25,7 @@ import org.bukkit.entity.ArmorStand; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; +import org.bukkit.entity.Item; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -558,6 +559,16 @@ ChatUtil.sendNormalMessage(player, "Item: " + ChatUtil.BLUE + new ItemStack(pickupItem).getI18NDisplayName() + ChatUtil.GREEN + " wurde Registriert"); player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 1.0F, 1.0F); updateItem(player); + + if (!itemList.isEmpty()) { + playerItem = itemByPlayerList.get(player.getUniqueId()); + for (ItemStack stack : player.getInventory().getContents()) { + if (stack != null && stack.getType().equals(playerItem)) { + selectItem(player, playerItem); + break; + } + } + } } }