コマンドから再生数を変更できるように

Author: Elic0de

src/main/java/com/github/elic0de/thejpspit/spigot/command/PitCommand.java

@@ -43,8 +43,16 @@ public void onReset(Player player) {
     @CommandPermission("tjp.spawn")
     public void onSetSpawn(Player player) {
         pit.getPitPreferences().ifPresent(pitPreferences -> pitPreferences.setSpawn(LocationData.at(player.getLocation())));
+        pit.getPitPreferences().ifPresent(preferences -> pit.getDatabase().updatePitPreferences(preferences));
         PitPlayerManager.getPitPlayer(player).sendMessage("&cスポーン地点を設定しました");
+    }
+
+    @Subcommand("set regen")
+    @CommandPermission("tjp.regen")
+    public void onRegen(Player player, int amount) {
+        pit.getPitPreferences().ifPresent(pitPreferences -> pitPreferences.setAmountRegenHealth(amount));
         pit.getPitPreferences().ifPresent(preferences -> pit.getDatabase().updatePitPreferences(preferences));
+        player.sendMessage("変更しました");
     }
 
     @Subcommand("shop")

src/main/java/com/github/elic0de/thejpspit/spigot/config/PitPreferences.java

@@ -13,13 +13,18 @@ public class PitPreferences {
     @SerializedName("spawn")
     private LocationData spawn;
 
+    @Expose
+    @SerializedName("amount_regen_health")
+    private int amountRegenHealth;
+
     public static PitPreferences getDefaults() {
         final Location location = Bukkit.getWorlds().stream().findAny().get().getSpawnLocation();
         return new PitPreferences(LocationData.at(location.getX(), location.getY(), location.getZ(), location.getWorld()));
     }
 
     private PitPreferences(LocationData spawn) {
         this.spawn = spawn;
+        this.amountRegenHealth = 1;
     }
 
     public Optional<LocationData> getSpawn() {
@@ -29,4 +34,12 @@ public Optional<LocationData> getSpawn() {
     public void setSpawn(LocationData location) {
         this.spawn = location;
     }
+
+    public int getAmountRegenHealth() {
+        return amountRegenHealth;
+    }
+
+    public void setAmountRegenHealth(int amountRegenHealth) {
+        this.amountRegenHealth = amountRegenHealth;
+    }
 }

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

@@ -171,13 +171,11 @@ public void onDamage(EntityDamageByEntityEvent event) {
 
     @EventHandler
     private void onEntityRegainHealth(EntityRegainHealthEvent event) {
-        if (!(event.getEntity() instanceof Player)) {
-            return;
-        }
-
-        // 20 ticks に1 amount
-        if (event.getRegainReason() == EntityRegainHealthEvent.RegainReason.SATIATED) {
-            event.setAmount(event.getAmount() - (event.getAmount() * .8));
+        if (event.getEntity() instanceof Player) {
+            if (event.getRegainReason() == EntityRegainHealthEvent.RegainReason.SATIATED) {
+                TheJpsPit.getInstance().getPitPreferences().ifPresent(
+                    pitPreferences -> event.setAmount(pitPreferences.getAmountRegenHealth()));
+            }
         }
     }