Merging changes from private branch

2025-04-04 11:47:35 -04:00
parent cf5c6d0905
commit b7dbe54d76
161 changed files with 2484 additions and 1137 deletions
--- a/server/src/mindustry/server/ServerControl.java
+++ b/server/src/mindustry/server/ServerControl.java
@@ -1094,15 +1094,6 @@ public class ServerControl implements ApplicationListener{
        }
    }

-    /**
-     * @deprecated
-     * Use {@link Maps#setNextMapOverride(Map)} instead.
-     */
-    @Deprecated
-    public void setNextMap(Map map){
-        maps.setNextMapOverride(map);
-    }
-
    /**
     * Cancels the world load timer task, if it is scheduled. Can be useful for stopping a server or hosting a new game.
     */