mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 03:08:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed PvP matches not ending / Removed PvP core shield

Browse Source
This commit is contained in:
Anuken 2018-09-05 09:36:25 -04:00
parent 3f07102f2a
commit 389034bf1a
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/io/anuke/mindustry/game/GameMode.java
View File

@ -23,6 +23,7 @@ public enum GameMode{
isPvp = true;
hidden = true;
enemyCoreBuildRadius = 600f;
enemyCoreShieldRadius = 0f;
respawnTime = 60 * 10;
}};

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

@ -2,7 +2,6 @@ package io.anuke.mindustry.server;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.IntMap;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.game.Difficulty;
@ -14,7 +13,6 @@ import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.net.Administration.PlayerInfo;
import io.anuke.mindustry.net.EditLog;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.Packets.KickReason;
import io.anuke.mindustry.net.TraceInfo;
@ -778,28 +776,6 @@ public class ServerControl extends Module{
info("Nobody with that name could be found.");
}
});
handler.register("rollback", "<amount>", "Rollback the block edits in the world", arg -> {
if(!state.is(State.playing)){
err("Open the server first.");
return;
}
if(!Strings.canParsePostiveInt(arg[0])){
err("Please input a valid, positive, number of times to rollback");
return;
}
int rollbackTimes = Integer.valueOf(arg[0]);
IntMap<Array<EditLog>> editLogs = netServer.admins.getEditLogs();
if(editLogs.size == 0){
err("Nothing to rollback!");
return;
}
//netServer.admins.rollbackWorld(rollbackTimes);
info("Rollback done!");
});
}
private void readCommands(){
@ -910,6 +886,9 @@ public class ServerControl extends Module{
@Override
public void update(){
if(!inExtraRound){
checkPvPGameOver();
}
if(state.is(State.playing) && world.getSector() != null && !inExtraRound && !debug){
//all assigned missions are complete