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

Use ## for comments, just in case

Browse Source
This commit is contained in:
Anuken
2019-11-08 14:55:32 -05:00
parent e9f9194f73
commit 505f802e20
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/mod/ContentParser.java
+2 -1
View File
@@ -341,7 +341,8 @@ public class ContentParser{
if(contentTypes.isEmpty()){ if(contentTypes.isEmpty()){
init(); init();
} }
json = json.replaceAll("#.*?\n","\n"); //add comments starting with #
json = json.replaceAll("##.*?\n","\n");
JsonValue value = parser.fromJson(null, json); JsonValue value = parser.fromJson(null, json);
if(!parsers.containsKey(type)){ if(!parsers.containsKey(type)){
core/src/io/anuke/mindustry/world/blocks/defense/turrets/PowerTurret.java
+1 -1
View File
@@ -6,7 +6,7 @@ import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStat;
import io.anuke.mindustry.world.meta.StatUnit; import io.anuke.mindustry.world.meta.StatUnit;
public abstract class PowerTurret extends CooledTurret{ public class PowerTurret extends CooledTurret{
protected @NonNull BulletType shootType; protected @NonNull BulletType shootType;
protected float powerUse = 1f; protected float powerUse = 1f;