チェスト増殖できるバグを修正 & チェスト破壊時にドロップするように

Author: Elic0de

src/main/java/com/github/elic0de/hungergames/chest/DeathChest.java

@@ -10,6 +10,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 
 public class DeathChest {
 
@@ -22,10 +23,18 @@ public void generateChest(GameUser user) {
     }
 
     public void openDeathChest(Player player, Block block) {
-        if (chestLocations.containsKey(block)) {
-            final ItemStack[] contents = chestLocations.get(block);
-            new DeathChestMenu(contents, player).show();
-        }
+        if (getChestContents(block).isPresent()) new DeathChestMenu(getChestContents(block).get(), itemStacks -> updateChestContents(block, itemStacks), player).show();
+    }
+
+    public void breakDeathChest(Block block) {
+        final Location location = block.getLocation();
+        getChestContents(block).ifPresent(itemStacks -> {
+            for (ItemStack item : itemStacks) {
+                if (item == null) continue;
+                location.getWorld().dropItemNaturally(location, item);
+            }
+            chestLocations.remove(block);
+        });
     }
 
     public void reset() {
@@ -43,6 +52,13 @@ public void updateChestContents(Block block, ItemStack[] contents) {
         if (chestLocations.containsKey(block)) chestLocations.put(block, contents);
     }
 
+    public Optional<ItemStack[]> getChestContents(Block block) {
+        if (chestLocations.containsKey(block)) {
+            return Optional.of(chestLocations.get(block));
+        }
+        return Optional.empty();
+    }
+
     public boolean containsDeathChest(Block block) {
         return  chestLocations.containsKey(block);
     }

src/main/java/com/github/elic0de/hungergames/menu/DeathChestMenu.java

@@ -1,6 +1,7 @@
 package com.github.elic0de.hungergames.menu;
 
 import com.github.elic0de.hungergames.HungerGames;
+import com.github.elic0de.hungergames.chest.DeathChest;
 import de.themoep.inventorygui.GuiStorageElement;
 import de.themoep.inventorygui.InventoryGui;
 import org.bukkit.Bukkit;
@@ -9,14 +10,16 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.Optional;
+import java.util.function.Consumer;
 
 public class DeathChestMenu {
 
     private final InventoryGui menu;
 
     private final Player player;
 
+    private final DeathChest deathChest = HungerGames.getInstance().getGame().getDeathChest();
+
     private static final String[] MENU_LAYOUT = {
             "ppppppppp",
             "ppppppppp",
@@ -25,17 +28,15 @@ public class DeathChestMenu {
             "ppppppppp",
             "ppppppppp"
     };
-    public DeathChestMenu(ItemStack[] contents, Player player) {
+
+    public DeathChestMenu(ItemStack[] itemStacks, Consumer<ItemStack[]> items, Player player) {
         this.player = player;
         this.menu = new InventoryGui(HungerGames.getInstance(), "DeathChest", MENU_LAYOUT);
         Inventory inv = Bukkit.createInventory(null, 54);
-        inv.setContents(contents);
+        inv.setContents(itemStacks);
         menu.addElement(new GuiStorageElement('p', inv));
         menu.setCloseAction(close -> {
-            Block block = inv.getLocation().getBlock();
-            if (block != null) {
-                HungerGames.getInstance().getGame().getDeathChest().updateChestContents(block, inv.getContents());
-            }
+            items.accept(inv.getContents());
             return false;
         });
     }