fix inventory check
This commit is contained in:
parent
7da09d7601
commit
c6d7f02cef
|
|
@ -5,10 +5,12 @@ import com.alttd.easter.config.Messages;
|
||||||
import com.alttd.easter.data.DataManager;
|
import com.alttd.easter.data.DataManager;
|
||||||
import com.alttd.easter.egg.EggType;
|
import com.alttd.easter.egg.EggType;
|
||||||
import com.alttd.easter.util.ItemUtils;
|
import com.alttd.easter.util.ItemUtils;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import net.kyori.adventure.text.minimessage.MiniMessage;
|
import net.kyori.adventure.text.minimessage.MiniMessage;
|
||||||
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
|
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.entity.Item;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
|
|
@ -19,6 +21,7 @@ import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
public class TurnInGuiManager implements Listener {
|
public class TurnInGuiManager implements Listener {
|
||||||
|
|
||||||
private final DataManager dataManager;
|
private final DataManager dataManager;
|
||||||
|
|
@ -73,14 +76,17 @@ public class TurnInGuiManager implements Listener {
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onClose(InventoryCloseEvent event) {
|
public void onClose(InventoryCloseEvent event) {
|
||||||
Player player = (Player) event.getPlayer();
|
Player player = (Player) event.getPlayer();
|
||||||
Inventory top = openInventories.remove(player.getUniqueId());
|
Inventory top = openInventories.get(player.getUniqueId());
|
||||||
if (top == null) {
|
if (top == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!event.getInventory().equals(top)) {
|
if (!event.getView().getTopInventory().equals(top)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// collect egg items and clear them from the GUI so they don't drop
|
|
||||||
|
openInventories.remove(player.getUniqueId());
|
||||||
|
|
||||||
|
// collect egg items for submission and then clear GUI so eggs don't drop
|
||||||
Set<EggType> submitted = new HashSet<>();
|
Set<EggType> submitted = new HashSet<>();
|
||||||
for (ItemStack item : top.getContents()) {
|
for (ItemStack item : top.getContents()) {
|
||||||
if (ItemUtils.isEggItem(item)) {
|
if (ItemUtils.isEggItem(item)) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user