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

Merge branches 'better-diagonals' and 'master' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2019-11-02 14:09:32 -04:00
parent 2209968963 06cfe9a9cc
commit 19796092e5
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/gradle.yml vendored
View File

@@ -13,5 +13,5 @@ jobs:
uses: actions/setup-java@v1 uses: actions/setup-java@v1
with: with:
java-version: 1.8 java-version: 1.8
- name: Run unit tests with gradle #- name: Run unit tests with gradle
run: ./gradlew test # run: ./gradlew test

2
core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java
View File

@@ -14,7 +14,7 @@ import io.anuke.mindustry.world.meta.values.*;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
public abstract class LiquidTurret extends Turret{ public class LiquidTurret extends Turret{
protected ObjectMap<Liquid, BulletType> ammo = new ObjectMap<>(); protected ObjectMap<Liquid, BulletType> ammo = new ObjectMap<>();
public LiquidTurret(String name){ public LiquidTurret(String name){

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

@@ -230,6 +230,7 @@ public class ServerControl implements ApplicationListener{
}else{ }else{
Array<Map> maps = Vars.maps.customMaps().size == 0 ? Vars.maps.defaultMaps() : Vars.maps.customMaps(); Array<Map> maps = Vars.maps.customMaps().size == 0 ? Vars.maps.defaultMaps() : Vars.maps.customMaps();
result = maps.random(); result = maps.random();
info("Randomized next map to be {0}.", result.name());
} }
Gamemode preset = Gamemode.survival; Gamemode preset = Gamemode.survival;