temp commit

Author: sysnote8main

src/main/kotlin/be4rjp/sclat/Sclat.kt

@@ -37,6 +37,7 @@ import be4rjp.sclat.manager.RankMgr
 import be4rjp.sclat.manager.ServerStatusManager
 import be4rjp.sclat.manager.WeaponClassMgr
 import be4rjp.sclat.map.MapEventListener
+import be4rjp.sclat.map.MapSelector
 import be4rjp.sclat.protocollib.SclatPacketListener.init
 import be4rjp.sclat.server.EquipmentServer
 import be4rjp.sclat.server.StatusServer
@@ -112,6 +113,7 @@ class Sclat :
                 sclatLogger.warn("ワールド {} が見つからなかっため、スキップされました。", data.worldName)
                 return@forEach
             }
+            MapSelector.addMap(data.worldName)
             matchMaps[mapDisplayName] = data.worldName
             sclatLogger.info("World {} が追加されました。", data.worldName)
         }

src/main/kotlin/be4rjp/sclat/api/SclatUtil.kt

@@ -9,7 +9,8 @@ import be4rjp.sclat.data.DataMgr
 import be4rjp.sclat.extension.component
 import be4rjp.sclat.manager.BungeeCordMgr
 import be4rjp.sclat.manager.DeathMgr
-import be4rjp.sclat.manager.MatchMgr
+import be4rjp.sclat.map.MapEventListener
+import be4rjp.sclat.map.MapSelector
 import be4rjp.sclat.plugin
 import be4rjp.sclat.sclatLogger
 import be4rjp.sclat.server.StatusClient
@@ -127,7 +128,7 @@ object SclatUtil {
         commands.add(
             (
                 "map " + Sclat.conf?.servers!!.getString("ServerName") + " " +
-                    DataMgr.getMapRandom(if (MatchMgr.mapcount == 0) 0 else MatchMgr.mapcount - 1).mapName!!
+                    MapSelector.mapDataMap[MapEventListener.currentMapName]!!.mapName!!
             ),
         )
         commands.add("stop")

src/main/kotlin/be4rjp/sclat/manager/MapDataMgr.kt

@@ -10,6 +10,7 @@ import be4rjp.sclat.extension.getLocation
 import be4rjp.sclat.extension.getLocationWithPitch
 import be4rjp.sclat.extension.getLocationWithYaw
 import be4rjp.sclat.extension.getSection
+import be4rjp.sclat.map.MapSelector
 import be4rjp.sclat.sclatLogger
 import org.bukkit.Bukkit
 import org.bukkit.Location
@@ -55,6 +56,7 @@ object MapDataMgr {
             sclatLogger.info(mapName)
             allmapcount++
             addMapList(map)
+            MapSelector.mapDataMap[worldName] = map
         }
     }
 

src/main/kotlin/be4rjp/sclat/manager/MatchMgr.kt

@@ -35,6 +35,8 @@ import be4rjp.sclat.data.DataMgr.spongeMap
 import be4rjp.sclat.data.DataMgr.sprinklerMap
 import be4rjp.sclat.data.Match
 import be4rjp.sclat.gui.OpenGUI
+import be4rjp.sclat.map.MapEventListener
+import be4rjp.sclat.map.MapSelector
 import be4rjp.sclat.match.MatchEndEvent
 import be4rjp.sclat.match.MatchStartEvent
 import be4rjp.sclat.plugin
@@ -441,8 +443,8 @@ object MatchMgr {
 
         if (id == 0) mapDataShuffle()
 
-        val map = getMapRandom(mapcount)
-        match.mapData = map
+//        val map = getMapRandom(mapcount)
+        match.mapData = MapSelector.mapDataMap[MapEventListener.currentMapName]
 
         mapcount++
 
@@ -2019,9 +2021,7 @@ object MatchMgr {
                                             Sclat.conf!!
                                                 .servers!!
                                                 .getString("ServerName") + " " +
-                                            getMapRandom(
-                                                if (mapcount == 0) 0 else mapcount - 1,
-                                            ).mapName,
+                                            MapSelector.mapDataMap[MapEventListener.currentMapName]!!.mapName,
                                     )
                                     commands.add("stop")
                                     val sc =

src/main/kotlin/be4rjp/sclat/map/MapEventListener.kt

@@ -30,6 +30,7 @@ object MapEventListener : Listener {
     }
 
     fun nextMap() {
+        MapSelector.markUnused(currentMapName)
         currentMapName = nextMapName
         nextMapName = MapSelector.selectRandomMap()
         BukkitWorldAPI.loadWorld(nextMapName)

src/main/kotlin/be4rjp/sclat/map/MapSelector.kt

@@ -1,9 +1,12 @@
 package be4rjp.sclat.map
 
+import be4rjp.sclat.data.MapData
+
 /**
  * Selector for match maps. It manages the maps and their usage status.
  */
 object MapSelector {
+    val mapDataMap: MutableMap<String, MapData> = mutableMapOf()
     private val maps: MutableSet<String> = mutableSetOf()
     private val usingMaps: MutableSet<String> = mutableSetOf()