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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2019-12-05 22:06:57 -05:00
commit ef24e5ecad
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@ -729,7 +729,7 @@ mode.editor.name = Editor
mode.pvp.name = PvP
mode.pvp.description = Fight against other players locally.\n[gray]Requires at least 2 differently-colored cores in the map to play.
mode.attack.name = Attack
mode.attack.description = Destroy the enemy's base. No waves.\n[gray]Requires a red core in the map to play.
mode.attack.description = Destroy the enemy's base. \n[gray]Requires a red core in the map to play.
mode.custom = Custom Rules
rules.infiniteresources = Infinite Resources

4
core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
View File

@ -280,6 +280,10 @@ public class BuildBlock extends Block{
progress = Mathf.clamp(progress - amount);
if(builder instanceof Player){
builderID = builder.getID();
}
if(progress <= 0 || state.rules.infiniteResources){
Call.onDeconstructFinish(tile, this.cblock == null ? previous : this.cblock, builderID);
}

4
desktop/build.gradle
View File

@ -28,6 +28,10 @@ task run(dependsOn: classes, type: JavaExec){
args Eval.me(project.getProperties()["args"])
}
if(project.hasProperty("jvmArgs")){
jvmArgs((List<String>)Eval.me(project.getProperties()["jvmArgs"]))
}
if(args.contains("debug")){
main = "io.anuke.mindustry.DebugLauncher"
}

3
server/build.gradle
View File

@ -19,6 +19,9 @@ task run(dependsOn: classes, type: JavaExec){
if(project.hasProperty("appArgs")){
args Eval.me(appArgs)
}
if(project.hasProperty("jvmArgs")){
jvmArgs((List<String>)Eval.me(project.getProperties()["jvmArgs"]))
}
}
task debug(dependsOn: classes, type: JavaExec){