temp commit but not working

Author: sysnote8main

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

@@ -128,7 +128,7 @@ object SclatUtil {
         commands.add(
             (
                 "map " + Sclat.conf?.servers!!.getString("ServerName") + " " +
-                    MapSelector.mapDataMap[MapEventListener.currentMapName]!!.mapName!!
+                    MapSelector.mapDataMap[MapEventListener.currentMapName]?.mapName!!
             ),
         )
         commands.add("stop")

src/main/kotlin/be4rjp/sclat/data/RegionBlocks.kt

@@ -1,6 +1,5 @@
 package be4rjp.sclat.data
 
-import org.apache.commons.lang.Validate
 import org.bukkit.Location
 import org.bukkit.World
 import org.bukkit.block.Block
@@ -16,10 +15,14 @@ class RegionBlocks(
     private val minimum: Vector
 
     init {
-        Validate.isTrue(
-            firstPoint.world != null && firstPoint.world == secondPoint.world,
-            "World can't be null or different.",
-        )
+        require(firstPoint.world != null) {
+            "World can't be null."
+        }
+
+        require(firstPoint.world == secondPoint.world) {
+            "World can't be different."
+        }
+
         world = firstPoint.world
         val firstVector = firstPoint.toVector()
         val secondVector = secondPoint.toVector()

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

@@ -23,7 +23,6 @@ import be4rjp.sclat.data.DataMgr.beaconMap
 import be4rjp.sclat.data.DataMgr.blockDataMap
 import be4rjp.sclat.data.DataMgr.colorShuffle
 import be4rjp.sclat.data.DataMgr.getColorRandom
-import be4rjp.sclat.data.DataMgr.getMapRandom
 import be4rjp.sclat.data.DataMgr.getMatchFromId
 import be4rjp.sclat.data.DataMgr.getPlayerData
 import be4rjp.sclat.data.DataMgr.getPlayerIsQuit
@@ -472,8 +471,8 @@ object MatchMgr {
         lobbyM.team0 = (lobbyT0)
         lobbyM.team1 = (lobbyT1)
 
-        val map1 = getMapRandom(0)
-        lobbyM.mapData = map1
+//        val map1 = getMapRandom(0)
+        lobbyM.mapData = MapSelector.mapDataMap.values.firstOrNull()
 
         setMatch(id2, lobbyM)
 

src/main/kotlin/be4rjp/sclat/match/MatchEndEvent.kt

@@ -15,6 +15,7 @@ class MatchEndEvent(
     override fun getHandlers(): HandlerList = handlerList
 
     companion object {
+        @JvmStatic
         val handlerList: HandlerList = HandlerList()
     }
 }

src/main/kotlin/be4rjp/sclat/match/MatchStartEvent.kt

@@ -15,6 +15,7 @@ class MatchStartEvent(
     override fun getHandlers(): HandlerList = handlerList
 
     companion object {
+        @JvmStatic
         val handlerList: HandlerList = HandlerList()
     }
 }