Merge remote-tracking branch 'origin/master'

Author: Elic0de

src/main/java/com/github/elic0de/thejpspit/spigot/gui/ShopMenu.java

@@ -20,7 +20,7 @@ public class ShopMenu {
     private static final String[] MENU_LAYOUT = {
             "         ",
             " SCBofLc ",
-            " tvu     ",
+            " tvue    ",
             "         "
     };
 

src/main/java/com/github/elic0de/thejpspit/spigot/item/ItemManager.java

@@ -50,15 +50,16 @@ public static boolean isPitItem(ItemStack itemStack) {
     }
 
     public static void createItems() {
-        ItemManager.register(new ItemDiamondSword());
-        ItemManager.register(new ItemDiamondChestPlate());
-        ItemManager.register(new ItemDiamondBoots());
-        ItemManager.register(new ItemObsidian());
-        ItemManager.register(new ItemVividSword());
-        ItemManager.register(new ItemCobweb());
-        ItemManager.register(new ItemFishingRod());
-        ItemManager.register(new ItemTurtleShell());
-        ItemManager.register(new ItemUltimateSword());
-        ItemManager.register(new ItemLavaBucket());
+        register(new ItemDiamondSword());
+        register(new ItemDiamondChestPlate());
+        register(new ItemDiamondBoots());
+        register(new ItemObsidian());
+        register(new ItemVividSword());
+        register(new ItemCobweb());
+        register(new ItemFishingRod());
+        register(new ItemTurtleShell());
+        register(new ItemUltimateSword());
+        register(new ItemLavaBucket());
+        register(new ItemEnderPearl());
     }
 }

src/main/java/com/github/elic0de/thejpspit/spigot/item/items/ItemEnderPearl.java

@@ -0,0 +1,38 @@
+package com.github.elic0de.thejpspit.spigot.item.items;
+
+import com.github.elic0de.thejpspit.spigot.item.PitItemEntry;
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+
+public class ItemEnderPearl extends PitItemEntry {
+
+    @Override
+    public String getId() {
+        return "ender_pearl";
+    }
+
+    @Override
+    public ItemStack getRawItemStack() {
+        return new ItemStack(Material.ENDER_PEARL);
+    }
+
+    @Override
+    public int getPrice() {
+        return 100;
+    }
+
+    @Override
+    public int getRequiredLevel() {
+        return 0;
+    }
+
+    @Override
+    public String getName() {
+        return "§aエンダーパール";
+    }
+
+    @Override
+    public char getSlotChar() {
+        return 'e';
+    }
+}

src/main/java/com/github/elic0de/thejpspit/spigot/listener/BlockPlaceListener.java

@@ -3,21 +3,21 @@
 import com.github.elic0de.thejpspit.spigot.TheJpsPit;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
+import org.bukkit.Location;
 import org.bukkit.block.BlockState;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.player.PlayerBucketEmptyEvent;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.HashMap;
 
 public class BlockPlaceListener implements Listener {
 
     private final TheJpsPit pit;
 
-    private static final Set<BlockState> replacedStates = new HashSet<>();
+    private static final HashMap<Location, BlockState> replacedStates = new HashMap<>();
 
     public BlockPlaceListener() {
         this.pit = TheJpsPit.getInstance();
@@ -30,12 +30,13 @@ public void on(BlockPlaceEvent event) {
         if (player.getGameMode() == GameMode.CREATIVE) return;
         final BlockState replacedState = event.getBlockReplacedState();
 
-        replacedStates.add(replacedState);
+        if (replacedStates.containsKey(replacedState.getLocation())) return;
+        replacedStates.put(replacedState.getLocation(), replacedState);
 
         pit.getServer().getScheduler().runTaskLater(pit, runnable -> {
-            if (replacedStates.contains(replacedState)) {
+            if (replacedStates.containsKey(replacedState.getLocation())) {
                 replacedState.update(true);
-                replacedStates.remove(replacedState);
+                replacedStates.remove(replacedState.getLocation());
             }
         }, (15 * 20));
     }
@@ -46,17 +47,18 @@ public void on(PlayerBucketEmptyEvent event) {
         if (player.getGameMode() == GameMode.CREATIVE) return;
         final BlockState replacedState = event.getBlock().getState();
 
-        replacedStates.add(replacedState);
+        if (replacedStates.containsKey(replacedState.getLocation())) return;
+        replacedStates.put(replacedState.getLocation(), replacedState);
 
         pit.getServer().getScheduler().runTaskLater(pit, runnable -> {
-            if (replacedStates.contains(replacedState)) {
+            if (replacedStates.containsKey(replacedState.getLocation())) {
                 replacedState.update(true);
-                replacedStates.remove(replacedState);
+                replacedStates.remove(replacedState.getLocation());
             }
         }, (15 * 20));
     }
 
     public static void restoreBlocks() {
-        replacedStates.forEach(b -> b.update(true));
+        replacedStates.values().forEach(b -> b.update(true));
     }
 }