サーバーキュー実装

Author: Elic0de

src/main/java/com/github/elic0de/thejpspit/spigot/TheJpsPit.java

@@ -30,6 +30,7 @@
 import com.google.gson.GsonBuilder;
 import org.bukkit.Bukkit;
 import org.bukkit.GameRule;
+import org.bukkit.attribute.Attribute;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -106,7 +107,7 @@ public void onEnable() {
         loadHooks();
 
         Bukkit.getWorlds().forEach(world -> {
-            //world.setGameRule(GameRule., true);
+            world.setGameRule(GameRule.DO_IMMEDIATE_RESPAWN, true);
             world.setGameRule(GameRule.KEEP_INVENTORY, true);
         });
 

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

@@ -29,7 +29,7 @@ private ServerQueueMenu(TheJpsPit plugin, String title) {
         this.menu.setFiller(new ItemStack(Material.BLACK_STAINED_GLASS_PANE, 1));
         // Add pagination handling
         this.menu.addElement(
-            queueButton('x', "wool", new ItemStack(Material.PINK_WOOL),
+            queueButton('x', "lobby", new ItemStack(Material.PINK_WOOL),
                 "CatchTheWool", "&7相手陣地にある羊毛を自分陣地へ持ち帰れ！"));
         this.menu.addElement(
             queueButton('y', "battle", new ItemStack(Material.COBBLESTONE),

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

@@ -10,6 +10,8 @@
 import com.github.elic0de.thejpspit.spigot.player.PitPlayerManager;
 import com.github.elic0de.thejpspit.spigot.villager.VillagerNPC;
 import com.github.elic0de.thejpspit.spigot.villager.VillagerNPCManager;
+import java.util.Objects;
+import java.util.Optional;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
@@ -19,17 +21,24 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.entity.*;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.player.*;
+import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerExpChangeEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerItemConsumeEvent;
+import org.bukkit.event.player.PlayerItemDamageEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-import java.util.Objects;
-import java.util.Optional;
-
 public class EventListener implements Listener {
 
     private final TheJpsPit plugin = TheJpsPit.getInstance();
@@ -41,7 +50,7 @@ public EventListener() {
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
         event.setJoinMessage("");
-
+        //new NoCollisionUtil().sendNoCollisionPacket(event.getPlayer());
         final Player player = event.getPlayer();
         final Optional<PitPlayer> userData = plugin.getDatabase().getPitPlayer(player);
 
@@ -141,6 +150,7 @@ public void onDamage(EntityDamageByEntityEvent event) {
                 final PitPlayer pitPlayer = PitPlayerManager.getPitPlayer(damager);
                 switch (event.getCause()) {
                     case FALL -> {
+                        damager.stopAllSounds();
                         event.setCancelled(true);
                         return;
                     }

src/main/java/com/github/elic0de/thejpspit/spigot/network/PluginMessageReceiver.java

@@ -2,7 +2,6 @@
 
 import com.github.elic0de.thejpspit.spigot.TheJpsPit;
 import com.github.elic0de.thejpspit.spigot.player.PitPlayer;
-import com.github.elic0de.thejpspit.spigot.queue.QueueServerType;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;
@@ -36,17 +35,16 @@ public void onPluginMessageReceived(String channel, Player player, byte[] messag
         if (!channel.equals(BUNGEE_CHANNEL_ID)) {
             return;
         }
-
         ByteArrayDataInput in = ByteStreams.newDataInput(message);
         if (!in.readUTF().equals("TheJpsPit:response")) return;
 
         HashMap<String, Integer> networkInformation = new HashMap<>();
         int length = in.readInt();
         for (int i = 0; i < length; i++) networkInformation.put(in.readUTF(), in.readInt());
 
-        networkInformation.forEach((s, integer) -> TheJpsPit.getInstance().getQueueManager()
-            .updateQueue(s, integer));
-
+        networkInformation.forEach((s, integer) -> {
+            TheJpsPit.getInstance().getQueueManager()
+                .updateQueue(s, integer);
+        });
     }
-
 }

src/main/java/com/github/elic0de/thejpspit/spigot/queue/QueueManager.java

@@ -16,27 +16,20 @@ public class QueueManager {
     private final Map<PitPlayer, String> queuedPlayers = new HashMap<>();
     private final Map<String, Integer> servers = new HashMap<>();
 
-    private final int MIN_PLAYER_SIZE = 6;
+    private final int MIN_PLAYER_SIZE = 2;
 
     public void checkQueue() {
         PluginMessageReceiver.sendServerPlayerCount();
         if (servers.isEmpty()) return;
 
-        servers.forEach((severName, onlinePlayers) -> {
-            final int playerSize = (int) queuedPlayers.values().stream().filter(
-                severName::equalsIgnoreCase).count();
-
-            if (MIN_PLAYER_SIZE < playerSize + onlinePlayers) {
-                sendServer(severName);
-            }
+        servers.forEach((s, integer) -> {
+            if (getNeededPlayer(s) == 0) sendServer(s);
         });
-
-
     }
 
     public void addQueue(PitPlayer player, String serverName) {
         cancelQueue(player);
-
+        queuedPlayers.remove(player);
         queuedPlayers.put(player, serverName);
 
         checkQueue();
@@ -65,10 +58,12 @@ private void sendServer(String serverName) {
 
     public int getNeededPlayer(String serverName) {
         if (servers.isEmpty()) {
-            return 6;
+            return MIN_PLAYER_SIZE;
         }
-        final int playerSize = (int) queuedPlayers.values().stream().filter(
+        int totalPlayers = 0;
+        if (servers.containsKey(serverName)) totalPlayers = servers.get(serverName);
+        totalPlayers = totalPlayers + (int) queuedPlayers.values().stream().filter(
             serverName::equalsIgnoreCase).count();
-        return Math.max(0, 6 - (queuedPlayers.size() + playerSize));
+        return Math.max(0, MIN_PLAYER_SIZE - totalPlayers);
     }
 }

src/main/java/com/github/elic0de/thejpspit/spigot/queue/QueueServerType.java

@@ -1,4 +1,4 @@
-name: Walkure
-main: amata1219.walkure.bungee.Walkure
+name: TheJps
+main: com.github.elic0de.thejpspit.bungee.TheJpsPit
 version: 1.0.0
 author: 'Elic0de#0342'