Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed maps not being able to override gamemode-specific settings

Browse Source
This commit is contained in:
Anuken
2019-08-10 11:43:28 -04:00
parent 16f6b51857
commit 4ef60af4a8
25 changed files with 153 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/io/anuke/mindustry/server/ServerControl.java
View File

@@ -239,7 +239,7 @@ public class ServerControl implements ApplicationListener{
lastMode = preset;
try{
world.loadMap(result);
state.rules = preset.apply(result.rules());
state.rules = result.applyRules(preset);
logic.play();
info("Map loaded.");
@@ -706,7 +706,7 @@ public class ServerControl implements ApplicationListener{
Call.onWorldDataBegin();
run.run();
logic.play();
state.rules = lastMode.apply(world.getMap().rules());
state.rules = world.getMap().applyRules(lastMode);
for(Player p : players){
p.reset();
if(state.rules.pvp){