Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-02 03:00:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into v9

Browse Source 
# Conflicts:
#	core/src/mindustry/logic/LExecutor.java
#	core/src/mindustry/world/blocks/logic/LogicDisplay.java
#	core/src/mindustry/world/meta/StatValues.java
#	gradle.properties
This commit is contained in:
Anuken
2026-08-29 09:53:28 -04:00
parent 2b9937c3be 4db3cd713c
commit 22f0b9a5c7
80 changed files with 792 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/mindustry/server/ServerControl.java
+2
View File
@@ -550,6 +550,7 @@ public class ServerControl implements ApplicationListener{
try{
world.loadMap(result, result.applyRules(lastMode));
state.rules = result.applyRules(preset);
Events.fire(new RulesLoadEvent(state.rules));
logic.play();
info("Map loaded.");
@@ -1379,6 +1380,7 @@ public class ServerControl implements ApplicationListener{
run.run();
state.rules = state.map.applyRules(lastMode);
Events.fire(new RulesLoadEvent(state.rules));
logic.play();
reloader.end();