implement random mode

Author: matsu1213

src/main/java/net/azisaba/lgw/core/LeonGunWar.java

@@ -181,11 +181,13 @@ public void onEnable() {
                 new PlayerControlListener());
 
         // リスナーの登録 (modes)
-        Bukkit.getPluginManager().registerEvents(new TeamDeathMatchListener(), this);
-        Bukkit.getPluginManager().registerEvents(new HijackListener(), this);
-        Bukkit.getPluginManager().registerEvents(new TDMNoLimitListener(), this);
-        Bukkit.getPluginManager().registerEvents(new LeaderDeathMatchListener(), this);
-        Bukkit.getPluginManager().registerEvents(new CustomTDMListener(), this);
+        registerEvents(
+                new TeamDeathMatchListener(),
+                new HijackListener(),
+                new TDMNoLimitListener(),
+                new LeaderDeathMatchListener(),
+                new CustomTDMListener()
+        );
 
         // リスナーの登録 (others)
         registerEvents(new NoArrowGroundListener(),

src/main/java/net/azisaba/lgw/core/configs/MapsConfig.java

@@ -81,11 +81,13 @@ public void loadConfig() throws IOException, InvalidConfigurationException {
             }
 
             List<Area3D> areas = new ArrayList<>();
-            for (String area : mapSection.getConfigurationSection("areas").getKeys(false)) {
-                ConfigurationSection areaSection = mapSection.getConfigurationSection("areas." + area);
-                Vector min = getLocation(areaSection.getConfigurationSection("min"));
-                Vector max = getLocation(areaSection.getConfigurationSection("max"));
-                areas.add(new Area3D(min, max));
+            if (mapSection.getConfigurationSection("areas") != null) {
+                for (String area : mapSection.getConfigurationSection("areas").getKeys(false)) {
+                    ConfigurationSection areaSection = mapSection.getConfigurationSection("areas." + area);
+                    Vector min = getLocation(areaSection.getConfigurationSection(".min"));
+                    Vector max = getLocation(areaSection.getConfigurationSection(".max"));
+                    areas.add(new Area3D(min, max));
+                }
             }
 
             GameMap gameMap = new GameMap(mapName, world, spawnMap, areas);
@@ -120,6 +122,7 @@ public Set<GameMap> getRandomMaps(int count) {
         }
         List<GameMap> shuffleList = new ArrayList<>(allGameMap);
         Collections.shuffle(shuffleList);
+        shuffleList.removeIf(map -> !map.getHijackAreas().isEmpty());
 
         return new HashSet<>(shuffleList.subList(0, count));
     }
@@ -145,9 +148,9 @@ public List<GameMap> getAllGameMap() {
     }
 
     private Vector getLocation(ConfigurationSection section) {
-        double x = section.getDouble("x");
-        double y = section.getDouble("y");
-        double z = section.getDouble("z");
+        double x = section.getDouble(".x");
+        double y = section.getDouble(".y");
+        double z = section.getDouble(".z");
         return new Vector(x, y, z);
     }
 }

src/main/java/net/azisaba/lgw/core/sql/SQLConnection.java

@@ -92,7 +92,9 @@ public void update() throws SQLException {
     }
 
     public void onDisable() {
-        this.dataSource.close();
+        if (this.dataSource != null) {
+            this.dataSource.close();
+        }
     }
 
     public ResultSet executeQuery(String query, Object... args) {

src/main/java/net/azisaba/lgw/core/util/MatchMode.java

@@ -48,7 +48,7 @@ public enum MatchMode {
             Chat.f("&cHIJACK"),
             Chat.f("&7終了時に &cキャプチャーポイント &7が多いチームの勝利"),
             Duration.ofMinutes(10),
-            Arrays.asList("hijack", "hj")
+            Arrays.asList("hijack", "hj", "h")
     );
 
 
@@ -67,6 +67,15 @@ public enum MatchMode {
     }
 
     public static MatchMode getFromString(String text) {
+        if (text.equalsIgnoreCase("[random]") || text.equalsIgnoreCase("r")) {
+            int rand = (int) (Math.random() * 2);
+            if (rand == 0) {
+                return LEADER_DEATH_MATCH_POINT;
+            } else {
+                return HIJACK;
+            }
+        }
+
         String suggest = text.replace(" ", "").toLowerCase();
         return Arrays.stream(values())
                 .filter(mode -> mode.suggests.contains(suggest))