[update] BlockPlaceListenerの機能強化

Author: howard12721

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

@@ -1,25 +1,22 @@
 package com.github.elic0de.thejpspit.spigot.listener;
 
 import com.github.elic0de.thejpspit.spigot.TheJpsPit;
-import java.util.HashSet;
-import java.util.Set;
 import org.bukkit.Bukkit;
-import org.bukkit.Effect;
 import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
+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 java.util.HashSet;
+import java.util.Set;
+
 public class BlockPlaceListener implements Listener {
 
     private final TheJpsPit pit;
 
-    private static final Set<Location> water = new HashSet<>();
-    private static final Set<Location> blocksPlaced = new HashSet<>();
+    private static final Set<BlockState> replacedStates = new HashSet<>();
 
     public BlockPlaceListener() {
         this.pit = TheJpsPit.getInstance();
@@ -30,29 +27,19 @@ public BlockPlaceListener() {
     public void on(BlockPlaceEvent event) {
         final Player player = event.getPlayer();
         if (player.getGameMode() == GameMode.CREATIVE) return;
-        final Block placedBlock = event.getBlockPlaced();
-        final Location placedBlockLocation = placedBlock.getLocation();
-
-        if(event.getBlockReplacedState().getType() == Material.WATER) water.add(placedBlock.getLocation());
+        final BlockState replacedState = event.getBlockReplacedState();
 
-        blocksPlaced.add(placedBlockLocation);
+        replacedStates.add(replacedState);
 
         pit.getServer().getScheduler().runTaskLater(pit, runnable -> {
-            if (water.contains(placedBlockLocation)) {
-                placedBlock.setType(Material.WATER);
-            } else {
-                placedBlock.setType(Material.AIR);
+            if (replacedStates.contains(replacedState)) {
+                replacedState.update();
+                replacedStates.remove(replacedState);
             }
-            blocksPlaced.remove(placedBlockLocation);
         }, (15 * 20));
     }
 
-    public static void removeBlocks() {
-        for (Location location : blocksPlaced) {
-            location.getBlock().setType(Material.AIR);
-        }
-        for (Location location : water) {
-            location.getBlock().setType(Material.WATER);
-        }
+    public static void restoreBlocks() {
+        replacedStates.forEach(BlockState::update);
     }
 }