完成

Author: Elic0de

.github/workflows/main.yml

@@ -0,0 +1,29 @@
+name: release
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 16
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '16'
+        cache: 'maven'
+    - name: pom.yml バージョン更新
+      run:  mvn versions:set -Dparent.version=release-v${{ github.run_number }}
+    - name: Mavenを使ってビルド
+      run:  mvn -B package -f pom.xml
+    - name: original-*.jarを削除
+      run: rm target/original-*.jar
+    - name: パッケージをビルドの成果物としてリリース
+      uses: softprops/action-gh-release@v1
+      with:
+        tag_name: release-v${{ github.run_number }}
+        files: 'target/*.jar'

src/main/java/com/github/elic0de/hungergames/HungerGames.java

@@ -35,7 +35,8 @@ public void onEnable() {
     public void onDisable() {
         // Plugin shutdown logic
         GameUserManager.getOnlineUsers().forEach(player -> game.leave(player));
-        Bukkit.getScheduler().cancelTasks(this);
+        game.reset();
+        //Bukkit.getScheduler().cancelTasks(this);
     }
 
     private void registerCommands() {

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

@@ -4,6 +4,7 @@
 import com.github.elic0de.hungergames.user.GameUser;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
@@ -12,18 +13,18 @@
 
 public class DeathChest {
 
-    private final Map<Location, ItemStack[]> chestLocations = new HashMap<>();
+    private final Map<Block, ItemStack[]> chestLocations = new HashMap<>();
 
     public void generateChest(GameUser user) {
         final Location chestLocation = user.getPlayer().getLocation();
         chestLocation.getWorld().setType(chestLocation, Material.CHEST);
-        chestLocations.put(chestLocation, user.getPlayer().getInventory().getContents());
+        chestLocations.put(chestLocation.getBlock(), user.getPlayer().getInventory().getContents());
     }
 
-    public void openDeathChest(Player player, Location location) {
-        if (chestLocations.containsKey(location)) {
-            final ItemStack[] contents = chestLocations.get(location);
-            new DeathChestMenu(contents).show(player);
+    public void openDeathChest(Player player, Block block) {
+        if (chestLocations.containsKey(block)) {
+            final ItemStack[] contents = chestLocations.get(block);
+            new DeathChestMenu(contents, player).show();
         }
     }
 

src/main/java/com/github/elic0de/hungergames/dragon/DragonTrait.java

@@ -3,9 +3,11 @@
 import com.github.elic0de.hungergames.HungerGames;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.npc.CitizensNPC;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.WorldBorder;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -15,6 +17,8 @@ public class DragonTrait extends Trait {
     private final Map<Integer, Location> locations = new HashMap<>();
     private final AtomicInteger index = new AtomicInteger();
 
+    private BukkitTask task;
+
     public DragonTrait(WorldBorder worldBorder) {
         super("dragonTrait");
         final Location origin =  worldBorder.getCenter();
@@ -28,7 +32,8 @@ public DragonTrait(WorldBorder worldBorder) {
 
     @Override
     public void run() {
-        new BukkitRunnable() {
+        if (task != null) task.cancel();
+        task = new BukkitRunnable() {
             @Override
             public void run() {
                 if (locations.get(index.get()) == null) {
@@ -42,4 +47,9 @@ public void run() {
             }
         }.runTaskTimer(HungerGames.getInstance(), 0, 20);
     }
+
+    public void reset() {
+        npc.destroy();
+        if (task != null) task.cancel();
+    }
 }

src/main/java/com/github/elic0de/hungergames/game/HungerGame.java

@@ -2,6 +2,7 @@
 
 import com.github.elic0de.eliccommon.game.AbstractGame;
 import com.github.elic0de.eliccommon.game.phase.Phase;
+import com.github.elic0de.hungergames.HungerGames;
 import com.github.elic0de.hungergames.chest.DeathChest;
 import com.github.elic0de.hungergames.dragon.DragonTrait;
 import com.github.elic0de.hungergames.game.phase.InGamePhase;
@@ -40,6 +41,8 @@ public class HungerGame extends AbstractGame {
     @Getter
     private final Set<String> deadPlayers = new HashSet<>();
 
+    private DragonTrait dragonTrait;
+
     public HungerGame() {
         scoreboard = Bukkit.getScoreboardManager().getMainScoreboard();
         border = new GameBorder(this);
@@ -71,14 +74,21 @@ public void spawnEnderDragon(World world) {
         final WorldBorder border = world.getWorldBorder();
         final Location start = border.getCenter().clone().add(border.getSize() / 2, 130, border.getSize() / 2);
         getPlayers().forEach(onlineUser -> {
-            onlineUser.getPlayer().setGameMode(GameMode.SPECTATOR);
             onlineUser.getPlayer().teleport(start);
+            onlineUser.getPlayer().setGameMode(GameMode.SPECTATOR);
         });
 
+        dragonTrait = new DragonTrait(border);
+
         CitizensNPC dragon = new CitizensNPC(UUID.randomUUID(), 1, "", EntityControllers.createForType(EntityType.ENDER_DRAGON), CitizensAPI.getNPCRegistry());
         dragon.spawn(start);
-        dragon.addTrait(new DragonTrait(border));
-        getPlayers().forEach(onlineUser -> dragon.getEntity().addPassenger(onlineUser.getPlayer()));
+        dragon.addTrait(dragonTrait);
+        Bukkit.getScheduler().runTask(HungerGames.getInstance(), () -> {
+            getPlayers().forEach(onlineUser -> {
+
+                dragon.getEntity().addPassenger(onlineUser.getPlayer());
+            });
+        });
     }
 
     public void dismountWithTeam(GameUser user) {
@@ -118,6 +128,7 @@ public void wonGame() {
     @Override
     public void reset() {
         border.reset();
+        if (dragonTrait != null) dragonTrait.reset();
     }
 
     public void sendMessageSpectators(GameUser user, String message) {

src/main/java/com/github/elic0de/hungergames/listener/EventListener.java

@@ -55,7 +55,7 @@ private void onDismount(EntityDismountEvent event) {
             if (event.getDismounted() instanceof EnderDragon) {
                 game.dismountWithTeam(GameUserManager.getGameUser(player));
             }
-            player.getInventory().addItem(ItemBuilder.of(Material.FIREWORK_STAR).build());
+            player.getInventory().addItem(ItemBuilder.of(Material.FIREWORK_ROCKET).build());
             player.getInventory().setChestplate(ItemBuilder.of(Material.ELYTRA).build());
             player.setGliding(true);
         }
@@ -77,7 +77,9 @@ private void onMove(PlayerMoveEvent event) {
     @EventHandler
     private void onDamage(EntityDamageEvent event) {
         if (event.getEntity() instanceof Player) {
-            if (event.getCause() == EntityDamageEvent.DamageCause.FALL) event.setCancelled(true);
+            switch (event.getCause()) {
+                case FALL, FLY_INTO_WALL -> event.setCancelled(true);
+            }
         }
     }
 
@@ -86,7 +88,7 @@ private void onInteract(PlayerInteractEvent event) {
         final Block block = event.getClickedBlock();
         if (block == null) return;
         if (block.getType() == Material.CHEST && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-            game.getDeathChest().openDeathChest(event.getPlayer(), block.getLocation());
+            game.getDeathChest().openDeathChest(event.getPlayer(), block);
         }
     }
 

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

@@ -13,6 +13,8 @@ public class DeathChestMenu {
 
     private final InventoryGui menu;
 
+    private final Player player;
+
     private static final String[] MENU_LAYOUT = {
             "ppppppppp",
             "ppppppppp",
@@ -21,15 +23,20 @@ public class DeathChestMenu {
             "ppppppppp",
             "ppppppppp"
     };
-    public DeathChestMenu(ItemStack[] contents) {
+    public DeathChestMenu(ItemStack[] contents, Player player) {
+        this.player = player;
         this.menu = new InventoryGui(HungerGames.getInstance(), "DeathChest", MENU_LAYOUT);
-        Inventory inv = Bukkit.createInventory(null, InventoryType.CHEST);
+        Inventory inv = Bukkit.createInventory(null, 54);
         inv.setContents(contents);
         menu.addElement(new GuiStorageElement('p', inv));
         menu.setCloseAction(close -> false);
+
     }
 
-    public void show(Player player) {
-        menu.show(player);
+    public void show() {
+        Bukkit.getScheduler().runTask(HungerGames.getInstance(), () -> {
+            player.closeInventory();
+            menu.show(player);
+        });
     }
 }