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

Fixed #859

Browse Source
This commit is contained in:
Anuken
2019-10-22 18:45:05 -04:00
parent d39ceb1f5e
commit 17e219f142
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+4 -3
View File
@@ -5,12 +5,13 @@ buildscript{
google() google()
maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" } maven{ url "https://oss.sonatype.org/content/repositories/snapshots/" }
jcenter() jcenter()
maven{ url 'https://jitpack.io' }
} }
dependencies{ dependencies{
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8-SNAPSHOT' classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.7'
classpath "com.badlogicgames.gdx:gdx-tools:1.9.10" classpath "com.badlogicgames.gdx:gdx-tools:1.9.10"
classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT" classpath "com.github.anuken:packr:-SNAPSHOT"
} }
} }
@@ -25,7 +26,7 @@ allprojects{
if(!project.hasProperty("versionType")) versionType = 'official' if(!project.hasProperty("versionType")) versionType = 'official'
appName = 'Mindustry' appName = 'Mindustry'
gdxVersion = '1.9.10' gdxVersion = '1.9.10'
roboVMVersion = '2.3.8-SNAPSHOT' roboVMVersion = '2.3.7'
steamworksVersion = '1.8.0' steamworksVersion = '1.8.0'
arcHash = null arcHash = null
core/src/io/anuke/mindustry/core/Control.java
+1 -1
View File
@@ -29,8 +29,8 @@ import java.text.*;
import java.util.*; import java.util.*;
import static io.anuke.arc.Core.*; import static io.anuke.arc.Core.*;
import static io.anuke.mindustry.Vars.*;
import static io.anuke.mindustry.Vars.net; import static io.anuke.mindustry.Vars.net;
import static io.anuke.mindustry.Vars.*;
/** /**
* Control module. * Control module.
core/src/io/anuke/mindustry/game/SpawnGroup.java
+2
View File
@@ -3,6 +3,7 @@ package io.anuke.mindustry.game;
import io.anuke.arc.util.serialization.Json; import io.anuke.arc.util.serialization.Json;
import io.anuke.arc.util.serialization.Json.Serializable; import io.anuke.arc.util.serialization.Json.Serializable;
import io.anuke.arc.util.serialization.JsonValue; import io.anuke.arc.util.serialization.JsonValue;
import io.anuke.mindustry.content.*;
import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.entities.type.BaseUnit;
import io.anuke.mindustry.type.*; import io.anuke.mindustry.type.*;
@@ -84,6 +85,7 @@ public class SpawnGroup implements Serializable{
@Override @Override
public void read(Json json, JsonValue data){ public void read(Json json, JsonValue data){
type = content.getByName(ContentType.unit, data.getString("type", "dagger")); type = content.getByName(ContentType.unit, data.getString("type", "dagger"));
if(type == null) type = UnitTypes.dagger;
begin = data.getInt("begin", 0); begin = data.getInt("begin", 0);
end = data.getInt("end", never); end = data.getInt("end", never);
spacing = data.getInt("spacing", 1); spacing = data.getInt("spacing", 1);
gradle.properties
+1 -1
View File
@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=b87d817844e1da093b31da06870c0970176648a9 archash=411d2784f538dfc10db2962a62833938029dafdd